Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 23 Apr 2015 20:53:29 +0000 (UTC)
From:      Andrew Turner <andrew@FreeBSD.org>
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
Message-ID:  <201504232053.t3NKrTow092196@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504232053.t3NKrTow092196>