Author: ian
Date: Sun May 24 15:21:47 2015
New Revision: 283404
URL: https://svnweb.freebsd.org/changeset/base/283404

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

Modified:
  stable/10/sys/arm/conf/DB-78XXX
  stable/10/sys/arm/conf/DB-88F5XXX
  stable/10/sys/arm/conf/DB-88F6XXX
  stable/10/sys/arm/conf/DOCKSTAR
  stable/10/sys/arm/conf/DREAMPLUG-1001
  stable/10/sys/arm/conf/SHEEVAPLUG
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/arm/conf/DB-78XXX
==============================================================================
--- stable/10/sys/arm/conf/DB-78XXX     Sun May 24 15:21:25 2015        
(r283403)
+++ stable/10/sys/arm/conf/DB-78XXX     Sun May 24 15:21:47 2015        
(r283404)
@@ -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: stable/10/sys/arm/conf/DB-88F5XXX
==============================================================================
--- stable/10/sys/arm/conf/DB-88F5XXX   Sun May 24 15:21:25 2015        
(r283403)
+++ stable/10/sys/arm/conf/DB-88F5XXX   Sun May 24 15:21:47 2015        
(r283404)
@@ -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: stable/10/sys/arm/conf/DB-88F6XXX
==============================================================================
--- stable/10/sys/arm/conf/DB-88F6XXX   Sun May 24 15:21:25 2015        
(r283403)
+++ stable/10/sys/arm/conf/DB-88F6XXX   Sun May 24 15:21:47 2015        
(r283404)
@@ -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: stable/10/sys/arm/conf/DOCKSTAR
==============================================================================
--- stable/10/sys/arm/conf/DOCKSTAR     Sun May 24 15:21:25 2015        
(r283403)
+++ stable/10/sys/arm/conf/DOCKSTAR     Sun May 24 15:21:47 2015        
(r283404)
@@ -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: stable/10/sys/arm/conf/DREAMPLUG-1001
==============================================================================
--- stable/10/sys/arm/conf/DREAMPLUG-1001       Sun May 24 15:21:25 2015        
(r283403)
+++ stable/10/sys/arm/conf/DREAMPLUG-1001       Sun May 24 15:21:47 2015        
(r283404)
@@ -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: stable/10/sys/arm/conf/SHEEVAPLUG
==============================================================================
--- stable/10/sys/arm/conf/SHEEVAPLUG   Sun May 24 15:21:25 2015        
(r283403)
+++ stable/10/sys/arm/conf/SHEEVAPLUG   Sun May 24 15:21:47 2015        
(r283404)
@@ -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"
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

Reply via email to