Skip to content

Commit b0da9d0

Browse files
jainvikas8LDong-Arm
authored andcommitted
Switch to using TARGET_TFM_LATEST
Rather than maintaining a specific `TARGET_TFM_V1_x`, its better to use more generic name `TARGET_TFM_LATEST` to avoid confusion on the latest TFM version supported by Mbed OS * Rename the folder from `TARGET_TFM_V1_1` to `TARGET_TFM_LATEST` * Update the CmakeLists.txt * Change the name of the MUSCA targets to maintain uniformity with TF-M v1.2 * Update target.json for PSA_V8_M to use `TFM_LATEST`
1 parent 410a1ba commit b0da9d0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+7
-6
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ test_suite.json
9999
DELIVERY/
100100

101101
# Directory used to clone and build TF-M
102-
features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_IGNORE/
102+
platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_0/TARGET_IGNORE/
103+
platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/TARGET_IGNORE/
103104

104105
# CMake
105106
CMakeCache.txt

platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ if("TFM_V1_0" IN_LIST MBED_TARGET_LABELS)
55
add_subdirectory(TARGET_TFM_V1_0)
66
endif()
77

8-
if("TFM_V1_1" IN_LIST MBED_TARGET_LABELS)
9-
add_subdirectory(TARGET_TFM_V1_1)
8+
if("TFM_LATEST" IN_LIST MBED_TARGET_LABELS)
9+
add_subdirectory(TARGET_TFM_LATEST)
1010
endif()

0 commit comments

Comments
 (0)