From 8a03ee5fdf9cc8fa65edb325fb1b238292abe63d Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Mon, 14 Oct 2024 12:54:47 -0400 Subject: [PATCH] arm/edk2: update to 202408 Update edk2 to the latest stable release tag, and update edk2-platforms to the last SHA that seems to work. Signed-off-by: Jon Mason --- ...ls-native_202405.bb => edk2-basetools-native_202408.bb} | 2 +- meta-arm/recipes-bsp/uefi/edk2-firmware_202405.bb | 7 ------- meta-arm/recipes-bsp/uefi/edk2-firmware_202408.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_202405.bb => edk2-basetools-native_202408.bb} (93%) delete mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202405.bb create mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202408.bb diff --git a/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202405.bb b/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202408.bb similarity index 93% rename from meta-arm/recipes-bsp/uefi/edk2-basetools-native_202405.bb rename to meta-arm/recipes-bsp/uefi/edk2-basetools-native_202408.bb index 85115074..d89a7901 100644 --- a/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202405.bb +++ b/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202408.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 = "3e722403cd16388a0e4044e705a2b34c841d76ca" +SRCREV = "b158dad150bf02879668f72ce306445250838201" UPSTREAM_CHECK_GITTAGREGEX = "^edk2-stable(?P\d+)$" diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202405.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_202405.bb deleted file mode 100644 index 294a2232..00000000 --- a/meta-arm/recipes-bsp/uefi/edk2-firmware_202405.bb +++ /dev/null @@ -1,7 +0,0 @@ -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/edk2-firmware_202408.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_202408.bb new file mode 100644 index 00000000..81bfc000 --- /dev/null +++ b/meta-arm/recipes-bsp/uefi/edk2-firmware_202408.bb @@ -0,0 +1,7 @@ +SRCREV_edk2 ?= "b158dad150bf02879668f72ce306445250838201" +SRCREV_edk2-platforms ?= "a3c898956a4d48dc5980336fa6ce6eeb23c4f72b" + +# 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 305588d1..b6361346 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_202405.bb +require recipes-bsp/uefi/edk2-firmware_202408.bb PROVIDES:remove = "virtual/bootloader" LICENSE += "& Apache-2.0"