From c13fcf234b21439c76dcaac407801848ec7527ce Mon Sep 17 00:00:00 2001
From: ian <ian@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sun, 18 May 2014 00:21:14 +0000
Subject: [PATCH] MFC 265155, 265254:

  Omit from the universe build all config files tagged with #NO_UNIVERSE.

  Add FDT to the VYBRID kernel.


git-svn-id: svn://svn.freebsd.org/base/stable/10@266383 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 Makefile                               | 8 +++++++-
 sys/arm/conf/ARNDALE                   | 2 ++
 sys/arm/conf/BWCT                      | 2 ++
 sys/arm/conf/COLIBRI-VF50              | 4 +++-
 sys/arm/conf/COSMIC                    | 4 +++-
 sys/arm/conf/EB9200                    | 2 ++
 sys/arm/conf/ETHERNUT5                 | 2 ++
 sys/arm/conf/HL200                     | 2 ++
 sys/arm/conf/HL201                     | 2 ++
 sys/arm/conf/KB920X                    | 2 ++
 sys/arm/conf/NSLU                      | 2 ++
 sys/arm/conf/QILA9G20                  | 2 ++
 sys/arm/conf/QUARTZ                    | 4 +++-
 sys/arm/conf/SAM9260EK                 | 2 ++
 sys/arm/conf/SAM9X25EK                 | 3 ++-
 sys/arm/conf/SN9G45                    | 2 ++
 sys/arm/conf/{VYBRID.common => VYBRID} | 3 +++
 sys/arm/conf/WANDBOARD-DUAL            | 2 ++
 sys/arm/conf/WANDBOARD-QUAD            | 2 ++
 sys/arm/conf/WANDBOARD-SOLO            | 2 ++
 20 files changed, 49 insertions(+), 5 deletions(-)
 rename sys/arm/conf/{VYBRID.common => VYBRID} (99%)

diff --git a/Makefile b/Makefile
index 98b33d343..bb7a50675 100644
--- a/Makefile
+++ b/Makefile
@@ -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 e50d3f4ed..da4c598e3 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 4c0001952..5ed552b70 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 343fb8963..9f73f6987 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 b3b407432..72ae5c20b 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 0afa9b428..3e3d12450 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 9bc234df9..9df7f9c55 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 c8d43c261..8e0d17451 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 200f2f86e..fb80bbed8 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 916425ac9..a758a66e4 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 a8c04d318..e54e63b72 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 e0055573c..257e37d34 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 b6c20bb66..04f1b5c94 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 930429d2f..34b64afd2 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 63fa8158b..d4b6343d9 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 e44a0cf2c..3eb646bbe 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
similarity index 99%
rename from sys/arm/conf/VYBRID.common
rename to sys/arm/conf/VYBRID
index 412f65cc1..43cdac594 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 168b17d9e..598c91d8a 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 155b36adc..571f54be1 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 7465e4f61..f6df97c95 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
 
-- 
2.45.0