From aff67cb5d748aafcba1ee589a758d51191f061c2 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 19 Nov 2025 17:13:32 +0000 Subject: [PATCH] arm/trusted-firmware-m: consolidate setting t_cose location 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 Signed-off-by: Jon Mason --- .../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 d57c9e61..a53124dd 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 2b1826bf..fc23c028 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 57cd2387..dc11e984 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)}"