From patchwork Wed Nov 19 17:13:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 75027 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 EC3CECF397B for ; Wed, 19 Nov 2025 17:13:59 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.12490.1763572420261872064 for ; Wed, 19 Nov 2025 09:13:50 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=temperror, err=temporary DNS error (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@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 56FBDFEC for ; Wed, 19 Nov 2025 09:13:30 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.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 87C4B3F66E for ; Wed, 19 Nov 2025 09:13:37 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/4] arm/trusted-firmware-m: remove now obsolete assignments Date: Wed, 19 Nov 2025 17:13:29 +0000 Message-ID: <20251119171333.3883043-1-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 19 Nov 2025 17:13:59 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6777 We now use Ninja to build TF-M[1], so setting CMAKE_VERBOSE_MAKEFILES doesn't do anything. We have arm-none-eabi-gcc 13.3[2], so there's no need to remove options that <13 don't support. [1] meta-arm 018fd6aecf ("arm/trusted-firmware-m: use Ninja to build") [2] meta-arm f646ee4507 ("arm-toolchain: update to 13.3") Signed-off-by: Ross Burton --- .../recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc index bf31fc6719..45e72bdc56 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc +++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc @@ -70,9 +70,6 @@ EXTRA_OECMAKE += "-DTFM_PLATFORM=${TFM_PLATFORM}" # Handle TFM_DEBUG parameter EXTRA_OECMAKE += "${@bb.utils.contains('TFM_DEBUG', '1', '-DCMAKE_BUILD_TYPE=Debug', '-DCMAKE_BUILD_TYPE=Release', d)}" -# Verbose builds -EXTRA_OECMAKE += "-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON" - EXTRA_OECMAKE += "-DMBEDCRYPTO_PATH=${S}/../mbedtls -DTFM_TEST_REPO_PATH=${S}/../tf-m-tests -DTFM_EXTRAS_REPO_PATH=${S}/../tfm-extras -DMCUBOOT_PATH=${S}/../mcuboot -DQCBOR_PATH=${S}/../qcbor -DCMSIS_PATH=${S}/../cmsis" export CMAKE_BUILD_PARALLEL_LEVEL = "${@oe.utils.parallel_make(d, False)}" @@ -81,9 +78,6 @@ AS[unexport] = "1" CC[unexport] = "1" LD[unexport] = "1" -# remove once arm-none-eabi-gcc updates to 13 or newer like poky -DEBUG_PREFIX_MAP:remove = "-fcanon-prefix-map" - # python3-cryptography needs the legacy provider, so set OPENSSL_MODULES to the # right path until this is relocated automatically. export OPENSSL_MODULES = "${STAGING_LIBDIR_NATIVE}/ossl-modules" From patchwork Wed Nov 19 17:13:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 75024 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 14ADBCF3973 for ; Wed, 19 Nov 2025 17:13:50 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.12519.1763572419389156670 for ; Wed, 19 Nov 2025 09:13:49 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=temperror, err=temporary DNS error (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@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 F33C012FC for ; Wed, 19 Nov 2025 09:13:30 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.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 306743F66E for ; Wed, 19 Nov 2025 09:13:38 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/4] arm/trusted-firmware-m: use UNPACKDIR instead of S/../ Date: Wed, 19 Nov 2025 17:13:30 +0000 Message-ID: <20251119171333.3883043-2-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251119171333.3883043-1-ross.burton@arm.com> References: <20251119171333.3883043-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 19 Nov 2025 17:13:50 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6774 This is slightly clearer. Signed-off-by: Ross Burton --- .../trusted-firmware-m/trusted-firmware-m-git-src.inc | 2 +- meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-git-src.inc b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-git-src.inc index 65a2e3110a..2b1826bf93 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-git-src.inc +++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-git-src.inc @@ -2,7 +2,7 @@ LICENSE = "BSD-2-Clause & BSD-3-Clause & Apache-2.0" -EXTRA_OECMAKE += "-DT_COSE_PATH=${S}/../t_cose" +EXTRA_OECMAKE += "-DT_COSE_PATH=${UNPACKDIR}/t_cose" LIC_FILES_CHKSUM = "file://license.rst;md5=07f368487da347f3c7bd0fc3085f3afa \ file://../tf-m-tests/license.rst;md5=4481bae2221b0cfca76a69fb3411f390 \ diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc index 45e72bdc56..57cd23872f 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc +++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc @@ -70,7 +70,7 @@ EXTRA_OECMAKE += "-DTFM_PLATFORM=${TFM_PLATFORM}" # Handle TFM_DEBUG parameter EXTRA_OECMAKE += "${@bb.utils.contains('TFM_DEBUG', '1', '-DCMAKE_BUILD_TYPE=Debug', '-DCMAKE_BUILD_TYPE=Release', d)}" -EXTRA_OECMAKE += "-DMBEDCRYPTO_PATH=${S}/../mbedtls -DTFM_TEST_REPO_PATH=${S}/../tf-m-tests -DTFM_EXTRAS_REPO_PATH=${S}/../tfm-extras -DMCUBOOT_PATH=${S}/../mcuboot -DQCBOR_PATH=${S}/../qcbor -DCMSIS_PATH=${S}/../cmsis" +EXTRA_OECMAKE += "-DMBEDCRYPTO_PATH=${UNPACKDIR}/mbedtls -DTFM_TEST_REPO_PATH=${UNPACKDIR}/tf-m-tests -DTFM_EXTRAS_REPO_PATH=${UNPACKDIR}/tfm-extras -DMCUBOOT_PATH=${UNPACKDIR}/mcuboot -DQCBOR_PATH=${UNPACKDIR}/qcbor -DCMSIS_PATH=${UNPACKDIR}/cmsis" export CMAKE_BUILD_PARALLEL_LEVEL = "${@oe.utils.parallel_make(d, False)}" From patchwork Wed Nov 19 17:13:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 75025 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 DF38CCF3979 for ; Wed, 19 Nov 2025 17:13:59 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.12489.1763572420261732951 for ; Wed, 19 Nov 2025 09:13:50 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=temperror, err=temporary DNS error (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@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 9BC44153B for ; Wed, 19 Nov 2025 09:13:31 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.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 CD3673F66E for ; Wed, 19 Nov 2025 09:13:38 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 3/4] arm-bsp/trusted-firmware-m: use UNPACKDIR instead of S/../ Date: Wed, 19 Nov 2025 17:13:31 +0000 Message-ID: <20251119171333.3883043-3-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251119171333.3883043-1-ross.burton@arm.com> References: <20251119171333.3883043-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 19 Nov 2025 17:13:59 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6776 This is slightly clearer. Signed-off-by: Ross Burton --- .../trusted-firmware-m/trusted-firmware-m-corstone1000.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc index e0a0745ce0..a9521fbfbb 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc @@ -16,7 +16,7 @@ EXTRA_OECMAKE += "-DPLATFORM_IS_FVP=${TFM_PLATFORM_IS_FVP}" EXTRA_OECMAKE += "-DCC312_LEGACY_DRIVER_API_ENABLED=OFF" EXTRA_OECMAKE:append:corstone1000-fvp = " -DENABLE_MULTICORE=${@bb.utils.contains('MACHINE_FEATURES', 'corstone1000_fvp_smp', 'TRUE', 'FALSE', d)}" EXTRA_OECMAKE:append:corstone1000-mps3 = " -DPLATFORM_PSA_ADAC_SECURE_DEBUG=${@bb.utils.contains('MACHINE_FEATURES', 'secure-debug', 'ON', 'OFF', d)}" -EXTRA_OECMAKE:append:corstone1000-mps3 = " -DPLATFORM_PSA_ADAC_SOURCE_PATH=${S}/../tfm-psa-adac -DPLATFORM_PSA_ADAC_BUILD_PATH=${B}/tfm-psa-adac-build" +EXTRA_OECMAKE:append:corstone1000-mps3 = " -DPLATFORM_PSA_ADAC_SOURCE_PATH=${UNPACKDIR}/tfm-psa-adac -DPLATFORM_PSA_ADAC_BUILD_PATH=${B}/tfm-psa-adac-build" SRC_URI += " \ file://0001-arm-trusted-firmware-m-disable-address-warnings-into.patch \ From patchwork Wed Nov 19 17:13:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 75026 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 DCB3DCF3977 for ; Wed, 19 Nov 2025 17:13:59 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.12488.1763572420180942908 for ; Wed, 19 Nov 2025 09:13:50 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=temperror, err=temporary DNS error (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@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 447F11684 for ; Wed, 19 Nov 2025 09:13:32 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.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 75E573F66E for ; Wed, 19 Nov 2025 09:13:39 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 4/4] arm/trusted-firmware-m: consolidate setting t_cose location Date: Wed, 19 Nov 2025 17:13:32 +0000 Message-ID: <20251119171333.3883043-4-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251119171333.3883043-1-ross.burton@arm.com> References: <20251119171333.3883043-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 19 Nov 2025 17:13:59 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6775 Whilst TF-M 2.1.1 doesn't use this, setting the variable doesn't have any negative effects and consolidates the external module assignments. Signed-off-by: Ross Burton --- .../trusted-firmware-m-2.2.1-src.inc | 2 -- .../trusted-firmware-m/trusted-firmware-m-git-src.inc | 2 -- .../trusted-firmware-m/trusted-firmware-m.inc | 10 +++++++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.2.1-src.inc b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.2.1-src.inc index d57c9e613d..a53124ddd4 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.2.1-src.inc +++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.2.1-src.inc @@ -2,8 +2,6 @@ LICENSE = "BSD-2-Clause & BSD-3-Clause & Apache-2.0" -EXTRA_OECMAKE += "-DT_COSE_PATH=${UNPACKDIR}/t_cose" - LIC_FILES_CHKSUM = "file://license.rst;md5=07f368487da347f3c7bd0fc3085f3afa \ file://${UNPACKDIR}/tf-m-tests/license.rst;md5=4481bae2221b0cfca76a69fb3411f390 \ file://${UNPACKDIR}/mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d \ diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-git-src.inc b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-git-src.inc index 2b1826bf93..fc23c0285d 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-git-src.inc +++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-git-src.inc @@ -2,8 +2,6 @@ LICENSE = "BSD-2-Clause & BSD-3-Clause & Apache-2.0" -EXTRA_OECMAKE += "-DT_COSE_PATH=${UNPACKDIR}/t_cose" - LIC_FILES_CHKSUM = "file://license.rst;md5=07f368487da347f3c7bd0fc3085f3afa \ file://../tf-m-tests/license.rst;md5=4481bae2221b0cfca76a69fb3411f390 \ file://../mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d \ diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc index 57cd23872f..dc11e9845a 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc +++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc @@ -70,7 +70,15 @@ EXTRA_OECMAKE += "-DTFM_PLATFORM=${TFM_PLATFORM}" # Handle TFM_DEBUG parameter EXTRA_OECMAKE += "${@bb.utils.contains('TFM_DEBUG', '1', '-DCMAKE_BUILD_TYPE=Debug', '-DCMAKE_BUILD_TYPE=Release', d)}" -EXTRA_OECMAKE += "-DMBEDCRYPTO_PATH=${UNPACKDIR}/mbedtls -DTFM_TEST_REPO_PATH=${UNPACKDIR}/tf-m-tests -DTFM_EXTRAS_REPO_PATH=${UNPACKDIR}/tfm-extras -DMCUBOOT_PATH=${UNPACKDIR}/mcuboot -DQCBOR_PATH=${UNPACKDIR}/qcbor -DCMSIS_PATH=${UNPACKDIR}/cmsis" +EXTRA_OECMAKE += "\ + -DCMSIS_PATH=${UNPACKDIR}/cmsis \ + -DMBEDCRYPTO_PATH=${UNPACKDIR}/mbedtls \ + -DMCUBOOT_PATH=${UNPACKDIR}/mcuboot \ + -DQCBOR_PATH=${UNPACKDIR}/qcbor \ + -DT_COSE_PATH=${UNPACKDIR}/t_cose \ + -DTFM_EXTRAS_REPO_PATH=${UNPACKDIR}/tfm-extras \ + -DTFM_TEST_REPO_PATH=${UNPACKDIR}/tf-m-tests \ + " export CMAKE_BUILD_PARALLEL_LEVEL = "${@oe.utils.parallel_make(d, False)}"