From: Ben Wolsieffer Date: Sun, 27 Apr 2025 23:07:25 +0000 (-0400) Subject: Add HOST_ARCH detection for armv5tel and armv6l X-Git-Tag: v2025.07-rc2~31 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=03f5101ff50d1b449c65a4483c725b4ae0446c62;p=thirdparty%2Fu-boot.git Add HOST_ARCH detection for armv5tel and armv6l Since 7506c15, HOST_ARCH is now used by the EFI loader even when CONFIG_SANDBOX is disabled. When cross-compiling, the Makefile defines HOST_ARCH based on the cross-compiler prefix, but this definition fails to cover some common compiler prefixes. When cross-compiling U-Boot in nixpkgs, we use CROSS_COMPILE=armv6l-unknown-linux-gnueabihf-, which results in HOST_ARCH being undefined and causes a build failure. Fix this by adding armv6l to the match for ARM. Also add armv5tel, as this is another possible ARM compiler prefix. Signed-off-by: ZHANG Yuntian Signed-off-by: Ben Wolsieffer --- diff --git a/Makefile b/Makefile index 8f60b27b710..15c7e633b87 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ else ifneq (,$(findstring $(MK_ARCH), "i386" "i486" "i586" "i686")) export HOST_ARCH=$(HOST_ARCH_X86) else ifneq (,$(findstring $(MK_ARCH), "aarch64" "armv8l")) export HOST_ARCH=$(HOST_ARCH_AARCH64) -else ifneq (,$(findstring $(MK_ARCH), "arm" "armv7" "armv7a" "armv7l")) +else ifneq (,$(findstring $(MK_ARCH), "arm" "armv5tel" "armv6l" "armv7" "armv7a" "armv7l")) export HOST_ARCH=$(HOST_ARCH_ARM) else ifeq ("riscv32", $(MK_ARCH)) export HOST_ARCH=$(HOST_ARCH_RISCV32)