TF-M: Switch to vanilla TF-M's OS wrapper #14396
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ciarmcom
added
the
release-type: patch
|
@LDong-Arm, thank you for your changes. |
LDong-Arm
changed the title
|
CI started |
LDong-Arm
changed the title
LDong-Arm
changed the title
This was referenced Mar 10, 2021
Jenkins CI Test : ❌ FAILEDBuild Number: 1 | 🔒 Jenkins CI Job | 🌐 Logs & ArtifactsCLICK for Detailed Summary
|
Jenkins CI Test : ❌ FAILEDBuild Number: 2 | 🔒 Jenkins CI Job | 🌐 Logs & ArtifactsCLICK for Detailed Summary
|
|
@LDong-Arm looks like we may have some genuine failures... |
|
See my comment in another PR: #14362 (comment) |
Jenkins CI Test : ✔️ SUCCESSBuild Number: 3 | 🔒 Jenkins CI Job | 🌐 Logs & ArtifactsCLICK for Detailed Summary
|
0xc0170
previously approved these changes
Mar 11, 2021
LDong-Arm
changed the title
needs: preceding PR set for now. Let us know once it's ready |
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 re-imports TF-M files associated with the OS wrapper.
The Arm Compiler is case sensitive and unable to distinguish between `Thread.h` from Mbed OS RTOS and `thread.h` from TF-M's OS wrapper, for example. This resolves compilation failures due to wrong includes. To resolve this, use the fully-qualified include paths for the RTOS API.
LDong-Arm
force-pushed
the
tfm_os_wrapper
branch
from
0ed289f to
6c405d2
Compare
mergify
bot
dismissed stale reviews from evedon and 0xc0170
Pull request has been modified.
LDong-Arm
force-pushed
the
tfm_os_wrapper
branch
from
b61abe8 to
a6081e5
Compare
LDong-Arm
changed the title
0xc0170
approved these changes
Mar 22, 2021
|
CI started |
evedon
approved these changes
Mar 22, 2021
Jenkins CI Test : ✔️ SUCCESSBuild Number: 4 | 🔒 Jenkins CI Job | 🌐 Logs & ArtifactsCLICK for Detailed Summary
|
mbedmain
removed
release-type: patch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary of changes
The following PRs are related, we should coordinate to get them in roughly at the same time:
ARMmbed/trusted-firmware-m#16
ARMmbed/tf-m-tests#3
ARMmbed/mbed-os-tf-m-regression-tests#93
#14396
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.
Note: The OS wrapper files were imported by ARMmbed/mbed-os-tf-m-regression-tests#93, using ARMmbed/trusted-firmware-m#16 and ARMmbed/tf-m-tests#3.
Impact of changes
This is a kind of refactoring - it has no impact on applications or other parts of Mbed OS.
Migration actions required
None.
Documentation
None.
Pull request type
Test results
Reviewers