From patchwork Fri Apr 11 03:25:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 61153 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08C28C3601E for ; Fri, 11 Apr 2025 03:25:38 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.16745.1744341936377541227 for ; Thu, 10 Apr 2025 20:25:36 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8018C106F for ; Thu, 10 Apr 2025 20:25:35 -0700 (PDT) Received: from H24V3P4C17.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 295763F694 for ; Thu, 10 Apr 2025 20:25:35 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/3] arm/edk2-firmware: add version to be printed out Date: Thu, 10 Apr 2025 23:25:30 -0400 Message-Id: <20250411032532.10270-1-jon.mason@arm.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 11 Apr 2025 03:25:37 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6456 Currently, the version number is not being specified, which is causing the version to be printed as an empty string. Such as: UEFI firmware (version built at 00:50:36 on Feb 21 2025) and Tianocore/EDK2 firmware version Add the package version as the version to be printed out, which results in: UEFI firmware (version 202502 built at 00:50:36 on Feb 21 2025) and Tianocore/EDK2 firmware version 202502 An intermediate variable was used instead of PV to allow for the variable to be overridden if necessary. Also, minor white space clean-up to match the style in the rest of the file. Signed-off-by: Jon Mason --- meta-arm/recipes-bsp/uefi/edk2-firmware.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc index 5475b0a1bc5c..6d86a68f6ed5 100644 --- a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc +++ b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc @@ -22,7 +22,7 @@ SRC_URI = "\ ${SRC_URI_EDK2_PLATFORMS};branch=${SRCBRANCH_edk2_platforms};name=edk2-platforms;destsuffix=edk2/edk2-platforms \ " -SRCREV_FORMAT = "edk2_edk2-platforms" +SRCREV_FORMAT = "edk2_edk2-platforms" UPSTREAM_CHECK_GITTAGREGEX = "^edk2-stable(?P\d+)$" COMPATIBLE_MACHINE ?= "invalid" @@ -42,6 +42,9 @@ EDK2_ARCH:x86 = "IA32" EDK2_ARCH:x86-64 = "X64" EDK2_ARCH:riscv64 = "RISCV64" +# Use the package version as the version to be printed out but allow for it to be overridden +EDK2_VERSION ?= "${PV}" + # Extra arguments passed to build EDK2_EXTRA_BUILD = "" @@ -115,6 +118,7 @@ do_compile() { --tagname ${EDK_COMPILER} \ --platform ${EDK2_PLATFORM_DSC} \ ${@oe.utils.parallel_make_argument(d, "-n %d")} \ + -D FIRMWARE_VER="${EDK2_VERSION}" \ ${EDK2_EXTRA_BUILD} } From patchwork Fri Apr 11 03:25:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 61154 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09C2FC369A2 for ; Fri, 11 Apr 2025 03:25:38 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.16860.1744341937140361110 for ; Thu, 10 Apr 2025 20:25:37 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6362B1F37 for ; Thu, 10 Apr 2025 20:25:36 -0700 (PDT) Received: from H24V3P4C17.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 072A63F694 for ; Thu, 10 Apr 2025 20:25:35 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/3] arm/edk2-firmware: update to 202502 Date: Thu, 10 Apr 2025 23:25:31 -0400 Message-Id: <20250411032532.10270-2-jon.mason@arm.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250411032532.10270-1-jon.mason@arm.com> References: <20250411032532.10270-1-jon.mason@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 11 Apr 2025 03:25:37 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6457 Update to the latest tagged version of edk2-firmware. This requires rebasing the sbsa-acs patches. Also, sgi575 works with the latest version but requires a patch to compile cleanly. There is an issue with qemuarm/qemuarm64 where the boot device is not found in edk2 if 'RELEASE' is set as the build mode. Temporarily changing that to DEBUG while the issue is being worked on (in https://github.com/tianocore/edk2/issues/10942). Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/sgi575.conf | 3 -- .../recipes-bsp/uefi/edk2-firmware-sgi575.inc | 3 ++ ...tform-Sgi-workaround-ArmFfaLib-error.patch | 41 +++++++++++++++++++ ...411.bb => edk2-basetools-native_202502.bb} | 0 .../recipes-bsp/uefi/edk2-firmware_%.bbappend | 10 +++++ .../recipes-bsp/uefi/edk2-firmware_202411.bb | 11 ----- .../recipes-bsp/uefi/edk2-firmware_202502.bb | 9 ++++ ...-in-the-paths-to-the-SBSA-test-suite.patch | 12 +++--- ...02-Enforce-using-good-old-BFD-linker.patch | 30 +++++++++----- meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.4.bb | 2 +- 10 files changed, 89 insertions(+), 32 deletions(-) create mode 100644 meta-arm-bsp/recipes-bsp/uefi/files/0001-Platform-Sgi-workaround-ArmFfaLib-error.patch rename meta-arm/recipes-bsp/uefi/{edk2-basetools-native_202411.bb => edk2-basetools-native_202502.bb} (100%) delete mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202411.bb create mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202502.bb diff --git a/meta-arm-bsp/conf/machine/sgi575.conf b/meta-arm-bsp/conf/machine/sgi575.conf index dea764e8cdb6..048e072664b4 100644 --- a/meta-arm-bsp/conf/machine/sgi575.conf +++ b/meta-arm-bsp/conf/machine/sgi575.conf @@ -13,9 +13,6 @@ KERNEL_IMAGETYPE ?= "Image" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" SERIAL_CONSOLES = "115200;ttyAMA0" -#FIXME - for some reason newer EDK2 refuses to boot the kernel -PREFERRED_VERSION_edk2-firmware ?= "202408%" - EFI_PROVIDER ?= "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd-boot", "grub-efi", d)}" MACHINE_FEATURES += "efi" diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc index e26225f87a07..042ed59a1ad8 100644 --- a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc +++ b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc @@ -5,3 +5,6 @@ EDK2_PLATFORM_DSC = "Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc" EDK2_BIN_NAME = "BL33_AP_UEFI.fd" COMPATIBLE_MACHINE = "sgi575" + +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI += " file://0001-Platform-Sgi-workaround-ArmFfaLib-error.patch;patchdir=edk2-platforms" diff --git a/meta-arm-bsp/recipes-bsp/uefi/files/0001-Platform-Sgi-workaround-ArmFfaLib-error.patch b/meta-arm-bsp/recipes-bsp/uefi/files/0001-Platform-Sgi-workaround-ArmFfaLib-error.patch new file mode 100644 index 000000000000..980550900e21 --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/uefi/files/0001-Platform-Sgi-workaround-ArmFfaLib-error.patch @@ -0,0 +1,41 @@ +From b368ff0e774508b60c18bc19fbfaaa3910616e66 Mon Sep 17 00:00:00 2001 +From: Jon Mason +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 +--- + 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 diff --git a/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202411.bb b/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202502.bb similarity index 100% rename from meta-arm/recipes-bsp/uefi/edk2-basetools-native_202411.bb rename to meta-arm/recipes-bsp/uefi/edk2-basetools-native_202502.bb diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend b/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend index e923d9f034fd..25b52511e4a0 100644 --- a/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend +++ b/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend @@ -7,11 +7,21 @@ COMPATIBLE_MACHINE:qemuarm64 = "qemuarm64" EDK2_PLATFORM:qemuarm64 = "ArmVirtQemu-AARCH64" EDK2_PLATFORM_DSC:qemuarm64 = "ArmVirtPkg/ArmVirtQemu.dsc" EDK2_BIN_NAME:qemuarm64 = "QEMU_EFI.fd" +# No need for PXE booting in qemu, disable to reduce unnecessary noise +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" EDK2_PLATFORM:qemuarm = "ArmVirtQemu-ARM" EDK2_PLATFORM_DSC:qemuarm = "ArmVirtPkg/ArmVirtQemu.dsc" EDK2_BIN_NAME:qemuarm = "QEMU_EFI.fd" +# No need for PXE booting in qemu, disable to reduce unnecessary noise +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() { install ${B}/Build/${EDK2_PLATFORM}/${EDK2_BUILD_MODE}_${EDK_COMPILER}/FV/${EDK2_BIN_NAME} ${D}/firmware/ diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202411.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_202411.bb deleted file mode 100644 index 22e724340ec8..000000000000 --- a/meta-arm/recipes-bsp/uefi/edk2-firmware_202411.bb +++ /dev/null @@ -1,11 +0,0 @@ -SRCREV_edk2 ?= "0f3867fa6ef0553e26c42f7d71ff6bdb98429742" -SRCREV_edk2-platforms ?= "2d66a9e048285af8ba4bfe4bdaab37a8e98288b3" - -# FIXME - clang is having issues with antlr -TOOLCHAIN:aarch64 = "gcc" - -require recipes-bsp/uefi/edk2-firmware.inc - -SRC_URI += "\ - file://edk2_fix_epoch.patch \ -" diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202502.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_202502.bb new file mode 100644 index 000000000000..1ea9f0751414 --- /dev/null +++ b/meta-arm/recipes-bsp/uefi/edk2-firmware_202502.bb @@ -0,0 +1,9 @@ +require recipes-bsp/uefi/edk2-firmware.inc + +SRCREV_edk2 ?= "fbe0805b2091393406952e84724188f8c1941837" +SRCREV_edk2-platforms ?= "728c8bb974be69b4034fad7a1c60917cca2dd03d" + +# FIXME - clang is having issues with antlr +TOOLCHAIN:aarch64 = "gcc" + +SRC_URI += " file://edk2_fix_epoch.patch" diff --git a/meta-arm/recipes-bsp/uefi/sbsa-acs/0001-Patch-in-the-paths-to-the-SBSA-test-suite.patch b/meta-arm/recipes-bsp/uefi/sbsa-acs/0001-Patch-in-the-paths-to-the-SBSA-test-suite.patch index e9f8c4173677..c9aa014cb759 100644 --- a/meta-arm/recipes-bsp/uefi/sbsa-acs/0001-Patch-in-the-paths-to-the-SBSA-test-suite.patch +++ b/meta-arm/recipes-bsp/uefi/sbsa-acs/0001-Patch-in-the-paths-to-the-SBSA-test-suite.patch @@ -1,6 +1,6 @@ -From e7918dbd4a02be2a474534da3f1e565931a5e632 Mon Sep 17 00:00:00 2001 +From 17df0e93949097c18c65567bdf8c7ad2478f63b4 Mon Sep 17 00:00:00 2001 From: Ross Burton -Date: Thu, 16 Feb 2023 21:53:25 +0000 +Date: Thu, 16 Feb 2023 21:53:25 -0500 Subject: [PATCH] Patch in the paths to the SBSA test suite Upstream-Status: Inappropriate (required action) @@ -10,15 +10,15 @@ Signed-off-by: Ross Burton 1 file changed, 3 insertions(+) diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc -index 7e985f8280a7..ca7a716fadc7 100644 +index 7e985f8280a7..052510236cae 100644 --- a/ShellPkg/ShellPkg.dsc +++ b/ShellPkg/ShellPkg.dsc @@ -23,6 +23,8 @@ !include MdePkg/MdeLibs.dsc.inc [LibraryClasses.common] -+ SbsaValLib|ShellPkg/Application/sbsa-acs/val/SbsaValLib.inf -+ SbsaPalLib|ShellPkg/Application/sbsa-acs/platform/pal_uefi/SbsaPalLib.inf ++ SbsaValLib|ShellPkg/Application/sbsa-acs/val/SbsaValLib.inf ++ SbsaPalLib|ShellPkg/Application/sbsa-acs/platform/pal_uefi/SbsaPalLib.inf UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf @@ -26,7 +26,7 @@ index 7e985f8280a7..ca7a716fadc7 100644 # Build all the libraries when building this package. # This helps developers test changes and how they affect the package. # -+ ShellPkg/Application/sbsa-acs/uefi_app/SbsaAvs.inf ++ ShellPkg/Application/sbsa-acs/uefi_app/SbsaAvs.inf ShellPkg/Library/UefiShellLib/UefiShellLib.inf ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.inf ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf diff --git a/meta-arm/recipes-bsp/uefi/sbsa-acs/0002-Enforce-using-good-old-BFD-linker.patch b/meta-arm/recipes-bsp/uefi/sbsa-acs/0002-Enforce-using-good-old-BFD-linker.patch index 2d8a33f4a9da..f73194d265b8 100644 --- a/meta-arm/recipes-bsp/uefi/sbsa-acs/0002-Enforce-using-good-old-BFD-linker.patch +++ b/meta-arm/recipes-bsp/uefi/sbsa-acs/0002-Enforce-using-good-old-BFD-linker.patch @@ -1,13 +1,21 @@ -From a91273485735b89e67050bb39a09b60a16055dbd Mon Sep 17 00:00:00 2001 +From 76665f48f5a4672d8c8bed3c57822307193b2b72 Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Wed, 7 Apr 2021 00:16:07 -0700 +Date: Wed, 7 Apr 2021 00:16:07 -0400 Subject: [PATCH] Enforce using good old BFD linker -some distros may use gold as system linker and it crashes while linking the app +some distros may use gold as system linker and it crashes while linking +the app -TOPDIR/build/tmpfs/work/qemuarm64-yoe-linux/sbsa-acs/3.0-r0/recipe-sysroot-native/usr/bin/aarch64-yoe-linux/../../libexec/aarch64-yoe-linux/gcc/aarch64-yoe-linux/11.0.1/ld: error: TOPDIR/build/tmpfs/work/qemuarm64-yoe-linux/sbsa-acs/3.0-r0/edk2/BaseTools/Scripts/GccBase.lds:54:10: INFO section type is unsupported -TOPDIR/build/tmpfs/work/qemuarm64-yoe-linux/sbsa-acs/3.0-r0/recipe-sysroot-native/usr/bin/aarch64-yoe-linux/../../libexec/aarch64-yoe-linux/gcc/aarch64-yoe-linux/11.0.1/ld: error: TOPDIR/build/tmpfs/work/qemuarm64-yoe-linux/sbsa-acs/3.0-r0/edk2/BaseTools/Scripts/GccBase.lds:66:14: INFO section type is unsupported -TOPDIR/build/tmpfs/work/qemuarm64-yoe-linux/sbsa-acs/3.0-r0/recipe-sysroot-native/usr/bin/aarch64-yoe-linux/../../libexec/aarch64-yoe-linux/gcc/aarch64-yoe-linux/11.0.1/ld: internal error in do_layout, at ../../gold/object.cc:1939 +TOPDIR/build/tmpfs/work/qemuarm64-yoe-linux/sbsa-acs/3.0-r0/recipe-sysroot-native/usr/bin/aarch64-yoe-linux/../../libexec/aarch64-yoe-linux/gcc/aarch64-yoe-linux/11.0.1/ld: +error: +TOPDIR/build/tmpfs/work/qemuarm64-yoe-linux/sbsa-acs/3.0-r0/edk2/BaseTools/Scripts/GccBase.lds:54:10: +INFO section type is unsupported +TOPDIR/build/tmpfs/work/qemuarm64-yoe-linux/sbsa-acs/3.0-r0/recipe-sysroot-native/usr/bin/aarch64-yoe-linux/../../libexec/aarch64-yoe-linux/gcc/aarch64-yoe-linux/11.0.1/ld: +error: +TOPDIR/build/tmpfs/work/qemuarm64-yoe-linux/sbsa-acs/3.0-r0/edk2/BaseTools/Scripts/GccBase.lds:66:14: +INFO section type is unsupported +TOPDIR/build/tmpfs/work/qemuarm64-yoe-linux/sbsa-acs/3.0-r0/recipe-sysroot-native/usr/bin/aarch64-yoe-linux/../../libexec/aarch64-yoe-linux/gcc/aarch64-yoe-linux/11.0.1/ld: +internal error in do_layout, at ../../gold/object.cc:1939 collect2: error: ld returned 1 exit status Upstream-Status: Pending @@ -17,15 +25,15 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template -index 14f3b643c43d..ce3d969625de 100755 +index ffeb22742142..ba24113d216c 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template -@@ -905,7 +905,7 @@ DEFINE GCC_AARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -fno- +@@ -928,7 +928,7 @@ DEFINE GCC_ARM_CC_XIPFLAGS = -mno-unaligned-access + DEFINE GCC_AARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -fno-short-enums -fverbose-asm -funsigned-char -ffunction-sections -fdata-sections -Wno-address -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-pic -fno-pie -ffixed-x18 -mstack-protector-guard=global DEFINE GCC_AARCH64_CC_XIPFLAGS = -mstrict-align -mgeneral-regs-only DEFINE GCC_RISCV64_CC_XIPFLAGS = -mstrict-align -mgeneral-regs-only - DEFINE GCC_DLINK_FLAGS_COMMON = -nostdlib --pie -DEFINE GCC_DLINK2_FLAGS_COMMON = -Wl,--script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds +DEFINE GCC_DLINK2_FLAGS_COMMON = -fuse-ld=bfd -Wl,--script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds - DEFINE GCC_IA32_X64_DLINK_COMMON = DEF(GCC_DLINK_FLAGS_COMMON) --gc-sections - DEFINE GCC_ARM_AARCH64_DLINK_COMMON= -Wl,--emit-relocs -nostdlib -Wl,--gc-sections -u $(IMAGE_ENTRY_POINT) -Wl,-e,$(IMAGE_ENTRY_POINT),-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map + DEFINE GCC_IA32_X64_DLINK_COMMON = -nostdlib --pie --fatal-warnings -z,noexecstack --gc-sections + DEFINE GCC_ARM_AARCH64_DLINK_COMMON= -Wl,--emit-relocs -nostdlib -Wl,--gc-sections -u $(IMAGE_ENTRY_POINT) -Wl,-e,$(IMAGE_ENTRY_POINT),-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map -Wl,--fatal-warnings -Wl,-z,noexecstack DEFINE GCC_LOONGARCH64_DLINK_COMMON= -Wl,--emit-relocs -nostdlib -Wl,--gc-sections -u $(IMAGE_ENTRY_POINT) -Wl,-e,$(IMAGE_ENTRY_POINT),-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map 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 bb668bb48717..961a0c4344c8 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_202411.bb +require recipes-bsp/uefi/edk2-firmware_202502.bb PROVIDES:remove = "virtual/bootloader" LICENSE += "& Apache-2.0" From patchwork Fri Apr 11 03:25:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 61155 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DEFAFC3601E for ; Fri, 11 Apr 2025 03:25:47 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.16861.1744341937872008902 for ; Thu, 10 Apr 2025 20:25:37 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4D454106F for ; Thu, 10 Apr 2025 20:25:37 -0700 (PDT) Received: from H24V3P4C17.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id DEC323F694 for ; Thu, 10 Apr 2025 20:25:36 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 3/3] arm/edk2-firmware: remove qemuarm64-secureboot Date: Thu, 10 Apr 2025 23:25:32 -0400 Message-Id: <20250411032532.10270-3-jon.mason@arm.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250411032532.10270-1-jon.mason@arm.com> References: <20250411032532.10270-1-jon.mason@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 11 Apr 2025 03:25:47 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6458 edk2 isn't booting on qemuarm64-secureboot, and hasn't for some time. Also, it's not being tested as part of CI. Remove until it is working again. Signed-off-by: Jon Mason --- meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend | 5 ----- 1 file changed, 5 deletions(-) diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend b/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend index 25b52511e4a0..56e785aeb13d 100644 --- a/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend +++ b/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend @@ -1,8 +1,3 @@ -COMPATIBLE_MACHINE:qemuarm64-secureboot = "qemuarm64-secureboot" -EDK2_PLATFORM:qemuarm64-secureboot = "ArmVirtQemu-AARCH64" -EDK2_PLATFORM_DSC:qemuarm64-secureboot = "ArmVirtPkg/ArmVirtQemu.dsc" -EDK2_BIN_NAME:qemuarm64-secureboot = "QEMU_EFI.fd" - COMPATIBLE_MACHINE:qemuarm64 = "qemuarm64" EDK2_PLATFORM:qemuarm64 = "ArmVirtQemu-AARCH64" EDK2_PLATFORM_DSC:qemuarm64 = "ArmVirtPkg/ArmVirtQemu.dsc"