svn commit: r279850 - head/sys/arm/conf

[Ian Lepore]

Author: ian
Date: Tue Mar 10 14:36:51 2015
New Revision: 279850
URL: https://svnweb.freebsd.org/changeset/base/279850

Log:
  Remove MODULES_OVERRIDE="" for Marvel-based armv5 systems.
  
  Also add some #NO_UNIVERSE to configs that essentially duplicate DB-88F6XXX.

Modified:
  head/sys/arm/conf/DB-78XXX
  head/sys/arm/conf/DB-88F5XXX
  head/sys/arm/conf/DB-88F6XXX
  head/sys/arm/conf/DOCKSTAR
  head/sys/arm/conf/DREAMPLUG-1001
  head/sys/arm/conf/SHEEVAPLUG

Modified: head/sys/arm/conf/DB-78XXX
==============================================================================
--- head/sys/arm/conf/DB-78XXX	Tue Mar 10 14:22:28 2015	(r279849)
+++ head/sys/arm/conf/DB-78XXX	Tue Mar 10 14:36:51 2015	(r279850)
@@ -8,7 +8,6 @@ ident		DB-88F78XX
 include		"../mv/discovery/std.db78xxx"
 
 options 	SOC_MV_DISCOVERY
-makeoptions	MODULES_OVERRIDE=""
 
 #makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 makeoptions	WERROR="-Werror"

Modified: head/sys/arm/conf/DB-88F5XXX
==============================================================================
--- head/sys/arm/conf/DB-88F5XXX	Tue Mar 10 14:22:28 2015	(r279849)
+++ head/sys/arm/conf/DB-88F5XXX	Tue Mar 10 14:36:51 2015	(r279850)
@@ -8,7 +8,6 @@ ident		DB-88F5XXX
 include		"../mv/orion/std.db88f5xxx"
 
 options 	SOC_MV_ORION
-makeoptions	MODULES_OVERRIDE=""
 
 #makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 makeoptions	WERROR="-Werror"

Modified: head/sys/arm/conf/DB-88F6XXX
==============================================================================
--- head/sys/arm/conf/DB-88F6XXX	Tue Mar 10 14:22:28 2015	(r279849)
+++ head/sys/arm/conf/DB-88F6XXX	Tue Mar 10 14:36:51 2015	(r279850)
@@ -8,7 +8,6 @@ ident		DB-88F6XXX
 include		"../mv/kirkwood/std.db88f6xxx"
 
 options 	SOC_MV_KIRKWOOD
-makeoptions	MODULES_OVERRIDE=""
 
 #makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 makeoptions	WERROR="-Werror"

Modified: head/sys/arm/conf/DOCKSTAR
==============================================================================
--- head/sys/arm/conf/DOCKSTAR	Tue Mar 10 14:22:28 2015	(r279849)
+++ head/sys/arm/conf/DOCKSTAR	Tue Mar 10 14:36:51 2015	(r279850)
@@ -17,6 +17,7 @@
 #
 # $FreeBSD$
 #
+#NO_UNIVERSE
 
 ident		DOCKSTAR
 
@@ -24,8 +25,6 @@ include		"../mv/kirkwood/std.db88f6xxx"
 
 makeoptions	FDT_DTS_FILE=dockstar.dts
 
-makeoptions	MODULES_OVERRIDE=""
-
 options 	SOC_MV_KIRKWOOD
 
 options 	SCHED_4BSD		# 4BSD scheduler

Modified: head/sys/arm/conf/DREAMPLUG-1001
==============================================================================
--- head/sys/arm/conf/DREAMPLUG-1001	Tue Mar 10 14:22:28 2015	(r279849)
+++ head/sys/arm/conf/DREAMPLUG-1001	Tue Mar 10 14:36:51 2015	(r279850)
@@ -20,6 +20,7 @@
 #
 # $FreeBSD$
 #
+#NO_UNIVERSE
 
 ident		DREAMPLUG-1001
 
@@ -27,8 +28,6 @@ include		"../mv/kirkwood/std.db88f6xxx"
 
 makeoptions	FDT_DTS_FILE=dreamplug-1001.dts
 
-makeoptions	MODULES_OVERRIDE=""
-
 options 	SOC_MV_KIRKWOOD
 
 options 	SCHED_4BSD		# 4BSD scheduler

Modified: head/sys/arm/conf/SHEEVAPLUG
==============================================================================
--- head/sys/arm/conf/SHEEVAPLUG	Tue Mar 10 14:22:28 2015	(r279849)
+++ head/sys/arm/conf/SHEEVAPLUG	Tue Mar 10 14:36:51 2015	(r279850)
@@ -3,12 +3,12 @@
 #
 # $FreeBSD$
 #
+#NO_UNIVERSE
 
 ident		SHEEVAPLUG
 include		"../mv/kirkwood/std.db88f6xxx"
 
 options 	SOC_MV_KIRKWOOD
-makeoptions	MODULES_OVERRIDE=""
 
 #makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 makeoptions	WERROR="-Werror"