Skip to contentSkip to conversation

arm/edk2: update to 202305 version

PATCH Applied Jon Mason 2 participants 2 messages Aug 31, 2023 – Sep 1, 2023

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/1 arm/edk2: update to 202305 version

edk2-202305 contains a commit which modifies the build environment's variables from BUILD_CC to CC, BUILD_CXX to CXX, etc.
https://github.com/tianocore/edk2/commit/206168e83f0901cbc1815ef5df4ac6598ad9721b
This causes changes to the recipe to support this change.

---
 ...302.bb => edk2-basetools-native_202305.bb} |   2 +-
 meta-arm/recipes-bsp/uefi/edk2-firmware.inc   |  11 +
 ...023%.bbappend => edk2-firmware_%.bbappend} |   4 -
 .../recipes-bsp/uefi/edk2-firmware_202302.bb  |   6 -
 .../recipes-bsp/uefi/edk2-firmware_202305.bb  |   7 +
 ...-uninitialized-variable-FileSize-in-.patch |  35 ---
 ...g-QemuVirtMemInfoLib-use-HOB-not-PCD.patch | 290 ------------------
 ...g-ArmVirtQemu-omit-PCD-PEIM-unless-T.patch |  89 ------
 meta-arm/recipes-bsp/uefi/sbsa-acs_6.1.0.bb   |   2 +-
 9 files changed, 20 insertions(+), 426 deletions(-)
 rename meta-arm/recipes-bsp/uefi/{edk2-basetools-native_202302.bb => edk2-basetools-native_202305.bb} (93%)
 rename meta-arm/recipes-bsp/uefi/{edk2-firmware_2023%.bbappend => edk2-firmware_%.bbappend} (90%)
 delete mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202302.bb
 create mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202305.bb
 delete mode 100644 meta-arm/recipes-bsp/uefi/files/0001-Platform-ARM-fix-uninitialized-variable-FileSize-in-.patch
 delete mode 100644 meta-arm/recipes-bsp/uefi/files/0001-Revert-ArmVirtPkg-QemuVirtMemInfoLib-use-HOB-not-PCD.patch
 delete mode 100644 meta-arm/recipes-bsp/uefi/files/0002-Revert-ArmVirtPkg-ArmVirtQemu-omit-PCD-PEIM-unless-T.patch
meta-arm/recipes-bsp/uefi/edk2-basetools-native_202305.bb renamed from meta-arm/recipes-bsp/uefi/edk2-basetools-native_202302.bb +1 -1
similarity index 93%
rename from meta-arm/recipes-bsp/uefi/edk2-basetools-native_202302.bb
rename to meta-arm/recipes-bsp/uefi/edk2-basetools-native_202305.bb
index b331c361..3a48ea5e 100644
@@ -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 = "f80f052277c88a67c55e107b550f504eeea947d3"
+SRCREV = "ba91d0292e593df8528b66f99c1b0b14fadc8e16"
 
 S = "${WORKDIR}/git"
 
meta-arm/recipes-bsp/uefi/edk2-firmware.inc +11 -0
index 20eea36b..274852e2 100644
@@ -76,6 +76,17 @@ EDK_COMPILER:toolchain-clang = "CLANG38"
 export CLANG38_AARCH64_PREFIX = "${TARGET_PREFIX}"
 export CLANG38_ARM_PREFIX = "${TARGET_PREFIX}"
 
+# These variables were changed in edk2 commit
+# 206168e83f0901cbc1815ef5df4ac6598ad9721b, which was part of edk2-202305
+export CC = "${BUILD_CC}"
+export CXX = "${BUILD_CXX}"
+export AS = "${BUILD_AS}"
+export AR = "${BUILD_AR}"
+export LD = "${BUILD_LD}"
+export CFLAGS = "${BUILD_CFLAGS}"
+export CPPFLAGS = "${BUILD_CPPFLAGS}"
+export LDFLAGS = "${BUILD_LFLAGS}"
+
 #FIXME - arm32 doesn't work with clang due to a linker issue
 TOOLCHAIN:arm = "gcc"
 
meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend renamed from meta-arm/recipes-bsp/uefi/edk2-firmware_2023%.bbappend +0 -4
similarity index 90%
rename from meta-arm/recipes-bsp/uefi/edk2-firmware_2023%.bbappend
rename to meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend
index 19b33541..7a39bb03 100644
@@ -7,10 +7,6 @@ COMPATIBLE_MACHINE:qemuarm64 = "qemuarm64"
 EDK2_PLATFORM:qemuarm64      = "ArmVirtQemu-AARCH64"
 EDK2_PLATFORM_DSC:qemuarm64  = "ArmVirtPkg/ArmVirtQemu.dsc"
 EDK2_BIN_NAME:qemuarm64      = "QEMU_EFI.fd"
