From afd938491add7a572632e480c276b7eb0503c8e5 Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Thu, 8 Apr 2021 13:36:27 +0100 Subject: [PATCH] CMake platform: remove MBED_PATH, use standard variables As we still use target labels, TFM is not visible to CMake. Protect include of their scripts with the same mechanism. --- .../TARGET_TFM_LATEST/CMakeLists.txt | 2 ++ .../scripts/mbed_set_post_build_tfm.cmake | 4 ++-- .../TARGET_MUSCA_B1/CMakeLists.txt | 18 ++++++++++-------- .../TARGET_MUSCA_S1/CMakeLists.txt | 18 ++++++++++-------- 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/CMakeLists.txt b/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/CMakeLists.txt index 121c8e211f..d652f7c8e6 100644 --- a/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/CMakeLists.txt +++ b/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/CMakeLists.txt @@ -39,3 +39,5 @@ target_sources(mbed-psa src/tfm_platform_ipc_api.c src/tfm_ps_ipc_api.c ) + +set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/scripts") diff --git a/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/scripts/mbed_set_post_build_tfm.cmake b/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/scripts/mbed_set_post_build_tfm.cmake index e53d5a857c..7e4550c67e 100644 --- a/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/scripts/mbed_set_post_build_tfm.cmake +++ b/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/scripts/mbed_set_post_build_tfm.cmake @@ -1,7 +1,7 @@ # Copyright (c) 2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -include(${MBED_PATH}/tools/cmake/mbed_set_post_build.cmake) +include(mbed_set_post_build) # # Sign TF-M secure and non-secure images and combine them with the bootloader @@ -17,7 +17,7 @@ function(mbed_post_build_tfm_sign_image set(mbed_target_name ${mbed_target}) set(post_build_command COMMAND ${Python3_EXECUTABLE} - ${MBED_PATH}/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/scripts/generate_mbed_image.py + ${CMAKE_CURRENT_LIST_DIR}/scripts/generate_mbed_image.py --tfm-target ${tfm_target} --target-path ${target_path} --secure-bin ${secure_bin} diff --git a/targets/TARGET_ARM_SSG/TARGET_MUSCA_B1/CMakeLists.txt b/targets/TARGET_ARM_SSG/TARGET_MUSCA_B1/CMakeLists.txt index 6f4a128d87..a0e87f6a5c 100644 --- a/targets/TARGET_ARM_SSG/TARGET_MUSCA_B1/CMakeLists.txt +++ b/targets/TARGET_ARM_SSG/TARGET_MUSCA_B1/CMakeLists.txt @@ -1,7 +1,16 @@ # Copyright (c) 2020-2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -include(${mbed-os_SOURCE_DIR}/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/scripts/mbed_set_post_build_tfm.cmake) +if("TFM" IN_LIST MBED_TARGET_LABELS) + include(mbed_set_post_build_tfm) + + mbed_post_build_tfm_sign_image( + ARM_MUSCA_B1 + musca_b1 + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/tfm_s.bin + ) +endif() add_library(mbed-arm-musca-b1 INTERFACE) @@ -54,10 +63,3 @@ target_link_libraries(mbed-arm-musca-b1 ${CMAKE_CURRENT_SOURCE_DIR}/s_veneers.o mbed-arm-ssg ) - -mbed_post_build_tfm_sign_image( - ARM_MUSCA_B1 - musca_b1 - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/tfm_s.bin -) diff --git a/targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/CMakeLists.txt b/targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/CMakeLists.txt index afda6393d6..559ba43a7b 100644 --- a/targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/CMakeLists.txt +++ b/targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/CMakeLists.txt @@ -1,7 +1,16 @@ # Copyright (c) 2020-2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -include(${mbed-os_SOURCE_DIR}/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/scripts/mbed_set_post_build_tfm.cmake) +if("TFM" IN_LIST MBED_TARGET_LABELS) + include(mbed_set_post_build_tfm) + + mbed_post_build_tfm_sign_image( + ARM_MUSCA_S1 + musca_s1 + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/tfm_s.bin + ) +endif() add_library(mbed-arm-musca-s1 INTERFACE) @@ -60,10 +69,3 @@ target_link_libraries(mbed-arm-musca-s1 ${CMAKE_CURRENT_SOURCE_DIR}/s_veneers.o mbed-arm-ssg ) - -mbed_post_build_tfm_sign_image( - ARM_MUSCA_S1 - musca_s1 - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/tfm_s.bin -)