From a77c2859d183efceaa70842775366fcfe46209c9 Mon Sep 17 00:00:00 2001
From: Jon Mason <jon.mason@arm.com>
Date: Wed, 20 Mar 2024 10:49:40 -0400
Subject: [PATCH] arm/edk2: update to 202402

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .../recipes-bsp/uefi/edk2-firmware_202311.bb               | 0
 ...ls-native_202311.bb => edk2-basetools-native_202402.bb} | 2 +-
 meta-arm/recipes-bsp/uefi/edk2-firmware_202402.bb          | 7 +++++++
 meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.2.bb                | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)
 rename {meta-arm => meta-arm-bsp}/recipes-bsp/uefi/edk2-firmware_202311.bb (100%)
 rename meta-arm/recipes-bsp/uefi/{edk2-basetools-native_202311.bb => edk2-basetools-native_202402.bb} (93%)
 create mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202402.bb

diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202311.bb b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202311.bb
similarity index 100%
rename from meta-arm/recipes-bsp/uefi/edk2-firmware_202311.bb
rename to meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202311.bb
diff --git a/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202311.bb b/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202402.bb
similarity index 93%
rename from meta-arm/recipes-bsp/uefi/edk2-basetools-native_202311.bb
rename to meta-arm/recipes-bsp/uefi/edk2-basetools-native_202402.bb
index 6bd880bd..bd840967 100644
--- a/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202311.bb
+++ b/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202402.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 = "8736b8fdca85e02933cdb0a13309de14c9799ece"
+SRCREV = "edc6681206c1a8791981a2f911d2fb8b3d2f5768"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202402.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_202402.bb
new file mode 100644
index 00000000..05885315
--- /dev/null
+++ b/meta-arm/recipes-bsp/uefi/edk2-firmware_202402.bb
@@ -0,0 +1,7 @@
+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/sbsa-acs_7.1.2.bb b/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.2.bb
index a564e2ac..2cc9372d 100644
--- a/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.2.bb
+++ b/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.2.bb
@@ -1,4 +1,4 @@
-require recipes-bsp/uefi/edk2-firmware_202311.bb
+require recipes-bsp/uefi/edk2-firmware_202402.bb
 PROVIDES:remove = "virtual/bootloader"
 
 LICENSE += "& Apache-2.0"