diff options
author | ian <ian@FreeBSD.org> | 2015-05-24 15:21:47 +0000 |
---|---|---|
committer | ian <ian@FreeBSD.org> | 2015-05-24 15:21:47 +0000 |
commit | bc7a934b2f608b2cafea753820dc7736ae469a83 (patch) | |
tree | 15fe74a0fbb2b07ae6966a6ffbd1a508567ba3c4 /sys/arm | |
parent | 29f247a63ea4f50f7141df7e3c99286df9be7adb (diff) | |
download | FreeBSD-src-bc7a934b2f608b2cafea753820dc7736ae469a83.zip FreeBSD-src-bc7a934b2f608b2cafea753820dc7736ae469a83.tar.gz |
MFC r279850:
Remove MODULES_OVERRIDE="" for Marvel-based armv5 systems.
Also add some #NO_UNIVERSE to configs that essentially duplicate DB-88F6XXX.
Diffstat (limited to 'sys/arm')
-rw-r--r-- | sys/arm/conf/DB-78XXX | 1 | ||||
-rw-r--r-- | sys/arm/conf/DB-88F5XXX | 1 | ||||
-rw-r--r-- | sys/arm/conf/DB-88F6XXX | 1 | ||||
-rw-r--r-- | sys/arm/conf/DOCKSTAR | 3 | ||||
-rw-r--r-- | sys/arm/conf/DREAMPLUG-1001 | 3 | ||||
-rw-r--r-- | 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 87fbc07..8e89cf2 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 5f33fd7..2d687c8 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 0892848..924313e 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 e966d2e..9ba581c 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 fdcf027..2cc3723 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 dc49b6a..41f16b2 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" |