Module Name:    src
Committed By:   matt
Date:           Sat Mar  1 01:53:36 UTC 2014

Modified Files:
        src/distrib/evbarm/instkernel/instkernel: Makefile

Log Message:
Split ARMv6 and ARMv7 kernels.
Handle armeb properly.
Add CUBIEBOARD


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/distrib/evbarm/instkernel/instkernel/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/evbarm/instkernel/instkernel/Makefile
diff -u src/distrib/evbarm/instkernel/instkernel/Makefile:1.23 src/distrib/evbarm/instkernel/instkernel/Makefile:1.24
--- src/distrib/evbarm/instkernel/instkernel/Makefile:1.23	Fri Aug 30 10:13:39 2013
+++ src/distrib/evbarm/instkernel/instkernel/Makefile	Sat Mar  1 01:53:36 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.23 2013/08/30 10:13:39 skrll Exp $
+#	$NetBSD: Makefile,v 1.24 2014/03/01 01:53:36 matt Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -11,7 +11,6 @@ SSHRAMDISK=	${SSHRAMDISKDIR}/sshramdisk.
 .if ${MACHINE_ARCH} == "arm"
 # Little endian platforms.
 MDSETTARGETS=		ADI_BRH_INSTALL		${RAMDISK}	-	\
-			BCM5301X_INSTALL	${RAMDISK}	-	\
 			CP3100_INSTALL		${RAMDISK}	-	\
 			GEMINI_INSTALL		${RAMDISK}	-	\
 			GUMSTIX_INSTALL		${RAMDISK}	-	\
@@ -23,7 +22,7 @@ MDSETTARGETS=		ADI_BRH_INSTALL		${RAMDIS
 			TS7200_INSTALL		${RAMDISK}	- 	\
 			TEAMASA_NPWR_INSTALL	${RAMDISK}	-	\
 			KUROBOX_PRO_INSTALL	${RAMDISK}	-
-.else
+.elif ${MACHINE_ARCH} == "armeb"
 # Big endian platforms.
 MDSETTARGETS=		ADI_BRH_INSTALL		${RAMDISK}	-
 .endif
@@ -34,9 +33,20 @@ MDSETTARGETS=		ADI_BRH_INSTALL		${RAMDIS
     ${MACHINE_ARCH} == "earmhf" || \
     ${MACHINE_ARCH} == "earmv6" || \
     ${MACHINE_ARCH} == "earmv6hf"
-# Little endian (any ABI) platforms.
-MDSETTARGETS+=		RPI_INSTALL		${SSHRAMDISK}	-	\
-			BEAGLEBONE_INSTALL	${RAMDISK}	-
+# Little endian (any ABI) ARMv6 platforms.
+MDSETTARGETS+=		RPI_INSTALL		${SSHRAMDISK}	-
+.endif
+
+.if \
+    ${MACHINE_ARCH} == "arm" || \
+    ${MACHINE_ARCH} == "earm" || \
+    ${MACHINE_ARCH} == "earmhf" || \
+    ${MACHINE_ARCH} == "earmv7" || \
+    ${MACHINE_ARCH} == "earmv7hf"
+# Little endian (any ABI) ARMv7 platforms.
+MDSETTARGETS+=		BCM5301X_INSTALL	${RAMDISK}	-	\
+			BEAGLEBONE_INSTALL	${RAMDISK}	-	\
+			CUBIEBOARD_INSTALL	${RAMDISK}	-
 .endif
 
 MDSET_RELEASEDIR=	installation/instkernel

Reply via email to