Module Name:    src
Committed By:   jmcneill
Date:           Tue Sep  8 16:39:36 UTC 2020

Modified Files:
        src/distrib/sets/lists/base: ad.aarch64 ad.arm
        src/sys/arch/evbarm/stand: Makefile

Log Message:
Build EFI bootloader on big endian armv7 and aarch64 targets.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/base/ad.aarch64
cvs rdiff -u -r1.81 -r1.82 src/distrib/sets/lists/base/ad.arm
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/stand/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/sets/lists/base/ad.aarch64
diff -u src/distrib/sets/lists/base/ad.aarch64:1.32 src/distrib/sets/lists/base/ad.aarch64:1.33
--- src/distrib/sets/lists/base/ad.aarch64:1.32	Thu Sep  3 18:58:48 2020
+++ src/distrib/sets/lists/base/ad.aarch64	Tue Sep  8 16:39:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.32 2020/09/03 18:58:48 jakllsch Exp $
+# $NetBSD: ad.aarch64,v 1.33 2020/09/08 16:39:36 jmcneill Exp $
 ./lib/eabi					base-compat-lib		compat,llvm
 ./lib/eabi/npf					base-compat-lib		compat,llvm
 ./lib/eabihf					base-compat-lib		compat,llvm
@@ -37,7 +37,7 @@
 ./usr/libexec/ld.elf_so-eabi			base-compat-shlib	compat,pic,llvm
 ./usr/libexec/ld.elf_so-eabihf			base-compat-shlib	compat,pic,llvm
 ./usr/libexec/ld.elf_so-oabi			base-sysutil-bin	compat,pic,llvm
-./usr/mdec/bootaa64.efi				base-sysutil-bin	endian=1234
+./usr/mdec/bootaa64.efi				base-sysutil-bin
 ./usr/sbin/acpidump				base-sysutil-bin	endian=1234
 ./usr/sbin/amldb				base-sysutil-bin	endian=1234
 ./usr/sbin/ofctl				base-sysutil-bin

Index: src/distrib/sets/lists/base/ad.arm
diff -u src/distrib/sets/lists/base/ad.arm:1.81 src/distrib/sets/lists/base/ad.arm:1.82
--- src/distrib/sets/lists/base/ad.arm:1.81	Sat Mar 30 13:02:39 2019
+++ src/distrib/sets/lists/base/ad.arm	Tue Sep  8 16:39:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.81 2019/03/30 13:02:39 jmcneill Exp $
+# $NetBSD: ad.arm,v 1.82 2020/09/08 16:39:36 jmcneill Exp $
 ./libexec/ld.elf_so-oabi			base-sysutil-bin	compat,pic
 ./sbin/ldconfig					base-sysutil-root	pic,endian=1234
 ./usr/bin/fdformat				base-util-bin
@@ -17,7 +17,7 @@
 ./usr/mdec/boot26,ffa				base-obsolete		obsolete
 ./usr/mdec/boot32				base-sysutil-bin	endian=1234
 ./usr/mdec/boot32,ffa				base-sysutil-bin	endian=1234
-./usr/mdec/bootarm.efi				base-sysutil-bin	endian=1234,machine_arch=earmv7hf
+./usr/mdec/bootarm.efi				base-sysutil-bin	machine_arch=earmv7hf
 ./usr/mdec/bootimx23				base-sysutil-bin	endian=1234
 ./usr/mdec/bootmini2440				base-sysutil-bin
 ./usr/mdec/gzboot_ADI_BRH_0x00140000.bin	base-sysutil-bin

Index: src/sys/arch/evbarm/stand/Makefile
diff -u src/sys/arch/evbarm/stand/Makefile:1.11 src/sys/arch/evbarm/stand/Makefile:1.12
--- src/sys/arch/evbarm/stand/Makefile:1.11	Fri Sep  4 02:15:52 2020
+++ src/sys/arch/evbarm/stand/Makefile	Tue Sep  8 16:39:36 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2020/09/04 02:15:52 jakllsch Exp $
+#	$NetBSD: Makefile,v 1.12 2020/09/08 16:39:36 jmcneill Exp $
 
 .include <bsd.endian.mk>
 
@@ -12,11 +12,11 @@ SUBDIR+= bootimx23
 .endif
 .endif
 
-.if ${MACHINE_ARCH} == "aarch64"
+.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "aarch64eb"
 SUBDIR+= ../../../stand/efiboot/bootaa64
 .endif
 
-.if ${MACHINE_ARCH} == "earmv7hf"
+.if ${MACHINE_ARCH} == "earmv7hf" || ${MACHINE_ARCH} == "earmv7hfeb"
 SUBDIR+= ../../../stand/efiboot/bootarm
 .endif
 

Reply via email to