michaelh/zephyr
1
0
Fork 0
Code Releases Activity

manifest: Upgrade to trusted-firmware-m 1.8.0

Browse source 
Update trusted-firmware-m to 1.8.0, mbedtls to 3.4.0, and tf-m-tests to
1.8.0.  Includes minor cmake changes due to file renames and such, as well
as adjusting the return type of a callback function that has changed since
the previous version of trusted-firmware-m.

Signed-off-by: David Brown <david.brown@linaro.org>
This commit is contained in:
David Brown 2023-07-10 12:12:21 -06:00 • committed by Fabio Baltieri
commit 3b3e28aeda
4 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/trusted-firmware-m/CMakeLists.txt
View file

@ -214,7 +214,6 @@ if (CONFIG_BUILD_WITH_TFM)
${TFM_INTERFACE_SOURCE_DIR}/tfm_platform_api.c
${TFM_INTERFACE_SOURCE_DIR}/tfm_ps_api.c
${TFM_INTERFACE_SOURCE_DIR}/tfm_psa_ns_api.c
${TFM_INTERFACE_SOURCE_DIR}/tfm_psa_ns_connection_api.c
# Specific to nordic_nrf platform
${TFM_INTERFACE_SOURCE_DIR}/tfm_ioctl_core_ns_api.c
@ -409,7 +408,6 @@ if (CONFIG_BUILD_WITH_TFM)
zephyr_library_sources_ifdef(CONFIG_TFM_PARTITION_INITIAL_ATTESTATION ${TFM_INTERFACE_SOURCE_DIR}/tfm_attest_api.c)
zephyr_library_sources_ifdef(CONFIG_TFM_PARTITION_FIRMWARE_UPDATE ${TFM_INTERFACE_SOURCE_DIR}/tfm_fwu_api.c)
zephyr_library_sources_ifdef(CONFIG_TFM_CONNECTION_BASED_SERVICE_API ${TFM_INTERFACE_SOURCE_DIR}/tfm_psa_ns_connection_api.c)
zephyr_library_sources(${TFM_INTERFACE_SOURCE_DIR}/tfm_psa_ns_api.c)
if(CONFIG_SOC_FAMILY_NRF)

2
modules/trusted-firmware-m/interface/interface.c
View file

@ -74,7 +74,7 @@ int32_t tfm_ns_interface_dispatch(veneer_fn fn,
return result;
}
enum tfm_status_e tfm_ns_interface_init(void)
uint32_t tfm_ns_interface_init(void)
{
/*
* The static K_MUTEX_DEFINE handles mutex initialization,