Module Name: src
Committed By: rin
Date: Mon Nov 16 11:38:30 UTC 2020
Modified Files:
src/distrib/evbarm: Makefile
src/distrib/evbarm/installimage: Makefile
src/distrib/evbarm/instkernel/ramdisk: Makefile
Log Message:
Correctly support aarch64eb and earmv7hfeb in a similar manner to
their little-endian counterparts.
Fix build failures for periodic binary snapshots.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/evbarm/Makefile
cvs rdiff -u -r1.6 -r1.7 src/distrib/evbarm/installimage/Makefile
cvs rdiff -u -r1.19 -r1.20 src/distrib/evbarm/instkernel/ramdisk/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/Makefile
diff -u src/distrib/evbarm/Makefile:1.14 src/distrib/evbarm/Makefile:1.15
--- src/distrib/evbarm/Makefile:1.14 Thu Oct 15 08:59:57 2020
+++ src/distrib/evbarm/Makefile Mon Nov 16 11:38:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/10/15 08:59:57 jmcneill Exp $
+# $NetBSD: Makefile,v 1.15 2020/11/16 11:38:29 rin Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -6,10 +6,10 @@
.include <bsd.kernobj.mk>
SUBDIR= gzboot instkernel
-.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "earmv7hf"
+.if !empty(MACHINE_ARCH:Maarch64*) || !empty(MACHINE_ARCH:Mearmv7hf*)
SUBDIR+= installimage
.endif
-.if ${MACHINE_ARCH} == "aarch64"
+.if !empty(MACHINE_ARCH:Maarch64*)
SUBDIR+= isoimage
.endif
TARGETS+= release
@@ -22,7 +22,7 @@ release: check_RELEASEDIR .WAIT ${MDECBO
${RELEASE_INSTALL} ${MDECBOOT} ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation
.endif
-.if ${MACHINE_ARCH} == "aarch64"
+.if !empty(MACHINE_ARCH:Maarch64*)
iso_image:
${MAKEDIRTARGET} isoimage iso_image
.endif
Index: src/distrib/evbarm/installimage/Makefile
diff -u src/distrib/evbarm/installimage/Makefile:1.6 src/distrib/evbarm/installimage/Makefile:1.7
--- src/distrib/evbarm/installimage/Makefile:1.6 Tue Jun 2 14:27:32 2020
+++ src/distrib/evbarm/installimage/Makefile Mon Nov 16 11:38:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2020/06/02 14:27:32 jmcneill Exp $
+# $NetBSD: Makefile,v 1.7 2020/11/16 11:38:29 rin Exp $
.include <bsd.own.mk>
@@ -6,10 +6,10 @@ INSTIMGBASE= NetBSD-${DISTRIBVER}-${MACH
INSTIMAGEMB?= 1550 # for all installation binaries
-.if ${MACHINE_ARCH} == "aarch64"
+.if !empty(MACHINE_ARCH:Maarch64*)
EFIBOOT= ${WORKDIR}/usr/mdec/bootaa64.efi
KERN_SET= kern-GENERIC64
-.elif ${MACHINE_ARCH} == "earmv7hf"
+.elif !empty(MACHINE_ARCH:Mearmv7hf*)
EFIBOOT+= ${WORKDIR}/usr/mdec/bootarm.efi
KERN_SET= kern-GENERIC
.endif
Index: src/distrib/evbarm/instkernel/ramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/ramdisk/Makefile:1.19 src/distrib/evbarm/instkernel/ramdisk/Makefile:1.20
--- src/distrib/evbarm/instkernel/ramdisk/Makefile:1.19 Sun Apr 1 04:35:01 2018
+++ src/distrib/evbarm/instkernel/ramdisk/Makefile Mon Nov 16 11:38:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2018/04/01 04:35:01 ryo Exp $
+# $NetBSD: Makefile,v 1.20 2020/11/16 11:38:29 rin Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -28,7 +28,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
-.if !empty(MACHINE_ARCH:Maarch64)
+.if !empty(MACHINE_ARCH:Maarch64*)
UBOOT_IMAGE_ARCH= arm64
.else
UBOOT_IMAGE_ARCH= arm
