From 200ccaa637316cd66e85015685b84776961c7275 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Thu, 4 Jun 2026 14:16:03 -0400 Subject: [PATCH] arm/uefi: update edk2-firmware to 202605 Update edk2-firmware to the latest release. Of note, GCC5 make variable has been removed. Use the GCC make variable instead. Also, these changes caused the need to modify the sbsa-acs patches. Signed-off-by: Jon Mason --- ...602.bb => edk2-basetools-native_202605.bb} | 2 +- meta-arm/recipes-bsp/uefi/edk2-firmware.inc | 6 +-- .../recipes-bsp/uefi/edk2-firmware_202602.bb | 6 --- .../recipes-bsp/uefi/edk2-firmware_202605.bb | 4 ++ ...-C-VfrCompile-Fix-parallel-make-fail.patch | 46 ------------------- ...02-Enforce-using-good-old-BFD-linker.patch | 22 ++++----- meta-arm/recipes-bsp/uefi/sbsa-acs_7.2.2.bb | 2 +- 7 files changed, 20 insertions(+), 68 deletions(-) rename meta-arm/recipes-bsp/uefi/{edk2-basetools-native_202602.bb => edk2-basetools-native_202605.bb} (97%) delete mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202602.bb create mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202605.bb delete mode 100644 meta-arm/recipes-bsp/uefi/files/0001-BaseTools-Source-C-VfrCompile-Fix-parallel-make-fail.patch diff --git a/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202602.bb b/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202605.bb similarity index 97% rename from meta-arm/recipes-bsp/uefi/edk2-basetools-native_202602.bb rename to meta-arm/recipes-bsp/uefi/edk2-basetools-native_202605.bb index 28bd0dba..e10b85cb 100644 --- a/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202602.bb +++ b/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202605.bb @@ -17,7 +17,7 @@ SRC_URI = " \ " LIC_FILES_CHKSUM = "file://License.txt;md5=2b415520383f7964e96700ae12b4570a" -SRCREV = "b7a715f7c03c45c6b4575bf88596bfd79658b8ce" +SRCREV = "b03a21a63e3bd001f52c527e5a57feddb53a690b" SRCREV_brotli = "e230f474b87134e8c6c85b630084c612057f253e" SRCREV_FORMAT = "default_brotli" diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc index 8b6f153a..e12a490f 100644 --- a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc +++ b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc @@ -74,9 +74,9 @@ export CONF_PATH = "${S}/Conf" export BTOOLS_PATH = "${EDK_TOOLS_PATH}/BinWrappers/PosixLike" -EDK_COMPILER ?= "GCC5" -export GCC5_AARCH64_PREFIX = "${TARGET_PREFIX}" -export GCC5_ARM_PREFIX = "${TARGET_PREFIX}" +EDK_COMPILER ?= "GCC" +export GCC_AARCH64_PREFIX = "${TARGET_PREFIX}" +export GCC_ARM_PREFIX = "${TARGET_PREFIX}" EDK_COMPILER:toolchain-clang = "CLANGDWARF" export CLANG38_AARCH64_PREFIX = "${TARGET_PREFIX}" diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202602.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_202602.bb deleted file mode 100644 index de739f37..00000000 --- a/meta-arm/recipes-bsp/uefi/edk2-firmware_202602.bb +++ /dev/null @@ -1,6 +0,0 @@ -require recipes-bsp/uefi/edk2-firmware.inc - -SRCREV_edk2 ?= "b7a715f7c03c45c6b4575bf88596bfd79658b8ce" -SRCREV_edk2-platforms ?= "75024f5aa54cf4d975d024768604b28c754db338" - -SRC_URI += "file://0001-BaseTools-Source-C-VfrCompile-Fix-parallel-make-fail.patch" diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202605.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_202605.bb new file mode 100644 index 00000000..8f1afe13 --- /dev/null +++ b/meta-arm/recipes-bsp/uefi/edk2-firmware_202605.bb @@ -0,0 +1,4 @@ +require recipes-bsp/uefi/edk2-firmware.inc + +SRCREV_edk2 ?= "b03a21a63e3bd001f52c527e5a57feddb53a690b" +SRCREV_edk2-platforms ?= "04470160f67192c53ec9192e0e8460d183fe49ec" diff --git a/meta-arm/recipes-bsp/uefi/files/0001-BaseTools-Source-C-VfrCompile-Fix-parallel-make-fail.patch b/meta-arm/recipes-bsp/uefi/files/0001-BaseTools-Source-C-VfrCompile-Fix-parallel-make-fail.patch deleted file mode 100644 index 7e7353fb..00000000 --- a/meta-arm/recipes-bsp/uefi/files/0001-BaseTools-Source-C-VfrCompile-Fix-parallel-make-fail.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 5f8c99d9a7fe88301b01a7015375a827eecc7985 Mon Sep 17 00:00:00 2001 -From: Michael D Kinney -Date: Thu, 26 Feb 2026 11:48:11 -0500 -Subject: [PATCH] BaseTools/Source/C/VfrCompile: Fix parallel make failures - -Update makefile rules to run antlr and dlg to completion -before compiling any of the generated cpp files. - -Without this change, parallel make may start compiling some -of the cpp files before both antlr and dlg have finished -which produces syntax errors from compilation with partially -generated files. - -Also use &: so the targets are treated as a group and the -rule is only executed once for the entire group. Without -this change, parallel make may run the rule actions more -than once and modify the output while it is being used by -another rule. - -Signed-off-by: Michael D Kinney - -Upstream-Status: Backport [2f75effb93999adadeead511dd76f86833649b45] -Signed-off-by: Jon Mason ---- - BaseTools/Source/C/VfrCompile/GNUmakefile | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/BaseTools/Source/C/VfrCompile/GNUmakefile b/BaseTools/Source/C/VfrCompile/GNUmakefile -index b469bd3f303f..4f10b1d9338b 100644 ---- a/BaseTools/Source/C/VfrCompile/GNUmakefile -+++ b/BaseTools/Source/C/VfrCompile/GNUmakefile -@@ -54,10 +54,11 @@ VfrCompiler.o: ../Include/Common/BuildVersion.h - - include $(MAKEROOT)/Makefiles/footer.makefile - --VfrSyntax.cpp EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg VfrTokens.h: Pccts/antlr/antlr VfrSyntax.g -- Pccts/antlr/antlr -CC -e3 -ck 3 -k 2 -fl VfrParser.dlg -ft VfrTokens.h -o . VfrSyntax.g -+ANTLR_GEN = VfrSyntax.cpp EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg VfrTokens.h -+DLG_GEN = VfrLexer.cpp VfrLexer.h - --VfrLexer.cpp VfrLexer.h: Pccts/dlg/dlg VfrParser.dlg -+$(ANTLR_GEN) $(DLG_GEN) &: Pccts/antlr/antlr Pccts/dlg/dlg VfrSyntax.g -+ Pccts/antlr/antlr -CC -e3 -ck 3 -k 2 -fl VfrParser.dlg -ft VfrTokens.h -o . VfrSyntax.g - Pccts/dlg/dlg -C2 -i -CC -cl VfrLexer -o . VfrParser.dlg - - Pccts/antlr/antlr: diff --git a/meta-arm/recipes-bsp/uefi/sbsa-acs/0002-Enforce-using-good-old-BFD-linker.patch b/meta-arm/recipes-bsp/uefi/sbsa-acs/0002-Enforce-using-good-old-BFD-linker.patch index 42523d0e..7c02100d 100644 --- a/meta-arm/recipes-bsp/uefi/sbsa-acs/0002-Enforce-using-good-old-BFD-linker.patch +++ b/meta-arm/recipes-bsp/uefi/sbsa-acs/0002-Enforce-using-good-old-BFD-linker.patch @@ -1,4 +1,4 @@ -From af134611c744322e1d159794c426fbdd02e151cc Mon Sep 17 00:00:00 2001 +From 8509abdab8ad75d59d6bc2478bba78b50c59ad82 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 7 Apr 2021 00:16:07 -0400 Subject: [PATCH] Enforce using good old BFD linker @@ -25,15 +25,15 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template -index 90a389bdff07..93f7b5cde437 100755 +index eca4cb82d059..ec4e30f3df84 100644 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template -@@ -839,7 +839,7 @@ DEFINE GCC_LOONGARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mabi=lp64d -fno-asyn - DEFINE GCC_AARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -fno-short-enums -fverbose-asm -funsigned-char -ffunction-sections -fdata-sections -Wno-address -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-pic -fno-pie -ffixed-x18 -mstack-protector-guard=global - DEFINE GCC_AARCH64_CC_XIPFLAGS = -mstrict-align -mgeneral-regs-only - DEFINE GCC_RISCV64_CC_XIPFLAGS = -mstrict-align -mgeneral-regs-only --DEFINE GCC_DLINK2_FLAGS_COMMON = -Wl,--script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds -+DEFINE GCC_DLINK2_FLAGS_COMMON = -fuse-ld=bfd -Wl,--script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds - DEFINE GCC_LOONGARCH64_DLINK_COMMON= -Wl,--emit-relocs -nostdlib -Wl,--gc-sections -u $(IMAGE_ENTRY_POINT) -Wl,-e,$(IMAGE_ENTRY_POINT),-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map - DEFINE GCC_AARCH64_DLINK_FLAGS = -Wl,--emit-relocs -nostdlib -Wl,--gc-sections -u $(IMAGE_ENTRY_POINT) -Wl,-e,$(IMAGE_ENTRY_POINT),-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map -z common-page-size=0x20 - DEFINE GCC_LOONGARCH64_DLINK_FLAGS = DEF(GCC_LOONGARCH64_DLINK_COMMON) -z common-page-size=0x20 +@@ -931,7 +931,7 @@ DEFINE GCC_LOONGARCH64_CC_FLAGS = DEF(GCC_ALL_CC_COMMON) -mabi=lp64d -fno + DEFINE GCC_AARCH64_CC_COMMON = DEF(GCC_ALL_CC_COMMON) -mlittle-endian -fno-short-enums -fverbose-asm -funsigned-char -ffunction-sections -fdata-sections -Wno-address -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-pic -fno-pie -ffixed-x18 -mstack-protector-guard=global + DEFINE GCC_AARCH64_CC_XIPCOMMON = -mstrict-align -mgeneral-regs-only + DEFINE GCC_RISCV64_CC_XIPFLAGS = -mstrict-align -mgeneral-regs-only +-DEFINE GCC_DLINK2_FLAGS_COMMON = -Wl,--script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds ++DEFINE GCC_DLINK2_FLAGS_COMMON = -fuse-ld=bfd -Wl,--script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds + DEFINE GCC_AARCH64_DLINK_COMMON = -Wl,--emit-relocs -nostdlib -Wl,--gc-sections -u $(IMAGE_ENTRY_POINT) -Wl,-e,$(IMAGE_ENTRY_POINT),-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map + DEFINE GCC_LOONGARCH64_DLINK_COMMON = -Wl,--emit-relocs -nostdlib -Wl,--gc-sections -u $(IMAGE_ENTRY_POINT) -Wl,-e,$(IMAGE_ENTRY_POINT),-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map -z common-page-size=0x20 + DEFINE GCC_AARCH64_ASLDLINK_COMMON = DEF(GCC_AARCH64_DLINK_COMMON) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) -Wl,--defsym=PECOFF_HEADER_SIZE=0 DEF(GCC_DLINK2_FLAGS_COMMON) -z common-page-size=0x20 diff --git a/meta-arm/recipes-bsp/uefi/sbsa-acs_7.2.2.bb b/meta-arm/recipes-bsp/uefi/sbsa-acs_7.2.2.bb index bc8187eb..6d4422f9 100644 --- a/meta-arm/recipes-bsp/uefi/sbsa-acs_7.2.2.bb +++ b/meta-arm/recipes-bsp/uefi/sbsa-acs_7.2.2.bb @@ -1,4 +1,4 @@ -require recipes-bsp/uefi/edk2-firmware_202602.bb +require recipes-bsp/uefi/edk2-firmware_202605.bb PROVIDES:remove = "virtual/bootloader" LICENSE += "& Apache-2.0"