-SRC_URI:append:qemuarm64 = " \
-    file://0001-Revert-ArmVirtPkg-QemuVirtMemInfoLib-use-HOB-not-PCD.patch \
-    file://0002-Revert-ArmVirtPkg-ArmVirtQemu-omit-PCD-PEIM-unless-T.patch \
-   "
 
 COMPATIBLE_MACHINE:qemuarm = "qemuarm"
 EDK2_PLATFORM:qemuarm      = "ArmVirtQemu-ARM"
meta-arm/recipes-bsp/uefi/edk2-firmware_202302.bb deleted +0 -6
deleted file mode 100644
index 04963e46..00000000
@@ -1,6 +0,0 @@
-SRCREV_edk2           ?= "f80f052277c88a67c55e107b550f504eeea947d3"
-SRCREV_edk2-platforms ?= "65e001a7f2abedf7799cfb36b057326c1540bd47"
-
-SRC_URI:append = " file://0001-Platform-ARM-fix-uninitialized-variable-FileSize-in-.patch;patchdir=edk2-platforms"
-
-require edk2-firmware.inc
meta-arm/recipes-bsp/uefi/edk2-firmware_202305.bb new file +7 -0
new file mode 100644
index 00000000..fe153f47
@@ -0,0 +1,7 @@
+SRCREV_edk2           ?= "ba91d0292e593df8528b66f99c1b0b14fadc8e16"
+SRCREV_edk2-platforms ?= "be2af02a3fb202756ed9855173e0d0ed878ab6be"
+
+# FIXME - clang is having issues with antlr
+TOOLCHAIN:aarch64 = "gcc"
+
+require edk2-firmware.inc
meta-arm/recipes-bsp/uefi/files/0001-Platform-ARM-fix-uninitialized-variable-FileSize-in-.patch deleted +0 -35
deleted file mode 100644
index 92c4a71e..00000000
@@ -1,35 +0,0 @@
-From 223ad8d168df332445a7383c325845822825b972 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-Date: Mon, 13 Jun 2022 18:21:15 +0100
-Subject: [PATCH] Platform/ARM: fix uninitialized variable FileSize in RunAxf
-
-Clang 14 detects a potentially uninitialized variable FileSize:
-
-RunAxf.c:216:11: error: variable 'FileSize' is used uninitialized
-                        whenever 'if' condition is false
-RunAxf.c:281:38: note: uninitialized use occurs here
-WriteBackDataCacheRange (FileData, FileSize);
-                                    ^~~~~~~~
-
-Reading the code it doesn't look like this can actually happen, but we
-can keep clang happy by initialising FileSize to 0.
-
-Upstream-Status: Pending
-Signed-off-by: Ross Burton <[email protected]>
----
- Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c b/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c
-index d23739ad38d9..fba5e0ba300f 100644
---- a/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c
-+++ b/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c
-@@ -133,7 +133,7 @@ ShellDynCmdRunAxfHandler (
-   ELF_ENTRYPOINT              StartElf;
-   CONST CHAR16                *FileName;
-   EFI_FILE_INFO               *Info;
--  UINTN                       FileSize;
-+  UINTN                       FileSize = 0;
-   VOID                        *FileData;
-   VOID                        *Entrypoint;
-   LIST_ENTRY                  LoadList;
meta-arm/recipes-bsp/uefi/files/0001-Revert-ArmVirtPkg-QemuVirtMemInfoLib-use-HOB-not-PCD.patch deleted +0 -290

290 lines not on this page · raw message

meta-arm/recipes-bsp/uefi/files/0002-Revert-ArmVirtPkg-ArmVirtQemu-omit-PCD-PEIM-unless-T.patch deleted +0 -89

89 lines not on this page · raw message

meta-arm/recipes-bsp/uefi/sbsa-acs_6.1.0.bb +1 -1
index 7a29f556..8995a106 100644
@@ -1,4 +1,4 @@
-require recipes-bsp/uefi/edk2-firmware_202302.bb
+require recipes-bsp/uefi/edk2-firmware_202305.bb
 PROVIDES:remove = "virtual/bootloader"
 
 LICENSE += "& Apache-2.0"
Signature · 1 line
2.30.2
Applied
#1 lore raw
Quoted 6 lines · Jon Mason

edk2-202305 contains a commit which modifies the build environment's variables from BUILD_CC to CC, BUILD_CXX to CXX, etc.
https://github.com/tianocore/edk2/commit/206168e83f0901cbc1815ef5df4ac6598ad9721b
This causes changes to the recipe to support this change.

Applied, thanks!

[1/1] arm/edk2: update to 202305 version

      commit: 85b11ed55bb0fc2a9080d513ab03df451a4a750f

Best regards,

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