From 889736fa06433c6757e78d0f20cec3d9dc52a9a9 Mon Sep 17 00:00:00 2001 From: Bryce Johnson Date: Tue, 22 Oct 2024 15:03:34 -0600 Subject: [PATCH] package/arm-gnu-toolchain: use $(HOSTARCH) to allow use on aarch64 When building on an ARM64 build server, the build of configs/ti_am62x_sk_defconfig fails when building the Cortex-R5 U-Boot, as it uses host-arm-gnu-toolchain, which assumes the host machine is x86-64. Use $(HOSTARCH) instead so that it can download the bare-metal toolchain also provided by ARM for the ARM64 host architecture. Signed-off-by: Bryce Johnson Signed-off-by: Thomas Petazzoni --- package/arm-gnu-toolchain/arm-gnu-toolchain.hash | 2 ++ package/arm-gnu-toolchain/arm-gnu-toolchain.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/arm-gnu-toolchain/arm-gnu-toolchain.hash b/package/arm-gnu-toolchain/arm-gnu-toolchain.hash index 0800fa2168..110ec40c09 100644 --- a/package/arm-gnu-toolchain/arm-gnu-toolchain.hash +++ b/package/arm-gnu-toolchain/arm-gnu-toolchain.hash @@ -1,2 +1,4 @@ # taken from https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz.sha256asc sha256 6cd1bbc1d9ae57312bcd169ae283153a9572bd6a8e4eeae2fedfbc33b115fdbb arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz +# taken from https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-aarch64-arm-none-eabi.tar.xz.sha256asc +sha256 8fd8b4a0a8d44ab2e195ccfbeef42223dfb3ede29d80f14dcf2183c34b8d199a arm-gnu-toolchain-13.2.rel1-aarch64-arm-none-eabi.tar.xz diff --git a/package/arm-gnu-toolchain/arm-gnu-toolchain.mk b/package/arm-gnu-toolchain/arm-gnu-toolchain.mk index 03bb4dc5da..fce80f2f3a 100644 --- a/package/arm-gnu-toolchain/arm-gnu-toolchain.mk +++ b/package/arm-gnu-toolchain/arm-gnu-toolchain.mk @@ -6,7 +6,7 @@ ARM_GNU_TOOLCHAIN_VERSION = 13.2.rel1 ARM_GNU_TOOLCHAIN_SITE = https://developer.arm.com/-/media/Files/downloads/gnu/$(ARM_GNU_TOOLCHAIN_VERSION)/binrel -ARM_GNU_TOOLCHAIN_SOURCE = arm-gnu-toolchain-$(ARM_GNU_TOOLCHAIN_VERSION)-x86_64-arm-none-eabi.tar.xz +ARM_GNU_TOOLCHAIN_SOURCE = arm-gnu-toolchain-$(ARM_GNU_TOOLCHAIN_VERSION)-$(HOSTARCH)-arm-none-eabi.tar.xz ARM_GNU_TOOLCHAIN_LICENSE = GPL-3.0+ HOST_ARM_GNU_TOOLCHAIN_INSTALL_DIR = $(HOST_DIR)/opt/gcc-arm-none-eabi