Skip to content

Commit 489c867

Browse files
committed
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.
1 parent 4e8325f commit 489c867

File tree

4 files changed

+24
-18
lines changed

4 files changed

+24
-18
lines changed

platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,5 @@ target_sources(mbed-psa
3939
src/tfm_platform_ipc_api.c
4040
src/tfm_ps_ipc_api.c
4141
)
42+
43+
set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/scripts")

platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/scripts/mbed_set_post_build_tfm.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
include(${MBED_PATH}/tools/cmake/mbed_set_post_build.cmake)
4+
include(mbed_set_post_build)
55

66
#
77
# 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
1717
set(mbed_target_name ${mbed_target})
1818
set(post_build_command
1919
COMMAND ${Python3_EXECUTABLE}
20-
${MBED_PATH}/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/scripts/generate_mbed_image.py
20+
${CMAKE_CURRENT_LIST_DIR}/scripts/generate_mbed_image.py
2121
--tfm-target ${tfm_target}
2222
--target-path ${target_path}
2323
--secure-bin ${secure_bin}

targets/TARGET_ARM_SSG/TARGET_MUSCA_B1/CMakeLists.txt

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
include(${mbed-os_SOURCE_DIR}/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/scripts/mbed_set_post_build_tfm.cmake)
4+
if("TFM" IN_LIST MBED_TARGET_LABELS)
5+
include(mbed_set_post_build_tfm)
6+
7+
mbed_post_build_tfm_sign_image(
8+
ARM_MUSCA_B1
9+
musca_b1
10+
${CMAKE_CURRENT_SOURCE_DIR}
11+
${CMAKE_CURRENT_SOURCE_DIR}/tfm_s.bin
12+
)
13+
endif()
514

615
add_library(mbed-arm-musca-b1 INTERFACE)
716

@@ -54,10 +63,3 @@ target_link_libraries(mbed-arm-musca-b1
5463
${CMAKE_CURRENT_SOURCE_DIR}/s_veneers.o
5564
mbed-arm-ssg
5665
)
57-
58-
mbed_post_build_tfm_sign_image(
59-
ARM_MUSCA_B1
60-
musca_b1
61-
${CMAKE_CURRENT_SOURCE_DIR}
62-
${CMAKE_CURRENT_SOURCE_DIR}/tfm_s.bin
63-
)

targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/CMakeLists.txt

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
include(${mbed-os_SOURCE_DIR}/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/scripts/mbed_set_post_build_tfm.cmake)
4+
if("TFM" IN_LIST MBED_TARGET_LABELS)
5+
include(mbed_set_post_build_tfm)
6+
7+
mbed_post_build_tfm_sign_image(
8+
ARM_MUSCA_S1
9+
musca_s1
10+
${CMAKE_CURRENT_SOURCE_DIR}
11+
${CMAKE_CURRENT_SOURCE_DIR}/tfm_s.bin
12+
)
13+
endif()
514

615
add_library(mbed-arm-musca-s1 INTERFACE)
716

@@ -60,10 +69,3 @@ target_link_libraries(mbed-arm-musca-s1
6069
${CMAKE_CURRENT_SOURCE_DIR}/s_veneers.o
6170
mbed-arm-ssg
6271
)
63-
64-
mbed_post_build_tfm_sign_image(
65-
ARM_MUSCA_S1
66-
musca_s1
67-
${CMAKE_CURRENT_SOURCE_DIR}
68-
${CMAKE_CURRENT_SOURCE_DIR}/tfm_s.bin
69-
)

0 commit comments

Comments
 (0)