diff mbox series

[3/6] arm/edk2: update to edk2-stable202405

Message ID 20240604180949.15501-3-jon.mason@arm.com
State New
Headers show
Series [1/6] arm/trusted-firmware-a: add support for 2.11.0 | expand

Commit Message

Jon Mason June 4, 2024, 6:09 p.m. UTC 
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 ...ls-native_202402.bb => edk2-basetools-native_202405.bb} | 2 +-
 meta-arm/recipes-bsp/uefi/edk2-firmware_202402.bb          | 7 -------
 meta-arm/recipes-bsp/uefi/edk2-firmware_202405.bb          | 7 +++++++
 meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.4.bb                | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename meta-arm/recipes-bsp/uefi/{edk2-basetools-native_202402.bb => edk2-basetools-native_202405.bb} (93%)
 delete mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202402.bb
 create mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202405.bb
diff mbox series

Patch

diff --git a/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202402.bb b/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202405.bb
similarity index 93%
rename from meta-arm/recipes-bsp/uefi/edk2-basetools-native_202402.bb
rename to meta-arm/recipes-bsp/uefi/edk2-basetools-native_202405.bb
index 9a1086fc5b24..851150744c6d 100644
--- a/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202402.bb
+++ b/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202405.bb
@@ -10,7 +10,7 @@  LICENSE = "BSD-2-Clause-Patent"
 SRC_URI = "git://github.com/tianocore/edk2.git;branch=master;protocol=https"
 LIC_FILES_CHKSUM = "file://License.txt;md5=2b415520383f7964e96700ae12b4570a"
 
-SRCREV = "edc6681206c1a8791981a2f911d2fb8b3d2f5768"
+SRCREV = "3e722403cd16388a0e4044e705a2b34c841d76ca"
 
 UPSTREAM_CHECK_GITTAGREGEX = "^edk2-stable(?P<pver>\d+)$"
 
diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202402.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_202402.bb
deleted file mode 100644
index 05885315aa8d..000000000000
--- a/meta-arm/recipes-bsp/uefi/edk2-firmware_202402.bb
+++ /dev/null
@@ -1,7 +0,0 @@ 
-SRCREV_edk2           ?= "edc6681206c1a8791981a2f911d2fb8b3d2f5768"
-SRCREV_edk2-platforms ?= "07842635c80b64c4a979a652104ea1141ba5007a"
-
-# FIXME - clang is having issues with antlr
-TOOLCHAIN:aarch64 = "gcc"
-
-require recipes-bsp/uefi/edk2-firmware.inc
diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202405.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_202405.bb
new file mode 100644
index 000000000000..294a22322d9a
--- /dev/null
+++ b/meta-arm/recipes-bsp/uefi/edk2-firmware_202405.bb
@@ -0,0 +1,7 @@ 
+SRCREV_edk2           ?= "3e722403cd16388a0e4044e705a2b34c841d76ca"
+SRCREV_edk2-platforms ?= "59c686673992d7549c2b054773d5d1b5e739a88b"
+
+# FIXME - clang is having issues with antlr
+TOOLCHAIN:aarch64 = "gcc"
+
+require recipes-bsp/uefi/edk2-firmware.inc
diff --git a/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.4.bb b/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.4.bb
index a29c16ecb466..305588d1a11b 100644
--- a/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.4.bb
+++ b/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.4.bb
@@ -1,4 +1,4 @@ 
-require recipes-bsp/uefi/edk2-firmware_202402.bb
+require recipes-bsp/uefi/edk2-firmware_202405.bb
 PROVIDES:remove = "virtual/bootloader"
 
 LICENSE += "& Apache-2.0"