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`
pull/14333/head
Vikas Katariya 2020-12-22 14:33:19 +00:00 committed by Lingkai Dong
parent 410a1bad6b
commit b0da9d0cdf
48 changed files with 7 additions and 6 deletions

3
.gitignore vendored
View File

@ -99,7 +99,8 @@ test_suite.json
DELIVERY/
# Directory used to clone and build TF-M
features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_IGNORE/
platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_V1_0/TARGET_IGNORE/
platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/TARGET_IGNORE/
# CMake
CMakeCache.txt

View File

@ -5,6 +5,6 @@ if("TFM_V1_0" IN_LIST MBED_TARGET_LABELS)
add_subdirectory(TARGET_TFM_V1_0)
endif()
if("TFM_V1_1" IN_LIST MBED_TARGET_LABELS)
add_subdirectory(TARGET_TFM_V1_1)
if("TFM_LATEST" IN_LIST MBED_TARGET_LABELS)
add_subdirectory(TARGET_TFM_LATEST)
endif()

View File

@ -144,7 +144,7 @@
],
"extra_labels": [
"TFM",
"TFM_V1_1",
"TFM_LATEST",
"TFM_V8M"
],
"device_has": [
@ -4732,7 +4732,7 @@
"function": "ArmMuscaB1Code.binary_hook"
},
"secure_image_filename": "tfm_s.bin",
"tfm_target_name": "MUSCA_B1",
"tfm_target_name": "musca_b1",
"tfm_bootloader_supported": true,
"tfm_default_toolchain": "ARMCLANG",
"tfm_supported_toolchains": [
@ -4789,7 +4789,7 @@
"function": "ArmMuscaS1Code.binary_hook"
},
"secure_image_filename": "tfm_s.bin",
"tfm_target_name": "MUSCA_S1",
"tfm_target_name": "musca_s1",
"tfm_bootloader_supported": true,
"tfm_default_toolchain": "ARMCLANG",
"tfm_supported_toolchains": [