From b9cfa74e664620a844aa6dc1e5310ca535000afc Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Mon, 20 Oct 2025 16:09:23 +0100 Subject: [PATCH] arm/edk2-firmware: move the gcc toolchain force to the versioned recipe Hopefully this issue can be fixed in a newer release. Move the toolchain forcing to the versioned so that it can be tracked easier. Signed-off-by: Jon Mason --- meta-arm/recipes-bsp/uefi/edk2-firmware.inc | 3 --- meta-arm/recipes-bsp/uefi/edk2-firmware_202508.bb | 5 ++++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc index a5590d3b..8b6f153a 100644 --- a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc +++ b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc @@ -82,9 +82,6 @@ EDK_COMPILER:toolchain-clang = "CLANGDWARF" export CLANG38_AARCH64_PREFIX = "${TARGET_PREFIX}" export CLANG38_ARM_PREFIX = "${TARGET_PREFIX}" -#FIXME - arm32 doesn't work with clang due to a linker issue -TOOLCHAIN:arm = "gcc" - do_configure:prepend() { sed -i -e "s#-target ${HOST_ARCH}-linux-gnu.*#-target ${HOST_SYS}#" ${S}/BaseTools/Conf/tools_def.template } diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202508.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_202508.bb index 6a82835f..7d766d59 100644 --- a/meta-arm/recipes-bsp/uefi/edk2-firmware_202508.bb +++ b/meta-arm/recipes-bsp/uefi/edk2-firmware_202508.bb @@ -3,4 +3,7 @@ require recipes-bsp/uefi/edk2-firmware.inc SRCREV_edk2 ?= "d46aa46c8361194521391aa581593e556c707c6e" SRCREV_edk2-platforms ?= "d82aa92c1d360c1b53ccad4dc45bdd8164a560d5" -SRC_URI += " file://edk2_fix_epoch.patch" +SRC_URI += "file://edk2_fix_epoch.patch" + +#FIXME - arm32 doesn't work with clang due to a linker issue +TOOLCHAIN:arm = "gcc"