From 24ef21c36b52aaf5f3c542b27faf6e2f4e288ddd Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 11 Jan 2022 18:30:43 +0000 Subject: [PATCH] arm-bsp/edk2-firmware: enable building EDK2 for Juno This doesn't build successfully with Clang, so for now the build forces the use of GCC. Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-juno.inc | 10 ++++++++++ meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_%.bbappend | 1 + 2 files changed, 11 insertions(+) create mode 100644 meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-juno.inc diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-juno.inc b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-juno.inc new file mode 100644 index 00000000..076c551a --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-juno.inc @@ -0,0 +1,10 @@ +EDK2_PLATFORM = "ArmJuno" +EDK2_PLATFORM_DSC = "Platform/ARM/JunoPkg/ArmJuno.dsc" +EDK2_BIN_NAME = "BL33_AP_UEFI.fd" + +COMPATIBLE_MACHINE = "juno" + +# As of 2022-01-10 the Juno build fails with Clang: +# edk2-firmware/202111-r0/edk2/edk2-platforms/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c:216:11: +# error: variable 'FileSize' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized] +TOOLCHAIN = "gcc" diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_%.bbappend b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_%.bbappend index bb3845d1..e5018bb0 100644 --- a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_%.bbappend +++ b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_%.bbappend @@ -3,6 +3,7 @@ MACHINE_EDK2_REQUIRE ?= "" MACHINE_EDK2_REQUIRE:fvp-base = "edk2-firmware-fvp-base.inc" +MACHINE_EDK2_REQUIRE:juno = "edk2-firmware-juno.inc" MACHINE_EDK2_REQUIRE:sgi575 = "edk2-firmware-sgi575.inc" MACHINE_EDK2_REQUIRE:n1sdp = "edk2-firmware-n1sdp.inc"