mirror of https://github.com/ARMmbed/mbed-os.git
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
parent
410a1bad6b
commit
b0da9d0cdf
|
@ -99,7 +99,8 @@ test_suite.json
|
||||||
DELIVERY/
|
DELIVERY/
|
||||||
|
|
||||||
# Directory used to clone and build TF-M
|
# 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
|
# CMake
|
||||||
CMakeCache.txt
|
CMakeCache.txt
|
||||||
|
|
|
@ -5,6 +5,6 @@ if("TFM_V1_0" IN_LIST MBED_TARGET_LABELS)
|
||||||
add_subdirectory(TARGET_TFM_V1_0)
|
add_subdirectory(TARGET_TFM_V1_0)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if("TFM_V1_1" IN_LIST MBED_TARGET_LABELS)
|
if("TFM_LATEST" IN_LIST MBED_TARGET_LABELS)
|
||||||
add_subdirectory(TARGET_TFM_V1_1)
|
add_subdirectory(TARGET_TFM_LATEST)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -144,7 +144,7 @@
|
||||||
],
|
],
|
||||||
"extra_labels": [
|
"extra_labels": [
|
||||||
"TFM",
|
"TFM",
|
||||||
"TFM_V1_1",
|
"TFM_LATEST",
|
||||||
"TFM_V8M"
|
"TFM_V8M"
|
||||||
],
|
],
|
||||||
"device_has": [
|
"device_has": [
|
||||||
|
@ -4732,7 +4732,7 @@
|
||||||
"function": "ArmMuscaB1Code.binary_hook"
|
"function": "ArmMuscaB1Code.binary_hook"
|
||||||
},
|
},
|
||||||
"secure_image_filename": "tfm_s.bin",
|
"secure_image_filename": "tfm_s.bin",
|
||||||
"tfm_target_name": "MUSCA_B1",
|
"tfm_target_name": "musca_b1",
|
||||||
"tfm_bootloader_supported": true,
|
"tfm_bootloader_supported": true,
|
||||||
"tfm_default_toolchain": "ARMCLANG",
|
"tfm_default_toolchain": "ARMCLANG",
|
||||||
"tfm_supported_toolchains": [
|
"tfm_supported_toolchains": [
|
||||||
|
@ -4789,7 +4789,7 @@
|
||||||
"function": "ArmMuscaS1Code.binary_hook"
|
"function": "ArmMuscaS1Code.binary_hook"
|
||||||
},
|
},
|
||||||
"secure_image_filename": "tfm_s.bin",
|
"secure_image_filename": "tfm_s.bin",
|
||||||
"tfm_target_name": "MUSCA_S1",
|
"tfm_target_name": "musca_s1",
|
||||||
"tfm_bootloader_supported": true,
|
"tfm_bootloader_supported": true,
|
||||||
"tfm_default_toolchain": "ARMCLANG",
|
"tfm_default_toolchain": "ARMCLANG",
|
||||||
"tfm_supported_toolchains": [
|
"tfm_supported_toolchains": [
|
||||||
|
|
Loading…
Reference in New Issue