svn commit: r266383 - in stable/10: . sys/arm/conf
Ian Lepore
ian at FreeBSD.org
Sun May 18 00:21:19 UTC 2014
Author: ian
Date: Sun May 18 00:21:14 2014
New Revision: 266383
URL: http://svnweb.freebsd.org/changeset/base/266383
Log:
MFC 265155, 265254:
Omit from the universe build all config files tagged with #NO_UNIVERSE.
Add FDT to the VYBRID kernel.
Added:
stable/10/sys/arm/conf/VYBRID
- copied, changed from r265155, head/sys/arm/conf/VYBRID
Deleted:
stable/10/sys/arm/conf/VYBRID.common
Modified:
stable/10/Makefile
stable/10/sys/arm/conf/ARNDALE
stable/10/sys/arm/conf/BWCT
stable/10/sys/arm/conf/COLIBRI-VF50
stable/10/sys/arm/conf/COSMIC
stable/10/sys/arm/conf/EB9200
stable/10/sys/arm/conf/ETHERNUT5
stable/10/sys/arm/conf/HL200
stable/10/sys/arm/conf/HL201
stable/10/sys/arm/conf/KB920X
stable/10/sys/arm/conf/NSLU
stable/10/sys/arm/conf/QILA9G20
stable/10/sys/arm/conf/QUARTZ
stable/10/sys/arm/conf/SAM9260EK
stable/10/sys/arm/conf/SAM9X25EK
stable/10/sys/arm/conf/SN9G45
stable/10/sys/arm/conf/WANDBOARD-DUAL
stable/10/sys/arm/conf/WANDBOARD-QUAD
stable/10/sys/arm/conf/WANDBOARD-SOLO
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/Makefile
==============================================================================
--- stable/10/Makefile Sun May 18 00:15:48 2014 (r266382)
+++ stable/10/Makefile Sun May 18 00:21:14 2014 (r266383)
@@ -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 && \
Modified: stable/10/sys/arm/conf/ARNDALE
==============================================================================
--- stable/10/sys/arm/conf/ARNDALE Sun May 18 00:15:48 2014 (r266382)
+++ stable/10/sys/arm/conf/ARNDALE Sun May 18 00:21:14 2014 (r266383)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
include "EXYNOS5250.common"
ident ARNDALE
Modified: stable/10/sys/arm/conf/BWCT
==============================================================================
--- stable/10/sys/arm/conf/BWCT Sun May 18 00:15:48 2014 (r266382)
+++ stable/10/sys/arm/conf/BWCT Sun May 18 00:21:14 2014 (r266383)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident BWCT
options VERBOSE_INIT_ARM
Modified: stable/10/sys/arm/conf/COLIBRI-VF50
==============================================================================
--- stable/10/sys/arm/conf/COLIBRI-VF50 Sun May 18 00:15:48 2014 (r266382)
+++ stable/10/sys/arm/conf/COLIBRI-VF50 Sun May 18 00:21:14 2014 (r266383)
@@ -17,7 +17,9 @@
#
# $FreeBSD$
-include "VYBRID.common"
+#NO_UNIVERSE
+
+include "VYBRID"
ident COLIBRI-VF50
#FDT
Modified: stable/10/sys/arm/conf/COSMIC
==============================================================================
--- stable/10/sys/arm/conf/COSMIC Sun May 18 00:15:48 2014 (r266382)
+++ stable/10/sys/arm/conf/COSMIC Sun May 18 00:21:14 2014 (r266383)
@@ -17,7 +17,9 @@
#
# $FreeBSD$
-include "VYBRID.common"
+#NO_UNIVERSE
+
+include "VYBRID"
ident COSMIC
#FDT
Modified: stable/10/sys/arm/conf/EB9200
==============================================================================
--- stable/10/sys/arm/conf/EB9200 Sun May 18 00:15:48 2014 (r266382)
+++ stable/10/sys/arm/conf/EB9200 Sun May 18 00:21:14 2014 (r266383)
@@ -12,6 +12,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident EB9200
include "../at91/std.eb9200"
Modified: stable/10/sys/arm/conf/ETHERNUT5
==============================================================================
--- stable/10/sys/arm/conf/ETHERNUT5 Sun May 18 00:15:48 2014 (r266382)
+++ stable/10/sys/arm/conf/ETHERNUT5 Sun May 18 00:21:14 2014 (r266383)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident ETHERNUT5
include "../at91/std.ethernut5"
Modified: stable/10/sys/arm/conf/HL200
==============================================================================
--- stable/10/sys/arm/conf/HL200 Sun May 18 00:15:48 2014 (r266382)
+++ stable/10/sys/arm/conf/HL200 Sun May 18 00:21:14 2014 (r266383)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident HL200
include "../at91/std.hl200"
Modified: stable/10/sys/arm/conf/HL201
==============================================================================
--- stable/10/sys/arm/conf/HL201 Sun May 18 00:15:48 2014 (r266382)
+++ stable/10/sys/arm/conf/HL201 Sun May 18 00:21:14 2014 (r266383)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident HL201
include "../at91/std.hl201"
Modified: stable/10/sys/arm/conf/KB920X
==============================================================================
--- stable/10/sys/arm/conf/KB920X Sun May 18 00:15:48 2014 (r266382)
+++ stable/10/sys/arm/conf/KB920X Sun May 18 00:21:14 2014 (r266383)
@@ -18,6 +18,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident KB920X
include "../at91/std.kb920x"
Modified: stable/10/sys/arm/conf/NSLU
==============================================================================
--- stable/10/sys/arm/conf/NSLU Sun May 18 00:15:48 2014 (r266382)
+++ stable/10/sys/arm/conf/NSLU Sun May 18 00:21:14 2014 (r266383)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident NSLU
# XXX What is defined in std.avila does not exactly match the following:
Modified: stable/10/sys/arm/conf/QILA9G20
==============================================================================
--- stable/10/sys/arm/conf/QILA9G20 Sun May 18 00:15:48 2014 (r266382)
+++ stable/10/sys/arm/conf/QILA9G20 Sun May 18 00:21:14 2014 (r266383)
@@ -18,6 +18,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident QILA9G20
include "../at91/std.qila9g20"
Modified: stable/10/sys/arm/conf/QUARTZ
==============================================================================
--- stable/10/sys/arm/conf/QUARTZ Sun May 18 00:15:48 2014 (r266382)
+++ stable/10/sys/arm/conf/QUARTZ Sun May 18 00:21:14 2014 (r266383)
@@ -17,7 +17,9 @@
#
# $FreeBSD$
-include "VYBRID.common"
+#NO_UNIVERSE
+
+include "VYBRID"
ident QUARTZ
#FDT
Modified: stable/10/sys/arm/conf/SAM9260EK
==============================================================================
--- stable/10/sys/arm/conf/SAM9260EK Sun May 18 00:15:48 2014 (r266382)
+++ stable/10/sys/arm/conf/SAM9260EK Sun May 18 00:21:14 2014 (r266383)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident SAM9260EK
include "../at91/std.sam9260ek"
Modified: stable/10/sys/arm/conf/SAM9X25EK
==============================================================================
--- stable/10/sys/arm/conf/SAM9X25EK Sun May 18 00:15:48 2014 (r266382)
+++ stable/10/sys/arm/conf/SAM9X25EK Sun May 18 00:21:14 2014 (r266383)
@@ -17,7 +17,8 @@
#
# $FreeBSD$
-# NOUNIVERSE: disable building in make universe
+#NO_UNIVERSE
+
ident SAM9X25EK
include "../at91/std.sam9x25ek"
Modified: stable/10/sys/arm/conf/SN9G45
==============================================================================
--- stable/10/sys/arm/conf/SN9G45 Sun May 18 00:15:48 2014 (r266382)
+++ stable/10/sys/arm/conf/SN9G45 Sun May 18 00:21:14 2014 (r266383)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident SN9G45
include "../at91/std.sn9g45"
Copied and modified: stable/10/sys/arm/conf/VYBRID (from r265155, head/sys/arm/conf/VYBRID)
==============================================================================
--- head/sys/arm/conf/VYBRID Wed Apr 30 18:02:10 2014 (r265155, copy source)
+++ stable/10/sys/arm/conf/VYBRID Sun May 18 00:21:14 2014 (r266383)
@@ -147,3 +147,5 @@ device kbdmux
options SC_DFLT_FONT # compile font in
makeoptions SC_DFLT_FONT=cp437
device ukbd
+
+options FDT
Modified: stable/10/sys/arm/conf/WANDBOARD-DUAL
==============================================================================
--- stable/10/sys/arm/conf/WANDBOARD-DUAL Sun May 18 00:15:48 2014 (r266382)
+++ stable/10/sys/arm/conf/WANDBOARD-DUAL Sun May 18 00:21:14 2014 (r266383)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
include "IMX6"
ident WANDBOARD-DUAL
Modified: stable/10/sys/arm/conf/WANDBOARD-QUAD
==============================================================================
--- stable/10/sys/arm/conf/WANDBOARD-QUAD Sun May 18 00:15:48 2014 (r266382)
+++ stable/10/sys/arm/conf/WANDBOARD-QUAD Sun May 18 00:21:14 2014 (r266383)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
include "IMX6"
ident WANDBOARD-QUAD
Modified: stable/10/sys/arm/conf/WANDBOARD-SOLO
==============================================================================
--- stable/10/sys/arm/conf/WANDBOARD-SOLO Sun May 18 00:15:48 2014 (r266382)
+++ stable/10/sys/arm/conf/WANDBOARD-SOLO Sun May 18 00:21:14 2014 (r266383)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
include "IMX6"
ident WANDBOARD-SOLO
More information about the svn-src-all
mailing list