Module Name: src
Committed By: skrll
Date: Sun Nov 4 21:41:12 UTC 2018
Modified Files:
src/etc/etc.evbarm: Makefile.inc
Log Message:
Only add GENERIC to earmv6 and earmv7 builds
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/etc/etc.evbarm/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.97 src/etc/etc.evbarm/Makefile.inc:1.98
--- src/etc/etc.evbarm/Makefile.inc:1.97 Thu Nov 1 18:23:25 2018
+++ src/etc/etc.evbarm/Makefile.inc Sun Nov 4 21:41:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.97 2018/11/01 18:23:25 skrll Exp $
+# $NetBSD: Makefile.inc,v 1.98 2018/11/04 21:41:12 skrll Exp $
#
# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
#
@@ -24,8 +24,6 @@ EVBARM_BOARDS.armv7+= BCM5301X
EVBARM_BOARDS.armv7hf+= BCM5301X
#EVBARM_BOARDS.armv7+= BCM56340
#EVBARM_BOARDS.armv7hf+= BCM56340
-KERNEL_SETS.armv7+= GENERIC
-KERNEL_SETS.armv7hf+= GENERIC
KERNEL_SETS.armv7+= SUNXI
KERNEL_SETS.armv7hf+= SUNXI
KERNEL_SETS.armv7+= VEXPRESS_A15
@@ -98,8 +96,6 @@ EVBARM_BOARDS.armv7+= CUBOX
EVBARM_BOARDS.armv7hf+= CUBOX
EVBARM_BOARDS.armv7+= CUBOX-I
EVBARM_BOARDS.armv7hf+= CUBOX-I
-KERNEL_SETS.armv7+= GENERIC
-KERNEL_SETS.armv7hf+= GENERIC
#EVBARM_BOARDS.armv7+= IGEPV2
EVBARM_BOARDS.armv7+= IMX6UL-STARTER
EVBARM_BOARDS.armv7hf+= IMX6UL-STARTER
@@ -179,6 +175,10 @@ BUILD_KERNELS+= ${board}_INSTALL
KERNEL_SETS+= ${KERNEL_SETS.${arch}}
.endfor
+.if !empty(MACHINE_ARCH:M*earmv[67])
+KERNEL_SETS+= GENERIC
+.endif
+
.if !empty(MACHINE_ARCH:Maarch64)
smp_efibootaa64:
cd ${KERNSRCDIR}/stand/efiboot/bootaa64 && ${MAKE} release
