diff mbox series

[4/4] arm/trusted-firmware-m: consolidate setting t_cose location

Message ID 20251119171333.3883043-4-ross.burton@arm.com
State New
Headers show
Series [1/4] arm/trusted-firmware-m: remove now obsolete assignments | expand

Commit Message

Ross Burton Nov. 19, 2025, 5:13 p.m. UTC 
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 <ross.burton@arm.com>
---
 .../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 mbox series

Patch

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)}"