Skip to content

Commit a3313f1

Browse files
wearyzentomi-font
authored andcommitted
[nrf fromtree] modules: avoid fetching external repo in TF-M
What is changed? - Use the updated TF-M that is compatible with the Zephyr's latest Ethos-U driver repo. - Change the default behavior of TF-M builds to use Ethos driver locally fetched by Zephyr, using west update, instead of downloading it from external repo. Why is this change required? - This is to be inline with Zephyr's rules to not fetch code from external repo. Fixes #81656 Signed-off-by: Sudan Landge <[email protected]> (cherry picked from commit 9b0623e)
1 parent 63c239c commit a3313f1

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

modules/trusted-firmware-m/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,8 @@ if (CONFIG_BUILD_WITH_TFM)
257257

258258
list(APPEND TFM_CMAKE_ARGS -DTFM_TESTS_REVISION_CHECKS=OFF)
259259

260+
list(APPEND TFM_CMAKE_ARGS -DETHOS_DRIVER_PATH=${CONFIG_TFM_ETHOS_DRIVER_PATH_LOCAL})
261+
260262
file(MAKE_DIRECTORY ${TFM_BINARY_DIR})
261263
add_custom_target(tfm_cmake
262264
DEPENDS ${TFM_BINARY_DIR}/CMakeCache.txt

modules/trusted-firmware-m/Kconfig.tfm

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,17 @@ config TFM_MCUBOOT_PATH_DOWNLOAD
311311

312312
endchoice
313313

314+
config TFM_ETHOS_DRIVER_PATH_LOCAL
315+
string "Path to a locally available Ethos-U driver or an empty string"
316+
default "${ZEPHYR_HAL_ETHOS_U_MODULE_DIR}"
317+
help
318+
Path to a locally available Ethos-U driver to be used for TF-M builds or
319+
an empty string to allow TF-M to automatically fetch the Ethos-U
320+
driver from an external repository at build time.
321+
By default Zephyr's Ethos-U driver will be used. It is present in
322+
the hal_ethos_u module.
323+
Alternatively, applications can point to their own paths for Ethos-U driver.
324+
314325
config TFM_QCBOR_PATH
315326
string
316327
prompt "Path to QCBOR or DOWNLOAD to fetch automatically"

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ manifest:
350350
groups:
351351
- tee
352352
- name: trusted-firmware-m
353-
revision: fa020a8b001843bb5a115bc4692eaf6787e3d1de
353+
revision: 3fb1f9e536b8fae5879c482ddd0f728052c3b509
354354
path: modules/tee/tf-m/trusted-firmware-m
355355
groups:
356356
- tee

0 commit comments

Comments
 (0)