Skip to contentSkip to conversation

arm/trusted-firmware-m: update to 2.1.0

PATCH New Jon Mason 1 participant 1 message Jun 4, 2024

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/1 arm/trusted-firmware-m: update to 2.1.0

Adding CMSIS support, as it is now required. Also, the SHA being referenced by tf-m for cmsis is an intermediate SHA (between the v6.0.0 and v6.1.0 release tags). Finally, mbedtls is now using git submodules.

---
 .../trusted-firmware-m-2.0.0-src.inc          |  0
 ...trusted-firmware-m-scripts-native_2.0.0.bb |  0
 .../trusted-firmware-m_2.0.0.bb               |  0
 .../trusted-firmware-m-2.1.0-src.inc          | 51 +++++++++++++++++++
 ...trusted-firmware-m-scripts-native_2.1.0.bb |  2 +
 .../trusted-firmware-m/trusted-firmware-m.inc |  2 +-
 .../trusted-firmware-m_2.1.0.bb               |  2 +
 7 files changed, 56 insertions(+), 1 deletion(-)
 rename {meta-arm => meta-arm-bsp}/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.0.0-src.inc (100%)
 rename {meta-arm => meta-arm-bsp}/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_2.0.0.bb (100%)
 rename {meta-arm => meta-arm-bsp}/recipes-bsp/trusted-firmware-m/trusted-firmware-m_2.0.0.bb (100%)
 create mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.1.0-src.inc
 create mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_2.1.0.bb
 create mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_2.1.0.bb
meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.0.0-src.inc renamed from meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.0.0-src.inc +0 -0
similarity index 100%
rename from meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.0.0-src.inc
rename to meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.0.0-src.inc
meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_2.0.0.bb renamed from meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_2.0.0.bb +0 -0
similarity index 100%
rename from meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_2.0.0.bb
rename to meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_2.0.0.bb
meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_2.0.0.bb renamed from meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_2.0.0.bb +0 -0
similarity index 100%
rename from meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_2.0.0.bb
rename to meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_2.0.0.bb
meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.1.0-src.inc new file +51 -0

51 lines not on this page · raw message

meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_2.1.0.bb new file +2 -0
new file mode 100644
index 000000000000..d50d886f60b2
@@ -0,0 +1,2 @@
+require recipes-bsp/trusted-firmware-m/trusted-firmware-m-${PV}-src.inc
+require recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native.inc
meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc +1 -1
index 772366d9117f..7dbe12b2c94c 100644
@@ -73,7 +73,7 @@ EXTRA_OECMAKE += "${@bb.utils.contains('TFM_DEBUG', '1', '-DCMAKE_BUILD_TYPE=Deb
 # 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"
+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)}"
 
meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_2.1.0.bb new file +2 -0
new file mode 100644
index 000000000000..3464f49dd9d1
@@ -0,0 +1,2 @@
+require recipes-bsp/trusted-firmware-m/trusted-firmware-m-${PV}-src.inc
+require recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc
Signature · 1 line
2.39.3 (Apple Git-146)