Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modules: avoid fetching external repo in TF-M #83360

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions boards/arm/mps3/mps3_corstone300_fvp_ns.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ type: mcu
arch: arm
ram: 2048
flash: 512
# Related issue #81656
twister: false
toolchain:
- gnuarmemb
- zephyr
Expand Down
2 changes: 2 additions & 0 deletions modules/trusted-firmware-m/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,8 @@ if (CONFIG_BUILD_WITH_TFM)

list(APPEND TFM_CMAKE_ARGS -DTFM_TESTS_REVISION_CHECKS=OFF)

list(APPEND TFM_CMAKE_ARGS -DETHOS_DRIVER_PATH=${CONFIG_TFM_ETHOS_DRIVER_PATH_LOCAL})

file(MAKE_DIRECTORY ${TFM_BINARY_DIR})
add_custom_target(tfm_cmake
DEPENDS ${TFM_BINARY_DIR}/CMakeCache.txt
Expand Down
11 changes: 11 additions & 0 deletions modules/trusted-firmware-m/Kconfig.tfm
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,17 @@ config TFM_MCUBOOT_PATH_DOWNLOAD

endchoice

config TFM_ETHOS_DRIVER_PATH_LOCAL
string "Path to a locally available Ethos-U driver or an empty string"
default "${ZEPHYR_HAL_ETHOS_U_MODULE_DIR}"
help
Path to a locally available Ethos-U driver to be used for TF-M builds or
an empty string to allow TF-M to automatically fetch the Ethos-U
driver from an external repository at build time.
By default Zephyr's Ethos-U driver will be used. It is present in
the hal_ethos_u module.
Alternatively, applications can point to their own paths for Ethos-U driver.

config TFM_QCBOR_PATH
string
prompt "Path to QCBOR or DOWNLOAD to fetch automatically"
Expand Down
2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ manifest:
groups:
- tee
- name: trusted-firmware-m
revision: fa020a8b001843bb5a115bc4692eaf6787e3d1de
revision: 3fb1f9e536b8fae5879c482ddd0f728052c3b509
path: modules/tee/tf-m/trusted-firmware-m
groups:
- tee
Expand Down
Loading