Skip to content

Commit 14612e4

Browse files
committed
Switch to using TARGET_TFM_V1_2
* Rename the folder from `TARGET_TFM_V1_1` to `TARGET_TFM_V1_2` * 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 `TF_Mv1_2`
1 parent d6826f8 commit 14612e4

Some content is hidden

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

49 files changed

+5
-5
lines changed

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_V1_2" IN_LIST MBED_TARGET_LABELS)
9+
add_subdirectory(TARGET_TFM_V1_2)
1010
endif()

targets/targets.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
],
145145
"extra_labels": [
146146
"TFM",
147-
"TFM_V1_1",
147+
"TFM_V1_2",
148148
"TFM_V8M"
149149
],
150150
"device_has": [
@@ -4639,7 +4639,7 @@
46394639
"function": "ArmMuscaB1Code.binary_hook"
46404640
},
46414641
"secure_image_filename": "tfm_s.bin",
4642-
"tfm_target_name": "MUSCA_B1",
4642+
"tfm_target_name": "musca_b1",
46434643
"tfm_bootloader_supported": true,
46444644
"tfm_default_toolchain": "ARMCLANG",
46454645
"tfm_supported_toolchains": [
@@ -4696,7 +4696,7 @@
46964696
"function": "ArmMuscaS1Code.binary_hook"
46974697
},
46984698
"secure_image_filename": "tfm_s.bin",
4699-
"tfm_target_name": "MUSCA_S1",
4699+
"tfm_target_name": "musca_s1",
47004700
"tfm_bootloader_supported": true,
47014701
"tfm_default_toolchain": "ARMCLANG",
47024702
"tfm_supported_toolchains": [

0 commit comments

Comments
 (0)