From patchwork Wed Mar 20 14:49:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 41286 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 2BC3DCD11DD for ; Wed, 20 Mar 2024 14:49:53 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.47009.1710946183880191272 for ; Wed, 20 Mar 2024 07:49:44 -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 E24D51007 for ; Wed, 20 Mar 2024 07:50:17 -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 1EAEB3F64C for ; Wed, 20 Mar 2024 07:49:43 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/3] arm/edk2: update to 202402 Date: Wed, 20 Mar 2024 10:49:40 -0400 Message-Id: <20240320144942.58433-1-jon.mason@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) 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 ; Wed, 20 Mar 2024 14:49:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5464 Signed-off-by: Jon Mason --- .../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 6bd880bdbc53..bd840967314e 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 000000000000..05885315aa8d --- /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 a564e2ac2998..2cc9372dfe5e 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" From patchwork Wed Mar 20 14:49:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 41284 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 0D567C6FD1F for ; Wed, 20 Mar 2024 14:49:53 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.47010.1710946183914391758 for ; Wed, 20 Mar 2024 07:49:44 -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 30C9B1063 for ; Wed, 20 Mar 2024 07:50:18 -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 5CE4D3F64C for ; Wed, 20 Mar 2024 07:49:43 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/3] arm/trusted-firmware-a: update to 2.10.2 Date: Wed, 20 Mar 2024 10:49:41 -0400 Message-Id: <20240320144942.58433-2-jon.mason@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240320144942.58433-1-jon.mason@arm.com> References: <20240320144942.58433-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 ; Wed, 20 Mar 2024 14:49:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5463 Update the TF-A recipe to the latest stable version (2.10.2). NOTE: tf-a-tests did not have a corresponding stable release. So, keeping back at 2.10.0. Signed-off-by: Jon Mason --- .../{fiptool-native_2.10.0.bb => fiptool-native_2.10.2.bb} | 6 +++--- ...ed-firmware-a_2.10.0.bb => trusted-firmware-a_2.10.2.bb} | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) rename meta-arm/recipes-bsp/trusted-firmware-a/{fiptool-native_2.10.0.bb => fiptool-native_2.10.2.bb} (90%) rename meta-arm/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_2.10.0.bb => trusted-firmware-a_2.10.2.bb} (82%) diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.2.bb similarity index 90% rename from meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.0.bb rename to meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.2.bb index e45ea9c4a6e8..d0c057a1e8c1 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.0.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.2.bb @@ -9,9 +9,9 @@ SRC_URI_TRUSTED_FIRMWARE_A ?= "git://git.trustedfirmware.org/TF-A/trusted-firmwa SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};destsuffix=fiptool-${PV};branch=${SRCBRANCH}" LIC_FILES_CHKSUM = "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde" -# Use fiptool from TF-A v2.10.0 -SRCREV = "b6c0948400594e3cc4dbb5a4ef04b815d2675808" -SRCBRANCH = "master" +# Use fiptool from TF-A v2.10.2 +SRCREV = "a1be69e6c5db450f841f0edd9d734bf3cffb6621" +SRCBRANCH = "lts-v2.10" DEPENDS += "openssl-native" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.2.bb similarity index 82% rename from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.0.bb rename to meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.2.bb index d25c0aaa01c8..bf2a8c168c3d 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.0.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.2.bb @@ -1,7 +1,8 @@ require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc -# TF-A v2.10.0 -SRCREV_tfa = "b6c0948400594e3cc4dbb5a4ef04b815d2675808" +# TF-A v2.10.2 +SRCREV_tfa = "a1be69e6c5db450f841f0edd9d734bf3cffb6621" +SRCBRANCH = "lts-v2.10" LIC_FILES_CHKSUM += "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde" From patchwork Wed Mar 20 14:49:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 41285 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 0C912C54E58 for ; Wed, 20 Mar 2024 14:49:53 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.47011.1710946184094653175 for ; Wed, 20 Mar 2024 07:49:44 -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 6DE2C13D5 for ; Wed, 20 Mar 2024 07:50:18 -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 A07403F64C for ; Wed, 20 Mar 2024 07:49:43 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 3/3] arm/sbsa-acs: update to 7.1.4 Date: Wed, 20 Mar 2024 10:49:42 -0400 Message-Id: <20240320144942.58433-3-jon.mason@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240320144942.58433-1-jon.mason@arm.com> References: <20240320144942.58433-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 ; Wed, 20 Mar 2024 14:49:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5465 Update to the latest version. Also, remove the gcc12 workaround, as that was added in edk2 commit 206168e83f090, which has been included since the 202305 release. Signed-off-by: Jon Mason --- .../uefi/{sbsa-acs_7.1.2.bb => sbsa-acs_7.1.4.bb} | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) rename meta-arm/recipes-bsp/uefi/{sbsa-acs_7.1.2.bb => sbsa-acs_7.1.4.bb} (72%) diff --git a/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.2.bb b/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.4.bb similarity index 72% rename from meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.2.bb rename to meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.4.bb index 2cc9372dfe5e..b61658c44bba 100644 --- a/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.2.bb +++ b/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.4.bb @@ -8,16 +8,10 @@ SRC_URI += "git://github.com/ARM-software/sbsa-acs;destsuffix=edk2/ShellPkg/Appl git://github.com/tianocore/edk2-libc;destsuffix=edk2/edk2-libc;protocol=https;branch=master;name=libc \ file://0001-Patch-in-the-paths-to-the-SBSA-test-suite.patch \ file://0002-Enforce-using-good-old-BFD-linker.patch \ - file://0001-Fix-for-mismatch-in-function-prototype.patch;patchdir=ShellPkg/Application/sbsa-acs \ " - -SRCREV_acs = "23253befbed2aee7304470fd83b78672488a7fc2" -SRCREV_libc = "d3dea661da9ae4a3421a80905e75a8dc77aa980e" - -# GCC12 trips on it -#see https://src.fedoraproject.org/rpms/edk2/blob/rawhide/f/0032-Basetools-turn-off-gcc12-warning.patch -BUILD_CFLAGS += "-Wno-error=stringop-overflow" +SRCREV_acs = "be169f0008d86341e1e48cb70d524bd1518c3acc" +SRCREV_libc = "4667a82f0d873221f8b25ea701ce57a29270e4cb" COMPATIBLE_HOST = "aarch64.*-linux" COMPATIBLE_MACHINE = ""