modules: Update dependencies for TFM 1.6 release

This includes updates for the tfm deps:
 * tf-m-tests
 * psa-arch-tests

Signed-off-by: Jimmy Brisson <jimmy.brisson@linaro.org>
This commit is contained in:
Jimmy Brisson 2022-04-07 13:34:26 -05:00 committed by Carles Cufí
parent 36845b6168
commit 2e6cd2550c
2 changed files with 6 additions and 5 deletions

View file

@ -147,7 +147,7 @@ if (CONFIG_BUILD_WITH_TFM)
set(TFM_BINARY_DIR ${CMAKE_BINARY_DIR}/tfm)
set(VENEERS_FILE ${TFM_BINARY_DIR}/secure_fw/s_veneers.o)
set(TFM_API_NS_PATH ${TFM_BINARY_DIR}/app/libtfm_api_ns.a)
set(TFM_API_NS_PATH ${TFM_BINARY_DIR}/tf-m-tests/app/libtfm_api_ns.a)
set(TFM_GENERATED_INCLUDES ${TFM_BINARY_DIR}/generated/interface/include)
set(PLATFORM_NS_FILE ${TFM_BINARY_DIR}/platform/libplatform_ns.a)
@ -250,6 +250,7 @@ if (CONFIG_BUILD_WITH_TFM)
-DCROSS_COMPILE=${TFM_TOOLCHAIN_PATH}/${TFM_TOOLCHAIN_PREFIX}
-DCMAKE_BUILD_TYPE=${TFM_CMAKE_BUILD_TYPE}
-DTFM_PLATFORM=${CONFIG_TFM_BOARD}
-DCONFIG_TFM_BUILD_LOG_QUIET=ON
${TFM_CMAKE_ARGS}
$<GENEX_EVAL:$<TARGET_PROPERTY:zephyr_property_target,TFM_CMAKE_OPTIONS>>
-DTFM_TEST_REPO_PATH=${ZEPHYR_TF_M_TESTS_MODULE_DIR}

View file

@ -174,7 +174,7 @@ manifest:
revision: 8e303c264fc21c2116dc612658003a22e933124d
path: modules/lib/lz4
- name: mbedtls
revision: 3e3e58a92de76069730c63e0d524f40fea948a61
revision: 7fed49c9b9f983ad6416986661ef637459723bcb
path: modules/crypto/mbedtls
groups:
- crypto
@ -229,17 +229,17 @@ manifest:
groups:
- debug
- name: trusted-firmware-m
revision: bfbd7803b0ed77680e220e44ce6fb363ef2a4224
revision: 7c53a6e76130a85303f83b15d868a92fdcd5f5be
path: modules/tee/tf-m/trusted-firmware-m
groups:
- tee
- name: tf-m-tests
revision: 52814181f0fde6d1422fac204d42cde30c62e40e
revision: c99a86b295c4887520da9d8402566d7f225c974e
path: modules/tee/tf-m/tf-m-tests
groups:
- tee
- name: psa-arch-tests
revision: 4f45df539d3d98b6e38e112be9936be4a2b8a97c
revision: a81f9da287569f169d60026916952641b233faa8
path: modules/tee/tf-m/psa-arch-tests
groups:
- tee