svn commit: r308927 - head/sys/mips/conf

[Ruslan Bukin]

Author: br
Date: Mon Nov 21 15:35:56 2016
New Revision: 308927
URL: https://svnweb.freebsd.org/changeset/base/308927

Log:
  Move FDT option to the main SoC file and mark boards config
  as NO_UNIVERSE.
  
  Pointed out by:	andrew
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/mips/conf/CANNA
  head/sys/mips/conf/CI20
  head/sys/mips/conf/JZ4780
  head/sys/mips/conf/X1000

Modified: head/sys/mips/conf/CANNA
==============================================================================
--- head/sys/mips/conf/CANNA	Mon Nov 21 14:43:31 2016	(r308926)
+++ head/sys/mips/conf/CANNA	Mon Nov 21 15:35:56 2016	(r308927)
@@ -2,10 +2,11 @@
 #
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"X1000"
 ident		CANNA
 
-options 	FDT
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=ingenic/canna.dts
 

Modified: head/sys/mips/conf/CI20
==============================================================================
--- head/sys/mips/conf/CI20	Mon Nov 21 14:43:31 2016	(r308926)
+++ head/sys/mips/conf/CI20	Mon Nov 21 15:35:56 2016	(r308927)
@@ -2,10 +2,11 @@
 #
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		"JZ4780"
 ident		CI20
 
-options 	FDT
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=ingenic/ci20.dts
 
@@ -27,5 +28,4 @@ options 	ROOTDEVNAME=\"ufs:mmcsd0\"
 makeoptions	TRAMPLOADADDR=0x88000000
 
 #options 	VERBOSE_SYSINIT
-device		dme
 options 	PRINTF_BUFR_SIZE=256

Modified: head/sys/mips/conf/JZ4780
==============================================================================
--- head/sys/mips/conf/JZ4780	Mon Nov 21 14:43:31 2016	(r308926)
+++ head/sys/mips/conf/JZ4780	Mon Nov 21 15:35:56 2016	(r308927)
@@ -78,6 +78,8 @@ device 		da
 device		mmc
 device		mmcsd
 
+device		dme
+
 # USB support
 options 	USB_DEBUG	# enable debug msgs
 options 	USB_HOST_ALIGN=128 # L2 cache line size
@@ -90,3 +92,6 @@ device		uhid		# "Human Interface Devices
 #device		ulpt		# Printer
 device		umass		# Disks/Mass storage - Requires scbus and da
 device		ums		# Mouse
+
+# FDT support
+options 	FDT

Modified: head/sys/mips/conf/X1000
==============================================================================
--- head/sys/mips/conf/X1000	Mon Nov 21 14:43:31 2016	(r308926)
+++ head/sys/mips/conf/X1000	Mon Nov 21 15:35:56 2016	(r308927)
@@ -87,3 +87,6 @@ device		mmcsd
 #device		ulpt		# Printer
 #device		umass		# Disks/Mass storage - Requires scbus and da
 #device		ums		# Mouse
+
+# FDT support
+options 	FDT