Skip to content

Commit 45ae952

Browse files
tomi-fontaescolar
authored andcommitted
modules: tf-m: fix git clone during build
As of v2.1.0 TF-M has updated to CMSIS v6 and switched from hosting the sources to depending on the upstream repository, cloning it at build time. To prevent a download from happening during the build, CMSIS v6 sources are pushed to Zephyr's fork of TF-M and the `CMSIS_PATH` CMake variable is set to point to them. Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
1 parent 0910c86 commit 45ae952

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

modules/trusted-firmware-m/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ if (CONFIG_BUILD_WITH_TFM)
275275
${TFM_CMAKE_ARGS}
276276
$<GENEX_EVAL:$<TARGET_PROPERTY:zephyr_property_target,TFM_CMAKE_OPTIONS>>
277277
-DMBEDCRYPTO_PATH=$<IF:$<BOOL:$<TARGET_PROPERTY:zephyr_property_target,TFM_MBEDCRYPTO_PATH>>,$<TARGET_PROPERTY:zephyr_property_target,TFM_MBEDCRYPTO_PATH>,${ZEPHYR_MBEDTLS_MODULE_DIR}>
278+
-DCMSIS_PATH=${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}/platform/ext/cmsis
278279
${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}
279280
WORKING_DIRECTORY ${TFM_BINARY_DIR}
280281
COMMAND_EXPAND_LISTS

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ manifest:
327327
groups:
328328
- crypto
329329
- name: trusted-firmware-m
330-
revision: 826c4a97053264d45a4fd76755f947b6b3a573f3
330+
revision: 069455be098383bf96eab73e3ff8e0c66c60fa5a
331331
path: modules/tee/tf-m/trusted-firmware-m
332332
groups:
333333
- tee

0 commit comments

Comments
 (0)