michaelh/zephyr
1
0
Fork 0
Code Releases Activity

samples: tfm_integration: adapt CMakeLists.txt to new TF-M build system

Browse source 
Changes required in TF-M integration samples CMakeLists.txt
files due to the new upstream TF-M build system. In brief,
configuration related to PSA API (IPC), Regression, and
Isolation level needs to be passed, now, directly, not
via invoking a given TF-M CMake configuration.

Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
This commit is contained in:
Ioannis Glaropoulos 2020-10-15 15:47:16 +02:00
commit 7e82dba130
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
samples/tfm_integration/psa_level_1/CMakeLists.txt
View file

@ -17,8 +17,7 @@ endif()
trusted_firmware_build(BINARY_DIR ${CMAKE_BINARY_DIR}/tfm trusted_firmware_build(BINARY_DIR ${CMAKE_BINARY_DIR}/tfm
BOARD ${TFM_TARGET_PLATFORM} BOARD ${TFM_TARGET_PLATFORM}
IPC IPC
CFGFILE "ConfigRegressionIPC" REGRESSION
OUT_VENEERS_FILE VENEERS_FILE
${TFM_BL2_ARGUMENT} ${TFM_BL2_ARGUMENT}
) )
@ -38,7 +37,7 @@ target_sources(app PRIVATE src/util_app_log.c)
target_sources(app PRIVATE src/util_sformat.c) target_sources(app PRIVATE src/util_sformat.c)
# Include TF-M secure service source files # Include TF-M secure service source files
target_link_libraries(app PRIVATE tfm_ipc_psa_api) target_link_libraries(app PRIVATE tfm_api)
# Link in veneer function locations # Link in veneer function locations
target_link_libraries(${ZEPHYR_CURRENT_LIBRARY} PRIVATE ${VENEERS_FILE}) target_link_libraries(${ZEPHYR_CURRENT_LIBRARY} PRIVATE ${VENEERS_FILE})

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

@ -14,20 +14,19 @@ elseif (CONFIG_TFM_BL2_FALSE)
endif() endif()
# Add "tfm" as an external project via the TF-M module's cmake file # Add "tfm" as an external project via the TF-M module's cmake file
if(${TFM_TARGET_PLATFORM} STREQUAL "stm/nucleo_l552ze_q") if("${TFM_TARGET_PLATFORM}" STREQUAL "stm/nucleo_l552ze_q")
trusted_firmware_build(BINARY_DIR ${CMAKE_BINARY_DIR}/tfm trusted_firmware_build(BINARY_DIR ${CMAKE_BINARY_DIR}/tfm
BOARD ${TFM_TARGET_PLATFORM} BOARD ${TFM_TARGET_PLATFORM}
IPC IPC
CFGFILE "ConfigRegressionIPCTfmLevel2" ISOLATION_LEVEL 2
OUT_VENEERS_FILE VENEERS_FILE REGRESSION
${TFM_BL2_ARGUMENT} ${TFM_BL2_ARGUMENT}
) )
else() else()
trusted_firmware_build(BINARY_DIR ${CMAKE_BINARY_DIR}/tfm trusted_firmware_build(BINARY_DIR ${CMAKE_BINARY_DIR}/tfm
BOARD ${TFM_TARGET_PLATFORM} BOARD ${TFM_TARGET_PLATFORM}
IPC IPC
CFGFILE "ConfigRegressionIPC" REGRESSION
OUT_VENEERS_FILE VENEERS_FILE
${TFM_BL2_ARGUMENT} ${TFM_BL2_ARGUMENT}
) )
endif() endif()
@ -40,7 +39,7 @@ add_dependencies(app tfm)
target_sources(app PRIVATE src/main.c) target_sources(app PRIVATE src/main.c)
# Include TF-M secure service source files # Include TF-M secure service source files
target_link_libraries(app PRIVATE tfm_ipc_psa_api) target_link_libraries(app PRIVATE tfm_api)
# Link in veneer function locations # Link in veneer function locations
target_link_libraries(${ZEPHYR_CURRENT_LIBRARY} PRIVATE ${VENEERS_FILE}) target_link_libraries(${ZEPHYR_CURRENT_LIBRARY} PRIVATE ${VENEERS_FILE})