Skip to content

Commit 9fc853b

Browse files
committed
Replace ARM_MUSCA_A1 example with ARM_MUSCA_S1
From TF-M v1.2, ARM_MUSCA_A1 has been deprecated from Mbed OS.
1 parent c6bae61 commit 9fc853b

File tree

1 file changed

+22
-16
lines changed

1 file changed

+22
-16
lines changed

docs/porting/security/psa_targets_in_mbed-os.md

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -193,26 +193,30 @@ An Mbed OS (NSPE) target that supports TF-M must contain the following attribute
193193

194194
**Note**: When `inherits` is used, some of attributes are set by the PSA generic target.
195195

196-
The following example shows a PSA-enabled Armv8-M PSA target, `ARM_MUSCA_A1`:
196+
The following example shows a PSA-enabled Armv8-M PSA target, `ARM_MUSCA_S1`:
197197

198198
```json
199-
"ARM_MUSCA_A1": {
199+
"ARM_MUSCA_S1": {
200200
"inherits": [
201201
"PSA_V8_M"
202202
],
203203
"default_toolchain": "ARMC6",
204-
"forced_reset_timeout": 7,
204+
"features_add": [
205+
"EXPERIMENTAL_API"
206+
],
207+
"forced_reset_timeout": 20,
205208
"release_versions": [
206209
"5"
207210
],
208211
"core": "Cortex-M33-NS",
209212
"supported_toolchains": [
210213
"ARMC6",
211-
"GCC_ARM",
212-
"IAR"
214+
"GCC_ARM"
213215
],
214216
"device_has_add": [
215217
"INTERRUPTIN",
218+
"I2C",
219+
"I2CSLAVE",
216220
"LPTICKER",
217221
"SERIAL",
218222
"SLEEP",
@@ -222,33 +226,35 @@ The following example shows a PSA-enabled Armv8-M PSA target, `ARM_MUSCA_A1`:
222226
"__STARTUP_CLEAR_BSS",
223227
"MBED_FAULT_HANDLER_DISABLED",
224228
"CMSIS_NVIC_VIRTUAL",
225-
"LPTICKER_DELAY_TICKS=1",
226-
"MBED_MPU_CUSTOM"
229+
"LPTICKER_DELAY_TICKS=3",
230+
"MBED_MPU_CUSTOM",
231+
"BL2",
232+
"MCUBOOT_IMAGE_NUMBER=2"
227233
],
228234
"extra_labels_add": [
229235
"ARM_SSG",
230-
"MUSCA_A1",
231-
"MUSCA_A1_NS"
236+
"MUSCA_S1"
232237
],
233238
"post_binary_hook": {
234-
"function": "ArmMuscaA1Code.binary_hook"
239+
"function": "ArmMuscaS1Code.binary_hook"
235240
},
236241
"secure_image_filename": "tfm_s.bin",
237-
"tfm_target_name": "MUSCA_A",
242+
"tfm_target_name": "musca_s1",
238243
"tfm_bootloader_supported": true,
239244
"tfm_default_toolchain": "ARMCLANG",
240245
"tfm_supported_toolchains": [
241246
"ARMCLANG",
242247
"GNUARM"
243248
],
244-
"tfm_delivery_dir": "TARGET_ARM_SSG/TARGET_MUSCA_A1"
249+
"tfm_delivery_dir": "TARGET_ARM_SSG/TARGET_MUSCA_S1",
250+
"detect_code": [
251+
"5009"
252+
]
245253
}
246254
```
247255

248-
Please note the config options `macros_add`, `extra_labels_add` and `device_has_remove`. To add or remove `macros`, `extra_labels` or target capabilities, a PSA target definition must use
249-
[macros/extra_labels/device_has]`_add` or [macros/extra_labels/device_has]`_remove` (not `macros`, `extra_labels` or `device_has`).
250-
251-
To add or remove a feature, use `feature_`[add/remove].
256+
Please note the config options `features_add`, `macros_add`, `extra_labels_add` and `device_has_add`. To add or remove `features`, `macros`, `extra_labels` or target capabilities, a PSA target definition must use
257+
[features/macros/extra_labels/device_has]`_add` or [features/macros/extra_labels/device_has]`_remove` (not `features`, `macros`, `extra_labels` or `device_has`).
252258

253259
By default, a TF-M build generates a `bin` file. If the target requires a `hex` file, you need to add the attribute `"TFM_OUTPUT_EXT": "hex"` to the target definition. The build script will convert `bin` to `hex`, then copy the `hex` to `tfm_delivery_dir`. You must also update `secure_image_filename` to match the new file extension.
254260

0 commit comments

Comments
 (0)