diff options
-rw-r--r-- | Makefile | 8 | ||||
-rw-r--r-- | sys/arm/conf/ARNDALE | 2 | ||||
-rw-r--r-- | sys/arm/conf/BWCT | 2 | ||||
-rw-r--r-- | sys/arm/conf/COLIBRI-VF50 | 4 | ||||
-rw-r--r-- | sys/arm/conf/COSMIC | 4 | ||||
-rw-r--r-- | sys/arm/conf/EB9200 | 2 | ||||
-rw-r--r-- | sys/arm/conf/ETHERNUT5 | 2 | ||||
-rw-r--r-- | sys/arm/conf/HL200 | 2 | ||||
-rw-r--r-- | sys/arm/conf/HL201 | 2 | ||||
-rw-r--r-- | sys/arm/conf/KB920X | 2 | ||||
-rw-r--r-- | sys/arm/conf/NSLU | 2 | ||||
-rw-r--r-- | sys/arm/conf/QILA9G20 | 2 | ||||
-rw-r--r-- | sys/arm/conf/QUARTZ | 4 | ||||
-rw-r--r-- | sys/arm/conf/SAM9260EK | 2 | ||||
-rw-r--r-- | sys/arm/conf/SAM9X25EK | 3 | ||||
-rw-r--r-- | sys/arm/conf/SN9G45 | 2 | ||||
-rw-r--r-- | sys/arm/conf/VYBRID (renamed from sys/arm/conf/VYBRID.common) | 3 | ||||
-rw-r--r-- | sys/arm/conf/WANDBOARD-DUAL | 2 | ||||
-rw-r--r-- | sys/arm/conf/WANDBOARD-QUAD | 2 | ||||
-rw-r--r-- | sys/arm/conf/WANDBOARD-SOLO | 2 |
20 files changed, 49 insertions, 5 deletions
@@ -473,9 +473,15 @@ universe_kernels: universe_kernconfs .if !defined(TARGET) TARGET!= uname -m .endif +.if defined(MAKE_ALL_KERNELS) +_THINNER=cat +.else +_THINNER=xargs grep -L "^.NO_UNIVERSE" +.endif KERNCONFS!= cd ${KERNSRCDIR}/${TARGET}/conf && \ find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \ - ! -name DEFAULTS ! -name NOTES + ! -name DEFAULTS ! -name NOTES | \ + ${_THINNER} universe_kernconfs: .for kernel in ${KERNCONFS} TARGET_ARCH_${kernel}!= cd ${KERNSRCDIR}/${TARGET}/conf && \ diff --git a/sys/arm/conf/ARNDALE b/sys/arm/conf/ARNDALE index e50d3f4..da4c598 100644 --- a/sys/arm/conf/ARNDALE +++ b/sys/arm/conf/ARNDALE @@ -17,6 +17,8 @@ # # $FreeBSD$ +#NO_UNIVERSE + include "EXYNOS5250.common" ident ARNDALE diff --git a/sys/arm/conf/BWCT b/sys/arm/conf/BWCT index 4c00019..5ed552b 100644 --- a/sys/arm/conf/BWCT +++ b/sys/arm/conf/BWCT @@ -17,6 +17,8 @@ # # $FreeBSD$ +#NO_UNIVERSE + ident BWCT options VERBOSE_INIT_ARM diff --git a/sys/arm/conf/COLIBRI-VF50 b/sys/arm/conf/COLIBRI-VF50 index 343fb89..9f73f69 100644 --- a/sys/arm/conf/COLIBRI-VF50 +++ b/sys/arm/conf/COLIBRI-VF50 @@ -17,7 +17,9 @@ # # $FreeBSD$ -include "VYBRID.common" +#NO_UNIVERSE + +include "VYBRID" ident COLIBRI-VF50 #FDT diff --git a/sys/arm/conf/COSMIC b/sys/arm/conf/COSMIC index b3b4074..72ae5c2 100644 --- a/sys/arm/conf/COSMIC +++ b/sys/arm/conf/COSMIC @@ -17,7 +17,9 @@ # # $FreeBSD$ -include "VYBRID.common" +#NO_UNIVERSE + +include "VYBRID" ident COSMIC #FDT diff --git a/sys/arm/conf/EB9200 b/sys/arm/conf/EB9200 index 0afa9b4..3e3d124 100644 --- a/sys/arm/conf/EB9200 +++ b/sys/arm/conf/EB9200 @@ -12,6 +12,8 @@ # # $FreeBSD$ +#NO_UNIVERSE + ident EB9200 include "../at91/std.eb9200" diff --git a/sys/arm/conf/ETHERNUT5 b/sys/arm/conf/ETHERNUT5 index 9bc234d..9df7f9c 100644 --- a/sys/arm/conf/ETHERNUT5 +++ b/sys/arm/conf/ETHERNUT5 @@ -17,6 +17,8 @@ # # $FreeBSD$ +#NO_UNIVERSE + ident ETHERNUT5 include "../at91/std.ethernut5" diff --git a/sys/arm/conf/HL200 b/sys/arm/conf/HL200 index c8d43c2..8e0d174 100644 --- a/sys/arm/conf/HL200 +++ b/sys/arm/conf/HL200 @@ -17,6 +17,8 @@ # # $FreeBSD$ +#NO_UNIVERSE + ident HL200 include "../at91/std.hl200" diff --git a/sys/arm/conf/HL201 b/sys/arm/conf/HL201 index 200f2f8..fb80bbe 100644 --- a/sys/arm/conf/HL201 +++ b/sys/arm/conf/HL201 @@ -17,6 +17,8 @@ # # $FreeBSD$ +#NO_UNIVERSE + ident HL201 include "../at91/std.hl201" diff --git a/sys/arm/conf/KB920X b/sys/arm/conf/KB920X index 916425a..a758a66 100644 --- a/sys/arm/conf/KB920X +++ b/sys/arm/conf/KB920X @@ -18,6 +18,8 @@ # # $FreeBSD$ +#NO_UNIVERSE + ident KB920X include "../at91/std.kb920x" diff --git a/sys/arm/conf/NSLU b/sys/arm/conf/NSLU index a8c04d3..e54e63b 100644 --- a/sys/arm/conf/NSLU +++ b/sys/arm/conf/NSLU @@ -17,6 +17,8 @@ # # $FreeBSD$ +#NO_UNIVERSE + ident NSLU # XXX What is defined in std.avila does not exactly match the following: diff --git a/sys/arm/conf/QILA9G20 b/sys/arm/conf/QILA9G20 index e005557..257e37d 100644 --- a/sys/arm/conf/QILA9G20 +++ b/sys/arm/conf/QILA9G20 @@ -18,6 +18,8 @@ # # $FreeBSD$ +#NO_UNIVERSE + ident QILA9G20 include "../at91/std.qila9g20" diff --git a/sys/arm/conf/QUARTZ b/sys/arm/conf/QUARTZ index b6c20bb..04f1b5c 100644 --- a/sys/arm/conf/QUARTZ +++ b/sys/arm/conf/QUARTZ @@ -17,7 +17,9 @@ # # $FreeBSD$ -include "VYBRID.common" +#NO_UNIVERSE + +include "VYBRID" ident QUARTZ #FDT diff --git a/sys/arm/conf/SAM9260EK b/sys/arm/conf/SAM9260EK index 930429d..34b64af 100644 --- a/sys/arm/conf/SAM9260EK +++ b/sys/arm/conf/SAM9260EK @@ -17,6 +17,8 @@ # # $FreeBSD$ +#NO_UNIVERSE + ident SAM9260EK include "../at91/std.sam9260ek" diff --git a/sys/arm/conf/SAM9X25EK b/sys/arm/conf/SAM9X25EK index 63fa815..d4b6343 100644 --- a/sys/arm/conf/SAM9X25EK +++ b/sys/arm/conf/SAM9X25EK @@ -17,7 +17,8 @@ # # $FreeBSD$ -# NOUNIVERSE: disable building in make universe +#NO_UNIVERSE + ident SAM9X25EK include "../at91/std.sam9x25ek" diff --git a/sys/arm/conf/SN9G45 b/sys/arm/conf/SN9G45 index e44a0cf..3eb646b 100644 --- a/sys/arm/conf/SN9G45 +++ b/sys/arm/conf/SN9G45 @@ -17,6 +17,8 @@ # # $FreeBSD$ +#NO_UNIVERSE + ident SN9G45 include "../at91/std.sn9g45" diff --git a/sys/arm/conf/VYBRID.common b/sys/arm/conf/VYBRID index 412f65c..43cdac5 100644 --- a/sys/arm/conf/VYBRID.common +++ b/sys/arm/conf/VYBRID @@ -17,6 +17,7 @@ # # $FreeBSD$ +ident VYBRID include "../freescale/vybrid/std.vybrid" makeoptions MODULES_OVERRIDE="" @@ -146,3 +147,5 @@ device kbdmux options SC_DFLT_FONT # compile font in makeoptions SC_DFLT_FONT=cp437 device ukbd + +options FDT diff --git a/sys/arm/conf/WANDBOARD-DUAL b/sys/arm/conf/WANDBOARD-DUAL index 168b17d..598c91d 100644 --- a/sys/arm/conf/WANDBOARD-DUAL +++ b/sys/arm/conf/WANDBOARD-DUAL @@ -17,6 +17,8 @@ # # $FreeBSD$ +#NO_UNIVERSE + include "IMX6" ident WANDBOARD-DUAL diff --git a/sys/arm/conf/WANDBOARD-QUAD b/sys/arm/conf/WANDBOARD-QUAD index 155b36a..571f54b 100644 --- a/sys/arm/conf/WANDBOARD-QUAD +++ b/sys/arm/conf/WANDBOARD-QUAD @@ -17,6 +17,8 @@ # # $FreeBSD$ +#NO_UNIVERSE + include "IMX6" ident WANDBOARD-QUAD diff --git a/sys/arm/conf/WANDBOARD-SOLO b/sys/arm/conf/WANDBOARD-SOLO index 7465e4f..f6df97c 100644 --- a/sys/arm/conf/WANDBOARD-SOLO +++ b/sys/arm/conf/WANDBOARD-SOLO @@ -17,6 +17,8 @@ # # $FreeBSD$ +#NO_UNIVERSE + include "IMX6" ident WANDBOARD-SOLO |