mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-05-07 04:58:57 +00:00
Code Issues Projects Releases Wiki Activity

arm/edk2-firmware: update to 202505

Browse Source 
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.

Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Jon Mason
2025-06-09 17:54:34 -04:00
parent 2705f2dc2d
commit 5c8910e8c1
5 changed files with 3 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc
-3
View File
@@ -5,6 +5,3 @@ EDK2_PLATFORM_DSC = "Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc"
EDK2_BIN_NAME = "BL33_AP_UEFI.fd" EDK2_BIN_NAME = "BL33_AP_UEFI.fd"
COMPATIBLE_MACHINE = "sgi575" 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
-41
View File
@@ -1,41 +0,0 @@
From b368ff0e774508b60c18bc19fbfaaa3910616e66 Mon Sep 17 00:00:00 2001
From: Jon Mason <jon.mason@arm.com>
Date: Wed, 2 Apr 2025 15:57:21 -0400
Subject: [PATCH] Platform/Sgi: workaround ArmFfaLib error
When attempting to build sgi575, the following error is encountered
| Active Platform = /builder/meta-arm/build/tmp/work/sgi575-poky-linux/edk2-firmware/202502/edk2/edk2-platforms/Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc
|
|
| build.py...
| /builder/meta-arm/build/tmp/work/sgi575-poky-linux/edk2-firmware/202502/edk2/edk2-platforms/Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc(...): error 4000: Instance of library class [ArmFfaLib] is not found
| in [/builder/meta-arm/build/tmp/work/sgi575-poky-linux/edk2-firmware/202502/edk2/ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf] [AARCH64]
| consumed by module [/builder/meta-arm/build/tmp/work/sgi575-poky-linux/edk2-firmware/202502/edk2/ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf]
|
|
This is because commit 9f9a3de9e4c5595cd42d14c705570887630209d8 in
edk2-firmware adds a reference to the ArmFfaLib in
ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf
That file is referenced in Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
To workaround this issue, add the ArmFfaLib to Sgi575.dsc.
Upstream-Status: Pending [https://github.com/tianocore/edk2-platforms/issues/761]
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc b/Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc
index f29272778d73..30f2d1fd49a7 100644
--- a/Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc
+++ b/Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc
@@ -55,3 +55,6 @@
[Components.common]
Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf
+
+[LibraryClasses.common.DXE_RUNTIME_DRIVER]
+ ArmFfaLib|ArmPkg/Library/ArmFfaLib/ArmFfaDxeLib.inf
meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend
-6
View File
@@ -4,9 +4,6 @@ EDK2_PLATFORM_DSC:qemuarm64 = "ArmVirtPkg/ArmVirtQemu.dsc"
EDK2_BIN_NAME:qemuarm64 = "QEMU_EFI.fd" EDK2_BIN_NAME:qemuarm64 = "QEMU_EFI.fd"
# No need for PXE booting in qemu, disable to reduce unnecessary noise # No need for PXE booting in qemu, disable to reduce unnecessary noise
EDK2_EXTRA_BUILD:qemuarm64 += " -D NETWORK_PXE_BOOT_ENABLE=FALSE " 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" COMPATIBLE_MACHINE:qemuarm = "qemuarm"
EDK2_PLATFORM:qemuarm = "ArmVirtQemu-ARM" EDK2_PLATFORM:qemuarm = "ArmVirtQemu-ARM"
@@ -14,9 +11,6 @@ EDK2_PLATFORM_DSC:qemuarm = "ArmVirtPkg/ArmVirtQemu.dsc"
EDK2_BIN_NAME:qemuarm = "QEMU_EFI.fd" EDK2_BIN_NAME:qemuarm = "QEMU_EFI.fd"
# No need for PXE booting in qemu, disable to reduce unnecessary noise # No need for PXE booting in qemu, disable to reduce unnecessary noise
EDK2_EXTRA_BUILD:qemuarm += " -D NETWORK_PXE_BOOT_ENABLE=FALSE " 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() { do_install:append:qemuarm64() {
install ${B}/Build/${EDK2_PLATFORM}/${EDK2_BUILD_MODE}_${EDK_COMPILER}/FV/${EDK2_BIN_NAME} ${D}/firmware/ install ${B}/Build/${EDK2_PLATFORM}/${EDK2_BUILD_MODE}_${EDK_COMPILER}/FV/${EDK2_BIN_NAME} ${D}/firmware/
meta-arm/recipes-bsp/uefi/edk2-firmware_202502.bb → meta-arm/recipes-bsp/uefi/edk2-firmware_202505.bb
+2 -2
View File
@@ -1,7 +1,7 @@
require recipes-bsp/uefi/edk2-firmware.inc require recipes-bsp/uefi/edk2-firmware.inc
SRCREV_edk2 ?= "fbe0805b2091393406952e84724188f8c1941837" SRCREV_edk2 ?= "6951dfe7d59d144a3a980bd7eda699db2d8554ac"
SRCREV_edk2-platforms ?= "728c8bb974be69b4034fad7a1c60917cca2dd03d" SRCREV_edk2-platforms ?= "564f6509e89f45b25d97db2772ca9b3bec8b3ed5"
# FIXME - clang is having issues with antlr # FIXME - clang is having issues with antlr
TOOLCHAIN:aarch64 = "gcc" TOOLCHAIN:aarch64 = "gcc"
meta-arm/recipes-bsp/uefi/sbsa-acs_7.2.2.bb
+1 -1
View File
@@ -1,4 +1,4 @@
require recipes-bsp/uefi/edk2-firmware_202502.bb require recipes-bsp/uefi/edk2-firmware_202505.bb
PROVIDES:remove = "virtual/bootloader" PROVIDES:remove = "virtual/bootloader"
LICENSE += "& Apache-2.0" LICENSE += "& Apache-2.0"