michaelh/zephyr
1
0
Fork 0
Code Releases Activity

modules: trusted-firmware-m: Use TF-M install headers as interface

Browse source 
Use the set of headers that the TF-M build system places in the
install output. Not all public header files are available in the
interface/include directory and the TF-M build system uses the install
mechanism of cmake to include additional headers based on platform
or configuration.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2021-11-22 16:53:04 +01:00 • committed by Carles Cufí
commit 17f8932f16
7 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -321,7 +321,7 @@ if (CONFIG_BUILD_WITH_TFM)
)
target_include_directories(tfm_api PRIVATE
${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}/interface/include
${TFM_BINARY_DIR}/install/interface/include
)
zephyr_library_link_libraries(

2
samples/tfm_integration/psa_crypto/CMakeLists.txt
View file

@ -16,7 +16,7 @@ target_sources(app PRIVATE src/util_app_log.c)
target_sources(app PRIVATE src/util_sformat.c)
target_include_directories(app PRIVATE
${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}/interface/include
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include
)
# In TF-M, default value of CRYPTO_ENGINE_BUF_SIZE is 0x2080. It causes

2
samples/tfm_integration/psa_protected_storage/CMakeLists.txt
View file

@ -13,5 +13,5 @@ project(protected_storage)
target_sources(app PRIVATE src/main.c)
target_include_directories(app PRIVATE
${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}/interface/include
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include
)

2
samples/tfm_integration/tfm_ipc/CMakeLists.txt
View file

@ -9,5 +9,5 @@ project(tfm_ipc)
target_sources(app PRIVATE src/main.c)
target_include_directories(app PRIVATE
${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}/interface/include
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include
)

2
samples/tfm_integration/tfm_psa_test/CMakeLists.txt
View file

@ -13,5 +13,5 @@ project(tfm_psa_storage_test)
target_sources(app PRIVATE src/main.c)
target_include_directories(app PRIVATE
${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}/interface/include
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include
)

2
samples/tfm_integration/tfm_secure_partition/CMakeLists.txt
View file

@ -28,7 +28,7 @@ target_sources(app PRIVATE
)
target_include_directories(app PRIVATE
${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}/interface/include
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include
)
target_compile_definitions(app

8
tests/arch/arm/arm_thread_swap_tz/CMakeLists.txt
View file

@ -12,6 +12,8 @@ project(NONE)
FILE(GLOB app_sources src/*.c)
target_sources(app PRIVATE ${app_sources})
target_include_directories(app PRIVATE
${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}/interface/include
)
if (CONFIG_BUILD_WITH_TFM)
target_include_directories(app PRIVATE
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include
)
endif()