Skip to contentSkip to conversation

arm/edk2-firmware: update to 202505

PATCH Applied Jon Mason 2 participants 2 messages Jun 11, 2025 – Jun 12, 2025

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/1 arm/edk2-firmware: update to 202505

Update to the latest version of edk2-firmware. The sgi issue has been corrected upstream, so the patch can now be dropped. Also, no longer seeing the RELEASE issue on qemuarm/qemuarm64, and removing that workaround.

---
 .../recipes-bsp/uefi/edk2-firmware-sgi575.inc |  3 --
 ...tform-Sgi-workaround-ArmFfaLib-error.patch | 41 -------------------
 .../recipes-bsp/uefi/edk2-firmware_%.bbappend |  6 ---
 ...ware_202502.bb => edk2-firmware_202505.bb} |  4 +-
 meta-arm/recipes-bsp/uefi/sbsa-acs_7.2.2.bb   |  2 +-
 5 files changed, 3 insertions(+), 53 deletions(-)
 delete mode 100644 meta-arm-bsp/recipes-bsp/uefi/files/0001-Platform-Sgi-workaround-ArmFfaLib-error.patch
 rename meta-arm/recipes-bsp/uefi/{edk2-firmware_202502.bb => edk2-firmware_202505.bb} (53%)
meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc +0 -3
index 042ed59a1ad8..e26225f87a07 100644
@@ -5,6 +5,3 @@ EDK2_PLATFORM_DSC  = "Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc"
 EDK2_BIN_NAME      = "BL33_AP_UEFI.fd"
 
 COMPATIBLE_MACHINE = "sgi575"
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-SRC_URI += " file://0001-Platform-Sgi-workaround-ArmFfaLib-error.patch;patchdir=edk2-platforms"
meta-arm-bsp/recipes-bsp/uefi/files/0001-Platform-Sgi-workaround-ArmFfaLib-error.patch deleted +0 -41

41 lines not on this page · raw message

meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend +0 -6
index 56e785aeb13d..64ec53b35791 100644
@@ -4,9 +4,6 @@ EDK2_PLATFORM_DSC:qemuarm64  = "ArmVirtPkg/ArmVirtQemu.dsc"
 EDK2_BIN_NAME:qemuarm64      = "QEMU_EFI.fd"
 # No need for PXE booting in qemu, disable to reduce unnecessary noise
 EDK2_EXTRA_BUILD:qemuarm64 += " -D NETWORK_PXE_BOOT_ENABLE=FALSE "
-# FIXME - issue with 'RELEASE' firmware, use 'DEBUG'.  This is being tracked in
-# https://github.com/tianocore/edk2/issues/10942
-EDK2_BUILD_RELEASE:qemuarm64 = "0"
 
 COMPATIBLE_MACHINE:qemuarm = "qemuarm"
 EDK2_PLATFORM:qemuarm      = "ArmVirtQemu-ARM"
@@ -14,9 +11,6 @@ EDK2_PLATFORM_DSC:qemuarm  = "ArmVirtPkg/ArmVirtQemu.dsc"
 EDK2_BIN_NAME:qemuarm      = "QEMU_EFI.fd"
 # No need for PXE booting in qemu, disable to reduce unnecessary noise
 EDK2_EXTRA_BUILD:qemuarm += " -D NETWORK_PXE_BOOT_ENABLE=FALSE "
-# FIXME - issue with 'RELEASE' firmware, use 'DEBUG'.  This is being tracked in
-# https://github.com/tianocore/edk2/issues/10942
-EDK2_BUILD_RELEASE:qemuarm = "0"
 
 do_install:append:qemuarm64() {
     install ${B}/Build/${EDK2_PLATFORM}/${EDK2_BUILD_MODE}_${EDK_COMPILER}/FV/${EDK2_BIN_NAME} ${D}/firmware/
meta-arm/recipes-bsp/uefi/edk2-firmware_202505.bb renamed from meta-arm/recipes-bsp/uefi/edk2-firmware_202502.bb +2 -2
similarity index 53%
rename from meta-arm/recipes-bsp/uefi/edk2-firmware_202502.bb
rename to meta-arm/recipes-bsp/uefi/edk2-firmware_202505.bb
index 1ea9f0751414..89e532593991 100644
@@ -1,7 +1,7 @@
 require recipes-bsp/uefi/edk2-firmware.inc
 
-SRCREV_edk2           ?= "fbe0805b2091393406952e84724188f8c1941837"
-SRCREV_edk2-platforms ?= "728c8bb974be69b4034fad7a1c60917cca2dd03d"
+SRCREV_edk2           ?= "6951dfe7d59d144a3a980bd7eda699db2d8554ac"
+SRCREV_edk2-platforms ?= "564f6509e89f45b25d97db2772ca9b3bec8b3ed5"
 
 # FIXME - clang is having issues with antlr
 TOOLCHAIN:aarch64 = "gcc"
meta-arm/recipes-bsp/uefi/sbsa-acs_7.2.2.bb +1 -1
index 766e2e482ec1..2dd1de48c146 100644
@@ -1,4 +1,4 @@
-require recipes-bsp/uefi/edk2-firmware_202502.bb
+require recipes-bsp/uefi/edk2-firmware_202505.bb
 PROVIDES:remove = "virtual/bootloader"
 
 LICENSE += "& Apache-2.0"
Signature · 1 line
2.39.5 (Apple Git-154)
Applied
#1 lore raw
Quoted 6 lines · Jon Mason

Update to the latest version of edk2-firmware. The sgi issue has been corrected upstream, so the patch can now be dropped. Also, no longer seeing the RELEASE issue on qemuarm/qemuarm64, and removing that workaround.

Applied, thanks!

[1/1] arm/edk2-firmware: update to 202505

      commit: 5c8910e8c1f7cbbc1bb0dfd2f78354a731342294

Best regards,

Signature · 1 line
Jon Mason <[email protected]>