From patchwork Fri Sep 15 00:12:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 30462 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 1FB83CA553F for ; Fri, 15 Sep 2023 00:12:36 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.9977.1694736747307861617 for ; Thu, 14 Sep 2023 17:12:27 -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 7B69A1FB for ; Thu, 14 Sep 2023 17:13:03 -0700 (PDT) Received: from debian.lan?044arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 4602A3F5A1 for ; Thu, 14 Sep 2023 17:12:26 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH] arm/edk2: update to edk2-stable202308 Date: Thu, 14 Sep 2023 19:12:20 -0500 Message-Id: <20230915001220.3766492-1-jon.mason@arm.com> X-Mailer: git-send-email 2.30.2 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, 15 Sep 2023 00:12:36 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5050 Update to the latest versions of edk2 and edk2-platforms. This necessitates updating the patches in sbsa-acs to apply cleanly to the latest version of edk2. Signed-off-by: Jon Mason --- .../recipes-bsp/uefi/edk2-firmware_202305.bb | 2 +- ...tive_202305.bb => edk2-basetools-native_202308.bb} | 2 +- meta-arm/recipes-bsp/uefi/edk2-firmware_202308.bb | 7 +++++++ ...01-Patch-in-the-paths-to-the-SBSA-test-suite.patch | 11 +++++------ .../0002-Enforce-using-good-old-BFD-linker.patch | 9 ++++----- meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.2.bb | 2 +- 6 files changed, 19 insertions(+), 14 deletions(-) rename {meta-arm => meta-arm-bsp}/recipes-bsp/uefi/edk2-firmware_202305.bb (82%) rename meta-arm/recipes-bsp/uefi/{edk2-basetools-native_202305.bb => edk2-basetools-native_202308.bb} (93%) create mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202308.bb diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202305.bb b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202305.bb similarity index 82% rename from meta-arm/recipes-bsp/uefi/edk2-firmware_202305.bb rename to meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202305.bb index fe153f47..23325503 100644 --- a/meta-arm/recipes-bsp/uefi/edk2-firmware_202305.bb +++ b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202305.bb @@ -4,4 +4,4 @@ SRCREV_edk2-platforms ?= "be2af02a3fb202756ed9855173e0d0ed878ab6be" # FIXME - clang is having issues with antlr TOOLCHAIN:aarch64 = "gcc" -require edk2-firmware.inc +require recipes-bsp/uefi/edk2-firmware.inc diff --git a/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202305.bb b/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202308.bb similarity index 93% rename from meta-arm/recipes-bsp/uefi/edk2-basetools-native_202305.bb rename to meta-arm/recipes-bsp/uefi/edk2-basetools-native_202308.bb index 3a48ea5e..31b8fb08 100644 --- a/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202305.bb +++ b/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202308.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 = "ba91d0292e593df8528b66f99c1b0b14fadc8e16" +SRCREV = "819cfc6b42a68790a23509e4fcc58ceb70e1965e" S = "${WORKDIR}/git" diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202308.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_202308.bb new file mode 100644 index 00000000..8620a67b --- /dev/null +++ b/meta-arm/recipes-bsp/uefi/edk2-firmware_202308.bb @@ -0,0 +1,7 @@ +SRCREV_edk2 ?= "819cfc6b42a68790a23509e4fcc58ceb70e1965e" +SRCREV_edk2-platforms ?= "bb6841e3fd1c60b3f8510b4fc0a380784e05d326" + +# 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/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 7b0b9b38..236245fe 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,25 +1,24 @@ -From 97eb384fcc66326f93813ff14b998bb7336a4422 Mon Sep 17 00:00:00 2001 +From 3a164d9f17591a545d1eafa629b486d4a1563722 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 16 Feb 2023 21:53:25 +0000 Subject: [PATCH] Patch in the paths to the SBSA test suite Upstream-Status: Inappropriate (required action) Signed-off-by: Ross Burton - --- ShellPkg/ShellPkg.dsc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc -index dd0d88603f..7367c052fc 100644 +index dd0d88603f11..91710c0795dc 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 @@ -27,7 +26,7 @@ index dd0d88603f..7367c052fc 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 154ff0ec..284191d3 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,4 +1,4 @@ -From 8ce56a02fd722833931d356c372d374845f4c626 Mon Sep 17 00:00:00 2001 +From 6c403e3ccaae3bb3fd9d0ad220ed8ea98b2b1354 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 7 Apr 2021 00:16:07 -0700 Subject: [PATCH] Enforce using good old BFD linker @@ -12,18 +12,17 @@ collect2: error: ld returned 1 exit status Upstream-Status: Pending Signed-off-by: Khem Raj - --- BaseTools/Conf/tools_def.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template -index 503a6687c1..5cbc5c92a5 100755 +index 1bf62362b611..2b41be8d5a44 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template -@@ -746,7 +746,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 +@@ -747,7 +747,7 @@ DEFINE GCC_AARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -fno- 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 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 b6c64685..781d6e05 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_202305.bb +require recipes-bsp/uefi/edk2-firmware_202308.bb PROVIDES:remove = "virtual/bootloader" LICENSE += "& Apache-2.0"