From f0e85c812bc46e89a9c6bfb86c8402d06231e9ea Mon Sep 17 00:00:00 2001
From: ian <ian@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sun, 24 May 2015 15:21:47 +0000
Subject: [PATCH] MFC r279850:

  Remove MODULES_OVERRIDE="" for Marvel-based armv5 systems.

  Also add some #NO_UNIVERSE to configs that essentially duplicate DB-88F6XXX.


git-svn-id: svn://svn.freebsd.org/base/stable/10@283404 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 sys/arm/conf/DB-78XXX       | 1 -
 sys/arm/conf/DB-88F5XXX     | 1 -
 sys/arm/conf/DB-88F6XXX     | 1 -
 sys/arm/conf/DOCKSTAR       | 3 +--
 sys/arm/conf/DREAMPLUG-1001 | 3 +--
 sys/arm/conf/SHEEVAPLUG     | 2 +-
 6 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/sys/arm/conf/DB-78XXX b/sys/arm/conf/DB-78XXX
index 87fbc07a6..8e89cf21b 100644
--- a/sys/arm/conf/DB-78XXX
+++ b/sys/arm/conf/DB-78XXX
@@ -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"
diff --git a/sys/arm/conf/DB-88F5XXX b/sys/arm/conf/DB-88F5XXX
index 5f33fd744..2d687c89e 100644
--- a/sys/arm/conf/DB-88F5XXX
+++ b/sys/arm/conf/DB-88F5XXX
@@ -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"
diff --git a/sys/arm/conf/DB-88F6XXX b/sys/arm/conf/DB-88F6XXX
index 089284873..924313edb 100644
--- a/sys/arm/conf/DB-88F6XXX
+++ b/sys/arm/conf/DB-88F6XXX
@@ -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"
diff --git a/sys/arm/conf/DOCKSTAR b/sys/arm/conf/DOCKSTAR
index e966d2e78..9ba581c90 100644
--- a/sys/arm/conf/DOCKSTAR
+++ b/sys/arm/conf/DOCKSTAR
@@ -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
diff --git a/sys/arm/conf/DREAMPLUG-1001 b/sys/arm/conf/DREAMPLUG-1001
index fdcf02704..2cc3723c6 100644
--- a/sys/arm/conf/DREAMPLUG-1001
+++ b/sys/arm/conf/DREAMPLUG-1001
@@ -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
diff --git a/sys/arm/conf/SHEEVAPLUG b/sys/arm/conf/SHEEVAPLUG
index dc49b6a92..41f16b279 100644
--- a/sys/arm/conf/SHEEVAPLUG
+++ b/sys/arm/conf/SHEEVAPLUG
@@ -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"
-- 
2.45.0