Skip to content

Commit 3c2670e

Browse files
committed
Import TF-M OS wrapper dependencies to Mbed OS
Previous, we patched TF-M to replace its OS wrapper with CMSIS RTOS to resolve manage management issue when integrated with Mbed OS. But as of TF-M v1.2, the OS wrapper has been reworked in the vanilla TF-M, and now it makes identical calls to its underlying CMSIS RTOS as our patches do. So, we remove our patches and use vanilla TF-M's OS wrapper instead to avoid extra maintenance overhead. This commit * updates `tfm_ns_import.yaml` to imports necessary OS wrapper dependencies into Mbed OS * Remove `tfm/app/os_wrapper_cmsis_rtos_v2.c` inside this repository, as the file is now imported to Mbed OS which requires it
1 parent 9d9d70e commit 3c2670e

File tree

2 files changed

+8
-212
lines changed

2 files changed

+8
-212
lines changed

tfm/app/os_wrapper_cmsis_rtos_v2.c

Lines changed: 0 additions & 212 deletions
This file was deleted.

tfm_ns_import.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,21 @@
9696
"src": "install/export/tfm/include",
9797
"dst": "platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/include"
9898
},
99+
{
100+
"src": "../interface/include/os_wrapper",
101+
"dst": "platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/include/os_wrapper"
102+
},
99103
{
100104
"src": "install/export/tfm/include/psa",
101105
"dst": "platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/include/psa"
102106
},
103107
{
104108
"src": "install/export/tfm/include/psa_manifest",
105109
"dst": "platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/include/psa_manifest"
110+
},
111+
{
112+
"src": "../../tf-m-tests/app/os_wrapper_cmsis_rtos_v2.c",
113+
"dst": "platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_TFM_LATEST/src/os_wrapper_cmsis_rtos_v2.c"
106114
}
107115
],
108116
"v8-m": [

0 commit comments

Comments
 (0)