Commit 45ae9524 authored by Tomi Fontanilles's avatar Tomi Fontanilles Committed by Alberto Escolar
Browse files

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: default avatarTomi Fontanilles <tomi.fontanilles@nordicsemi.no>
parent 0910c862

modules/trusted-firmware-m/CMakeLists.txt

+1 −0
Changes for modules/trusted-firmware-m/CMakeLists.txt: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ if (CONFIG_BUILD_WITH_TFM) 
      ${TFM_CMAKE_ARGS}

      $<GENEX_EVAL:$<TARGET_PROPERTY:zephyr_property_target,TFM_CMAKE_OPTIONS>>

      -DMBEDCRYPTO_PATH=$<IF:$<BOOL:$<TARGET_PROPERTY:zephyr_property_target,TFM_MBEDCRYPTO_PATH>>,$<TARGET_PROPERTY:zephyr_property_target,TFM_MBEDCRYPTO_PATH>,${ZEPHYR_MBEDTLS_MODULE_DIR}>

      -DCMSIS_PATH=${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}/platform/ext/cmsis

      ${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}

    WORKING_DIRECTORY ${TFM_BINARY_DIR}

    COMMAND_EXPAND_LISTS

west.yml

+1 −1
Changes for west.yml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ manifest: 
      groups:

        - crypto

    - name: trusted-firmware-m

      revision: 826c4a97053264d45a4fd76755f947b6b3a573f3

      revision: 069455be098383bf96eab73e3ff8e0c66c60fa5a

      path: modules/tee/tf-m/trusted-firmware-m

      groups:

        - tee

CRA Git | Maintained and supported by SUSTech CRA and CCSE