From owner-svn-src-all@FreeBSD.ORG Thu Apr 23 20:53:30 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3FFBF6D7; Thu, 23 Apr 2015 20:53:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 15F8411CA; Thu, 23 Apr 2015 20:53:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3NKrTN3092198; Thu, 23 Apr 2015 20:53:29 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3NKrTow092196; Thu, 23 Apr 2015 20:53:29 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201504232053.t3NKrTow092196@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Thu, 23 Apr 2015 20:53:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r281905 - in head/sys/arm: amlogic/aml8726 conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Apr 2015 20:53:30 -0000 Author: andrew Date: Thu Apr 23 20:53:29 2015 New Revision: 281905 URL: https://svnweb.freebsd.org/changeset/base/281905 Log: Remove the need for board specific std files on aml8726 by moving the options they set to the main kernel config. Deleted: head/sys/arm/amlogic/aml8726/std.odroidc1 head/sys/arm/amlogic/aml8726/std.vsatv102-m6 Modified: head/sys/arm/conf/ODROIDC1 head/sys/arm/conf/VSATV102 Modified: head/sys/arm/conf/ODROIDC1 ============================================================================== --- head/sys/arm/conf/ODROIDC1 Thu Apr 23 20:43:24 2015 (r281904) +++ head/sys/arm/conf/ODROIDC1 Thu Apr 23 20:53:29 2015 (r281905) @@ -19,7 +19,7 @@ ident ODROIDC1 -include "../amlogic/aml8726/std.odroidc1" +include "../amlogic/aml8726/std.aml8726" options HZ=100 options SCHED_ULE # ULE scheduler @@ -56,6 +56,7 @@ options KBD_INSTALL_CDEV # install a CD options FREEBSD_BOOT_LOADER # Process metadata passed from loader(8) options LINUX_BOOT_ABI options VFP # Enable floating point hardware support +options SMP # Enable multiple cores # Debugging makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols @@ -141,3 +142,4 @@ device axe # ASIX Electronics USB Eth # Flattened Device Tree options FDT # Configure using FDT/DTB data options FDT_DTB_STATIC +makeoptions FDT_DTS_FILE=odroidc1.dts Modified: head/sys/arm/conf/VSATV102 ============================================================================== --- head/sys/arm/conf/VSATV102 Thu Apr 23 20:43:24 2015 (r281904) +++ head/sys/arm/conf/VSATV102 Thu Apr 23 20:53:29 2015 (r281905) @@ -19,7 +19,7 @@ ident ODROIDC1 -include "../amlogic/aml8726/std.vsatv102-m6" +include "../amlogic/aml8726/std.aml8726" options HZ=100 options SCHED_ULE # ULE scheduler @@ -56,6 +56,7 @@ options KBD_INSTALL_CDEV # install a CD options FREEBSD_BOOT_LOADER # Process metadata passed from loader(8) options LINUX_BOOT_ABI options VFP # Enable floating point hardware support +options SMP # Enable multiple cores # Debugging makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols @@ -141,3 +142,4 @@ device axe # ASIX Electronics USB Eth # Flattened Device Tree options FDT # Configure using FDT/DTB data options FDT_DTB_STATIC +makeoptions FDT_DTS_FILE=vsatv102-m6.dts