From 7e82dba13060b7b61a182d48e647eda092fb49ea Mon Sep 17 00:00:00 2001 From: Ioannis Glaropoulos Date: Thu, 15 Oct 2020 15:47:16 +0200 Subject: [PATCH] samples: tfm_integration: adapt CMakeLists.txt to new TF-M build system 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 --- samples/tfm_integration/psa_level_1/CMakeLists.txt | 5 ++--- samples/tfm_integration/tfm_ipc/CMakeLists.txt | 11 +++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/samples/tfm_integration/psa_level_1/CMakeLists.txt b/samples/tfm_integration/psa_level_1/CMakeLists.txt index 38df24f1fe8..5c49ef71dbf 100644 --- a/samples/tfm_integration/psa_level_1/CMakeLists.txt +++ b/samples/tfm_integration/psa_level_1/CMakeLists.txt @@ -17,8 +17,7 @@ endif() trusted_firmware_build(BINARY_DIR ${CMAKE_BINARY_DIR}/tfm BOARD ${TFM_TARGET_PLATFORM} IPC - CFGFILE "ConfigRegressionIPC" - OUT_VENEERS_FILE VENEERS_FILE + REGRESSION ${TFM_BL2_ARGUMENT} ) @@ -38,7 +37,7 @@ target_sources(app PRIVATE src/util_app_log.c) target_sources(app PRIVATE src/util_sformat.c) # 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 target_link_libraries(${ZEPHYR_CURRENT_LIBRARY} PRIVATE ${VENEERS_FILE}) diff --git a/samples/tfm_integration/tfm_ipc/CMakeLists.txt b/samples/tfm_integration/tfm_ipc/CMakeLists.txt index 36dab31ff64..614bcd4cd8e 100644 --- a/samples/tfm_integration/tfm_ipc/CMakeLists.txt +++ b/samples/tfm_integration/tfm_ipc/CMakeLists.txt @@ -14,20 +14,19 @@ elseif (CONFIG_TFM_BL2_FALSE) endif() # 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 BOARD ${TFM_TARGET_PLATFORM} IPC - CFGFILE "ConfigRegressionIPCTfmLevel2" - OUT_VENEERS_FILE VENEERS_FILE + ISOLATION_LEVEL 2 + REGRESSION ${TFM_BL2_ARGUMENT} ) else() trusted_firmware_build(BINARY_DIR ${CMAKE_BINARY_DIR}/tfm BOARD ${TFM_TARGET_PLATFORM} IPC - CFGFILE "ConfigRegressionIPC" - OUT_VENEERS_FILE VENEERS_FILE + REGRESSION ${TFM_BL2_ARGUMENT} ) endif() @@ -40,7 +39,7 @@ add_dependencies(app tfm) target_sources(app PRIVATE src/main.c) # 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 target_link_libraries(${ZEPHYR_CURRENT_LIBRARY} PRIVATE ${VENEERS_FILE})