modules: CMSIS_6: fix path and use it for TF-M
What is the change? Fix the path for module CMSIS_6 and use CMSIS_6 module for TF-M. Why do we need this change? After Zephyr updated TF-M to v2.1.0, bb037d4469842c96f5872b271490aceb0734d965 added a local copy of CMSIS_6 to stop Zephyr's TF-M from downloading the CMSIS_6 from upstream. The correct way would be to have CMSIS_6 as a module in Zephyr (which we have now) and pass the path of this module to TF-M. A fork of the upstream CMSIS_6 was added to Zephyr however, the path in west.yml makes it a lib and not a module. Fixing the path generates the ZEPHYR_CMSIS_6_MODULE_DIR symbol which can now be used to pass to TF-M and the copy in TF-M would no longer be required. Signed-off-by: Sudan Landge <sudan.landge@arm.com>
This commit is contained in:
parent
4bc2de23a9
commit
c4235fa489
2 changed files with 6 additions and 4 deletions
|
@ -289,7 +289,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
|
||||
-DCMSIS_PATH=${ZEPHYR_CMSIS_6_MODULE_DIR}
|
||||
${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}
|
||||
WORKING_DIRECTORY ${TFM_BINARY_DIR}
|
||||
COMMAND_EXPAND_LISTS
|
||||
|
|
8
west.yml
8
west.yml
|
@ -129,8 +129,10 @@ manifest:
|
|||
path: modules/lib/cmsis-nn
|
||||
- name: cmsis_6
|
||||
repo-path: CMSIS_6
|
||||
revision: 783317a3072554acbac86cca2ff24928cbf98d30
|
||||
path: modules/lib/cmsis_6
|
||||
revision: 6dd50439a9b83398ff2ae1376eef0a2a0b95913b
|
||||
path: modules/hal/cmsis_6
|
||||
groups:
|
||||
- hal
|
||||
- name: edtt
|
||||
revision: b9ca3c7030518f07b7937dacf970d37a47865a76
|
||||
path: tools/edtt
|
||||
|
@ -358,7 +360,7 @@ manifest:
|
|||
groups:
|
||||
- tee
|
||||
- name: trusted-firmware-m
|
||||
revision: e2288c13ee0abc16163186523897e7910b03dd31
|
||||
revision: 64738996dca5f5e058e0a358b81033f4b792be27
|
||||
path: modules/tee/tf-m/trusted-firmware-m
|
||||
groups:
|
||||
- tee
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue