-
Notifications
You must be signed in to change notification settings - Fork 695
TF-M (2.2.0) upmerge 2025.08.15 #3205
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
tomi-font
wants to merge
7
commits into
nrfconnect:main
Choose a base branch
from
tomi-font:tf-m_upmerge_2025.08.15_2.2.0
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
TF-M (2.2.0) upmerge 2025.08.15 #3205
tomi-font
wants to merge
7
commits into
nrfconnect:main
from
tomi-font:tf-m_upmerge_2025.08.15_2.2.0
+25
−5
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
The following west manifest projects have changed revision in this Pull Request:
⛔ DNM label due to: 2 projects with PR revision Note: This message is automatically posted and updated by the Manifest GitHub Action. |
5d68b87
to
d683764
Compare
frkv
approved these changes
Aug 20, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM pending testing
Update tests to use tfm-2.2.0. Signed-off-by: Flavio Ceolin <[email protected]> (cherry picked from commit 1ff7d1c)
TEST_PSA_API requires TFM_PROFILE to be set to "profile_large". Signed-off-by: Flavio Ceolin <[email protected]> (cherry picked from commit 8caef68)
…rkaround Add a workaround which sets the isolation level to 2 in CMake. The TF-M tests require the large TF-M profile because it supports the full list of crypto algorithms needed, not because of the solation level. For the TF-M tests the isolation level is irrelevant so we set it to 2 here so that we don't exclude the platforms which don't support the isolation level 3. I communicated with a TF-M maintainer and he informed me that this workaround will be included in the TF-M 2.2 release branch later so this is a short lived workaround that can be reverted when the relevant commit from the TF-M branch is cherry-picked. Signed-off-by: Georgios Vasilakis <[email protected]> (cherry picked from commit 0081207)
Starting in TF-M 2.2.0 there is a build option to treat warnings as errors. Lets use it. Signed-off-by: Flavio Ceolin <[email protected]> (cherry picked from commit ca7d99a)
z_arm_save_fp_context and z_arm_restore_fp_context save and restore fpu context regardless of the CONFIG_FPU_SHARING setting. This modification is required to support suspend to ram use cases where save and restore of FPU state is needed to ensure proper bahaviour after wakeup. Signed-off-by: Michele Sardo <[email protected]> (cherry picked from commit 5981dc8)
…mentation Following changes to arch/arm/core/cortex_m/fpu.c, the dependency on CONFIG_FPU_SHARING is moved into this file. Signed-off-by: Michele Sardo <[email protected]> (cherry picked from commit 7bc1756)
Fixup to the TF-M 2.2.0 update. Signed-off-by: Tomi Fontanilles <[email protected]> Upstream PR #: 94729
d683764
to
a292128
Compare
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.
Bring updated
tf-m-tests
repo plus commits touching TF-M integration/samples.