From 868c7673d2d5fddbf59d7936712e49113a81e17b Mon Sep 17 00:00:00 2001
From: Ian Lepore <ian@FreeBSD.org>
Date: Tue, 10 Mar 2015 14:36:51 +0000
Subject: [PATCH] Remove MODULES_OVERRIDE="" for Marvel-based armv5 systems.

Also add some #NO_UNIVERSE to configs that essentially duplicate DB-88F6XXX.
---
 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 2cfd5da0611e..4fee206e8ff5 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 c2b4b5889ea4..6ccb360bd4d9 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 c39e4a1e369e..c59f1c1130da 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 ad1e74d6eafe..aea158ca8911 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 135cba0cd6f6..0448d4f95646 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 10a46daa6535..9d8ea269892e 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"