From patchwork Thu Mar 21 14:33:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 41339 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 04C10C54E68 for ; Thu, 21 Mar 2024 14:33:19 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.9237.1711031593193226417 for ; Thu, 21 Mar 2024 07:33:13 -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 217441007 for ; Thu, 21 Mar 2024 07:33:47 -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 A4A503F762 for ; Thu, 21 Mar 2024 07:33:12 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/7] CI: update kas to 4.3.1 Date: Thu, 21 Mar 2024 10:33:06 -0400 Message-Id: <20240321143312.85262-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 ; Thu, 21 Mar 2024 14:33:19 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5470 Signed-off-by: Jon Mason --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 15cf4ecdbb79..120cbe3e9458 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: ${MIRROR_GHCR}/siemens/kas/kas:4.0 +image: ${MIRROR_GHCR}/siemens/kas/kas:4.3.1 variables: # These are needed as the k8s executor doesn't respect the container From patchwork Thu Mar 21 14:33:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 41342 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 7CAA4CD11C2 for ; Thu, 21 Mar 2024 14:33:19 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.9161.1711031593407815960 for ; Thu, 21 Mar 2024 07:33:13 -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 5F53D1063 for ; Thu, 21 Mar 2024 07:33:47 -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 E11B63F762 for ; Thu, 21 Mar 2024 07:33:12 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/7] arm/edk2: update to 202402 Date: Thu, 21 Mar 2024 10:33:07 -0400 Message-Id: <20240321143312.85262-2-jon.mason@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240321143312.85262-1-jon.mason@arm.com> References: <20240321143312.85262-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 ; Thu, 21 Mar 2024 14:33:19 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5471 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 Thu Mar 21 14:33:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 41344 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 89821CD11DE for ; Thu, 21 Mar 2024 14:33:19 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.9238.1711031594040076820 for ; Thu, 21 Mar 2024 07:33:14 -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 1857D1007 for ; Thu, 21 Mar 2024 07:33:48 -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 2E12E3F762 for ; Thu, 21 Mar 2024 07:33:13 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 3/7] arm/trusted-firmware-a: update to 2.10.2 Date: Thu, 21 Mar 2024 10:33:08 -0400 Message-Id: <20240321143312.85262-3-jon.mason@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240321143312.85262-1-jon.mason@arm.com> References: <20240321143312.85262-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 ; Thu, 21 Mar 2024 14:33:19 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5472 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 Thu Mar 21 14:33:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 41345 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 94400CD1280 for ; Thu, 21 Mar 2024 14:33:19 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.9162.1711031594387804280 for ; Thu, 21 Mar 2024 07:33:14 -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 545C01063 for ; Thu, 21 Mar 2024 07:33:48 -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 D8A513F762 for ; Thu, 21 Mar 2024 07:33:13 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 4/7] arm/sbsa-acs: update to 7.1.4 Date: Thu, 21 Mar 2024 10:33:09 -0400 Message-Id: <20240321143312.85262-4-jon.mason@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240321143312.85262-1-jon.mason@arm.com> References: <20240321143312.85262-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 ; Thu, 21 Mar 2024 14:33:19 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5473 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 = "" From patchwork Thu Mar 21 14:33:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 41340 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 635E8C54E58 for ; Thu, 21 Mar 2024 14:33:19 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.9239.1711031594616243496 for ; Thu, 21 Mar 2024 07:33:14 -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 92B0E1007 for ; Thu, 21 Mar 2024 07:33:48 -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 20CCC3F762 for ; Thu, 21 Mar 2024 07:33:14 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 5/7] arm/scp-firmware: update to v2.14.0 Date: Thu, 21 Mar 2024 10:33:10 -0400 Message-Id: <20240321143312.85262-5-jon.mason@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240321143312.85262-1-jon.mason@arm.com> References: <20240321143312.85262-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 ; Thu, 21 Mar 2024 14:33:19 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5474 Update to the latest version of SCP. In this release, some of the platforms were grouped into common family directories, which necessitated adding a variable to specify which one. Signed-off-by: Jon Mason --- .../recipes-bsp/scp-firmware/scp-firmware-sgi575.inc | 1 + meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc.inc | 1 + .../{scp-firmware_2.13.0.bb => scp-firmware_2.14.0.bb} | 8 +++----- 3 files changed, 5 insertions(+), 5 deletions(-) rename meta-arm/recipes-bsp/scp-firmware/{scp-firmware_2.13.0.bb => scp-firmware_2.14.0.bb} (94%) diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc index 3413822a6413..79a41a06f66d 100644 --- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc +++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc @@ -1,5 +1,6 @@ # SGI575 specific SCP configurations and build instructions COMPATIBLE_MACHINE:sgi575 = "sgi575" +SCP_PRODUCT_GROUP = "neoverse-rd" SCP_LOG_LEVEL = "INFO" diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc.inc b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc.inc index 2c6563573f3a..87160598d5cb 100644 --- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc.inc +++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc.inc @@ -1,5 +1,6 @@ # TC specific SCP configuration COMPATIBLE_MACHINE = "(tc1)" +SCP_PRODUCT_GROUP = "totalcompute" FW_TARGETS = "scp" diff --git a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.13.0.bb b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.14.0.bb similarity index 94% rename from meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.13.0.bb rename to meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.14.0.bb index 18867b03915b..c0e40d903e12 100644 --- a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.13.0.bb +++ b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.14.0.bb @@ -12,12 +12,13 @@ SRC_URI = "${SRC_URI_SCP_FIRMWARE};branch=${SRCBRANCH} \ " SRCBRANCH = "main" -SRCREV = "cc4c9e017348d92054f74026ee1beb081403c168" +SRCREV = "3267f2964114a56faaf46a40704be6ca78240725" PROVIDES += "virtual/control-processor-firmware" CMAKE_BUILD_TYPE ?= "RelWithDebInfo" SCP_PLATFORM ?= "${MACHINE}" +SCP_PRODUCT_GROUP ?= "." SCP_LOG_LEVEL ?= "WARN" SCP_PLATFORM_FEATURE_SET ?= "0" @@ -30,9 +31,6 @@ DEPENDS = "gcc-arm-none-eabi-native \ # For now we only build with GCC, so stop meta-clang trying to get involved TOOLCHAIN = "gcc" -# remove once arm-none-eabi-gcc updates to 13 or newer like poky -DEBUG_PREFIX_MAP:remove = "-fcanon-prefix-map" - inherit deploy B = "${WORKDIR}/build" @@ -61,7 +59,7 @@ do_configure() { for FW in ${FW_TARGETS}; do for TYPE in ${FW_INSTALL}; do bbnote Configuring ${SCP_PLATFORM}/${FW}_${TYPE}... - cmake -GNinja ${EXTRA_OECMAKE} -S ${S} -B "${B}/${TYPE}/${FW}" -D SCP_FIRMWARE_SOURCE_DIR:PATH="${SCP_PLATFORM}/${FW}_${TYPE}" + cmake -GNinja ${EXTRA_OECMAKE} -S ${S} -B "${B}/${TYPE}/${FW}" -D SCP_FIRMWARE_SOURCE_DIR:PATH="${SCP_PRODUCT_GROUP}/${SCP_PLATFORM}/${FW}_${TYPE}" done done } From patchwork Thu Mar 21 14:33:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 41343 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 672EACD11DC for ; Thu, 21 Mar 2024 14:33:19 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.9240.1711031594894160834 for ; Thu, 21 Mar 2024 07:33:14 -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 CE3241063 for ; Thu, 21 Mar 2024 07:33:48 -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 5ED343F762 for ; Thu, 21 Mar 2024 07:33:14 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 6/7] arm-toolchain/gcc-arm-none-eabi: remove 11.2 Date: Thu, 21 Mar 2024 10:33:11 -0400 Message-Id: <20240321143312.85262-6-jon.mason@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240321143312.85262-1-jon.mason@arm.com> References: <20240321143312.85262-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 ; Thu, 21 Mar 2024 14:33:19 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5475 gcc-arm-none-eabi v11.2 is no longer needed by tf-m. Remove this version, as there is a newer one available. Signed-off-by: Jon Mason --- ci/toolchains.yml | 2 -- .../gcc-arm-none-eabi-11.2_11.2-2022.02.bb | 23 ------------------- 2 files changed, 25 deletions(-) delete mode 100644 meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi-11.2_11.2-2022.02.bb diff --git a/ci/toolchains.yml b/ci/toolchains.yml index 9b63bf285027..056269b2bdd9 100644 --- a/ci/toolchains.yml +++ b/ci/toolchains.yml @@ -16,5 +16,3 @@ target: - nativesdk-gcc-aarch64-none-elf - gcc-arm-none-eabi - nativesdk-gcc-arm-none-eabi - - gcc-arm-none-eabi-11.2 - - nativesdk-gcc-arm-none-eabi-11.2 diff --git a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi-11.2_11.2-2022.02.bb b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi-11.2_11.2-2022.02.bb deleted file mode 100644 index 7fab1e130c11..000000000000 --- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi-11.2_11.2-2022.02.bb +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (C) 2019 Garmin Ltd. or its subsidiaries -# Released under the MIT license (see COPYING.MIT for the terms) - -require arm-binary-toolchain.inc - -COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" - -SUMMARY = "Arm GNU Toolchain - AArch32 bare-metal target (arm-none-eabi)" -LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" - -LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" -LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887" - -BINNAME = "arm-none-eabi" - -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gcc-${HOST_ARCH}" -SRC_URI[gcc-aarch64.sha256sum] = "ef1d82e5894e3908cb7ed49c5485b5b95deefa32872f79c2b5f6f5447cabf55f" -SRC_URI[gcc-x86_64.sha256sum] = "8c5acd5ae567c0100245b0556941c237369f210bceb196edfe5a2e7532c60326" - -S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}" - -UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads" -UPSTREAM_CHECK_REGEX = "${BPN}-(?P.+)-${HOST_ARCH}-linux\.tar\.\w+" From patchwork Thu Mar 21 14:33:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 41341 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 82E5FCD11DD for ; Thu, 21 Mar 2024 14:33:19 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.9239.1711031594616243496 for ; Thu, 21 Mar 2024 07:33:15 -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 17CEB1688 for ; Thu, 21 Mar 2024 07:33:49 -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 9ABD73F762 for ; Thu, 21 Mar 2024 07:33:14 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 7/7] CI: reduce coverage of dev kernel Date: Thu, 21 Mar 2024 10:33:12 -0400 Message-Id: <20240321143312.85262-7-jon.mason@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240321143312.85262-1-jon.mason@arm.com> References: <20240321143312.85262-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 ; Thu, 21 Mar 2024 14:33:19 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5476 To reduce build and test times in CI, move the dev kernel outside the standard matrix. This results in it still being built and tested for the platform, but only with gcc/glibc (and not against clang and musl). This greatly reduces the number of permutations that need to be verified. Signed-off-by: Jon Mason --- .gitlab-ci.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 120cbe3e9458..d6ac3614701f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -186,56 +186,66 @@ qemu-generic-arm64: extends: .build parallel: matrix: - - KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt] + - KERNEL: [linux-yocto, linux-yocto-rt] TOOLCHAINS: [gcc, clang] TESTING: testimage + - KERNEL: linux-yocto-dev + TESTING: testimage qemuarm64-secureboot: extends: .build parallel: matrix: - - KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt] + - KERNEL: [linux-yocto, linux-yocto-rt] TOOLCHAINS: [gcc, clang] TCLIBC: [glibc, musl] TS: [none, qemuarm64-secureboot-ts] TESTING: testimage + - KERNEL: linux-yocto-dev + TESTING: testimage qemuarm64: extends: .build parallel: matrix: - DISTRO: poky - KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt] + KERNEL: [linux-yocto, linux-yocto-rt] TOOLCHAINS: [gcc, clang] FIRMWARE: [u-boot, edk2] TESTING: testimage - DISTRO: poky-tiny TESTING: testimage - VIRT: xen + - KERNEL: linux-yocto-dev + TESTING: testimage qemuarm-secureboot: extends: .build parallel: matrix: - - KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt] + - KERNEL: [linux-yocto, linux-yocto-rt] TOOLCHAINS: [gcc, clang] TCLIBC: [glibc, musl] TESTING: testimage - TOOLCHAINS: external-gccarm TESTING: testimage + - KERNEL: linux-yocto-dev + TESTING: testimage qemuarm: extends: .build parallel: matrix: - DISTRO: poky - KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt] + KERNEL: [linux-yocto, linux-yocto-rt] TOOLCHAINS: [gcc, clang] FIRMWARE: [u-boot, edk2] TESTING: testimage - DISTRO: poky-tiny TESTING: testimage - VIRT: xen + - KERNEL: linux-yocto-dev + TESTING: testimage qemuarmv5: extends: .build