michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tfm: Adapt to changes upstream

Browse source 
Rename lib.
Disable AUDIT_LOG in regression sample because of a bug upstream.
Update stm32l562e_dk_ns overlay.

Signed-off-by: Øyvind Rønningstad <oyvind.ronningstad@nordicsemi.no>
This commit is contained in:
Øyvind Rønningstad 2021-03-22 12:52:09 +01:00 • committed by Ioannis Glaropoulos
commit 41eedf8ae5
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -88,7 +88,7 @@ function(trusted_firmware_build)
endif() endif()
set(VENEERS_FILE ${TFM_BINARY_DIR}/secure_fw/s_veneers.o) set(VENEERS_FILE ${TFM_BINARY_DIR}/secure_fw/s_veneers.o)
set(PSA_API_NS_PATH ${TFM_BINARY_DIR}/interface/libpsa_api_ns.a) set(TFM_API_NS_PATH ${TFM_BINARY_DIR}/app/libtfm_api_ns.a)
set(TFM_GENERATED_INCLUDES ${TFM_BINARY_DIR}/generated/interface/include) set(TFM_GENERATED_INCLUDES ${TFM_BINARY_DIR}/generated/interface/include)
if(TFM_BL2) if(TFM_BL2)
@ -105,7 +105,7 @@ function(trusted_firmware_build)
set(BUILD_BYPRODUCTS set(BUILD_BYPRODUCTS
${VENEERS_FILE} ${VENEERS_FILE}
${PSA_API_NS_PATH} ${TFM_API_NS_PATH}
${TFM_GENERATED_INCLUDES}/psa_manifest/sid.h ${TFM_GENERATED_INCLUDES}/psa_manifest/sid.h
${BL2_BIN_FILE} ${BL2_BIN_FILE}
${BL2_HEX_FILE} ${BL2_HEX_FILE}
@ -197,7 +197,7 @@ function(trusted_firmware_build)
PUBLIC PUBLIC
zephyr_interface zephyr_interface
INTERFACE INTERFACE
${PSA_API_NS_PATH} ${TFM_API_NS_PATH}
${VENEERS_FILE} ${VENEERS_FILE}
$<TARGET_FILE:tfm_api> $<TARGET_FILE:tfm_api>
) )

10
samples/tfm_integration/tfm_ipc/boards/stm32l562e_dk_ns.overlay
View file

@ -30,18 +30,18 @@
boot_partition: partition@0 { boot_partition: partition@0 {
label = "mcuboot"; label = "mcuboot";
reg = <0x00000000 0x00013000>; reg = <0x00000000 0x00019000>;
read-only; read-only;
}; };
/* Secure image primary slot */ /* Secure image primary slot */
slot0_partition: partition@00013000 { slot0_partition: partition@00019000 {
label = "image-0"; label = "image-0";
reg = <0x00013000 0x00038000>; reg = <0x00019000 0x00038000>;
}; };
/* Non-secure image primary slot */ /* Non-secure image primary slot */
slot1_partition: partition@0004B000 { slot1_partition: partition@00051000 {
label = "image-1"; label = "image-1";
reg = <0x0004B000 0x0002A000>; reg = <0x00051000 0x0002A000>;
}; };
/* /*
* The flash starting at 0x7F000 and ending at * The flash starting at 0x7F000 and ending at

1
samples/tfm_integration/tfm_ipc/prj.conf
View file

@ -1,6 +1,7 @@
CONFIG_BUILD_WITH_TFM=y CONFIG_BUILD_WITH_TFM=y
CONFIG_TFM_IPC=y CONFIG_TFM_IPC=y
CONFIG_TFM_REGRESSION=y CONFIG_TFM_REGRESSION=y
CONFIG_TFM_PARTITION_AUDIT_LOG=n
# The Zephyr CMSIS emulation assumes that ticks are ms, currently # The Zephyr CMSIS emulation assumes that ticks are ms, currently
CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000