Skip to content

Commit 9b0623e

Browse files
wearyzenkartben
authored andcommitted
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]>
1 parent ab25fdf commit 9b0623e

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
@@ -253,6 +253,8 @@ if (CONFIG_BUILD_WITH_TFM)
253253

254254
list(APPEND TFM_CMAKE_ARGS -DTFM_TESTS_REVISION_CHECKS=OFF)
255255

256+
list(APPEND TFM_CMAKE_ARGS -DETHOS_DRIVER_PATH=${CONFIG_TFM_ETHOS_DRIVER_PATH_LOCAL})
257+
256258
file(MAKE_DIRECTORY ${TFM_BINARY_DIR})
257259
add_custom_target(tfm_cmake
258260
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
@@ -310,6 +310,17 @@ config TFM_MCUBOOT_PATH_DOWNLOAD
310310

311311
endchoice
312312

313+
config TFM_ETHOS_DRIVER_PATH_LOCAL
314+
string "Path to a locally available Ethos-U driver or an empty string"
315+
default "${ZEPHYR_HAL_ETHOS_U_MODULE_DIR}"
316+
help
317+
Path to a locally available Ethos-U driver to be used for TF-M builds or
318+
an empty string to allow TF-M to automatically fetch the Ethos-U
319+
driver from an external repository at build time.
320+
By default Zephyr's Ethos-U driver will be used. It is present in
321+
the hal_ethos_u module.
322+
Alternatively, applications can point to their own paths for Ethos-U driver.
323+
313324
config TFM_QCBOR_PATH
314325
string
315326
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
@@ -353,7 +353,7 @@ manifest:
353353
groups:
354354
- tee
355355
- name: trusted-firmware-m
356-
revision: fa020a8b001843bb5a115bc4692eaf6787e3d1de
356+
revision: 3fb1f9e536b8fae5879c482ddd0f728052c3b509
357357
path: modules/tee/tf-m/trusted-firmware-m
358358
groups:
359359
- tee

0 commit comments

Comments
 (0)