[src/trunk]: src/etc/etc.evbarm Build arm64.img for aarch64eb with a LE FFS, ...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fd439655c8c4
branches:  trunk
changeset: 976732:fd439655c8c4
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Oct 02 17:27:12 2020 +0000

description:
Build arm64.img for aarch64eb with a LE FFS, and include GENERIC64 in
release builds.

diffstat:

 etc/etc.evbarm/Makefile.inc |  14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diffs (49 lines):

diff -r bc6e687cf5f2 -r fd439655c8c4 etc/etc.evbarm/Makefile.inc
--- a/etc/etc.evbarm/Makefile.inc       Fri Oct 02 14:59:56 2020 +0000
+++ b/etc/etc.evbarm/Makefile.inc       Fri Oct 02 17:27:12 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.120 2020/05/28 10:22:49 jmcneill Exp $
+#      $NetBSD: Makefile.inc,v 1.121 2020/10/02 17:27:12 jmcneill Exp $
 #
 #      etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
 #
@@ -12,7 +12,12 @@
 EVBARM_BOARDS.${i}=
 .endfor
 
-.if !empty(MACHINE_ARCH:M*eb)
+.if ${MACHINE_ARCH} == "aarch64eb"
+# For AArch64 BE images, we need a LE image for efiboot to be able to
+# read the target file-system (no libsa FFS EI support).
+IMAGEENDIAN=   le
+KERNEL_SETS.arm64+=            GENERIC64
+.elif !empty(MACHINE_ARCH:M*eb)
 IMAGEENDIAN=   be
 # big endian boards
 KERNEL_SETS.armv4+=            IXM1200
@@ -114,6 +119,7 @@
 ARCHES.earmv7eb=       armv7
 ARCHES.earmv7hfeb=     armv7hf
 ARCHES.aarch64=                arm64
+ARCHES.aarch64eb=      arm64
 .for arch in ${ARCHES.${MACHINE_ARCH}}
 .for board in ${EVBARM_BOARDS.${arch}}
 KERNEL_SETS+=          ${board}
@@ -122,7 +128,7 @@
 KERNEL_SETS+=          ${KERNEL_SETS.${arch}}
 .endfor
 
-.if !empty(MACHINE_ARCH:Maarch64)
+.if !empty(MACHINE_ARCH:Maarch64*)
 smp_efibootaa64:
        cd ${KERNSRCDIR}/stand/efiboot/bootaa64 && ${MAKE} release
 SNAP_MD_POST_DEPS+=    smp_efibootaa64
@@ -142,7 +148,7 @@
 SNAP_MD_POST_DEPS+=    smp_armv7
 .endif
 
-.if !empty(MACHINE_ARCH:Maarch64) && empty(ALL_KERNELS)
+.if !empty(MACHINE_ARCH:Maarch64*) && empty(ALL_KERNELS)
 smp_arm64: __mkimage
 MKI_OPTS.smp_arm64=    -K ${IMAGE.kern}
 SNAP_MD_POST_DEPS+=    smp_arm64