TF-M (2.2.0) upmerge 2025.08.15 #24031
Open
+48
−240
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
github-actions
bot
added
manifest
changelog-entry-required
|
The following west manifest projects have changed revision in this Pull Request:
Additional metadata changed:
⛔ DNM label due to: 3 projects with PR revision and 1 project with metadata changes Note: This message is automatically posted and updated by the Manifest GitHub Action. |
CI InformationTo view the history of this post, clich the 'edited' button above Inputs:Sources:trusted-firmware-m: PR head: 9f05c158e5d88d0e3057da22df93afee112bd547 more detailstrusted-firmware-m:
sdk-nrf:
zephyr:
Github labels
List of changed files detected by CI (2060)Outputs:ToolchainVersion: c0e69fc6ed Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped;
|
frkv
approved these changes
Aug 20, 2025
tomi-font
force-pushed
the
tf-m_upmerge_2025.08.15_2.2.0
branch
from
626b446 to
c28bd74
Compare
github-actions
bot
added
the
doc-required
tomi-font
force-pushed
the
tf-m_upmerge_2025.08.15_2.2.0
branch
2 times, most recently
from
844cc65 to
290c186
Compare
Vge0rge
force-pushed
the
tf-m_upmerge_2025.08.15_2.2.0
branch
3 times, most recently
from
f23ae07 to
a0e7545
Compare
nordicjm
approved these changes
Sep 3, 2025
Bring TF-M updated from 2.1.2 to 2.2.0, aligning with Zephyr. Signed-off-by: Tomi Fontanilles <[email protected]>
Bring updated tf-m-tests revision (v2.2.0) from Zephyr as well as Zephyr commits touching the TF-M integration in order to align NCS. Signed-off-by: Tomi Fontanilles <[email protected]>
Upmerge. Signed-off-by: Tomi Fontanilles <[email protected]>
The in-tree TF-M is now 2.2.0. It requires newer documentation to be available. Signed-off-by: Tomi Fontanilles <[email protected]>
Group most of the appending to TFM_CMAKE_OPTIONS in this CMakeLists.txt file into a single set_property() call. This allows to reduce the number of lines and to make it more obvious that all we are doing is passing configuration options to TF-M. Some occurrences are left untouched. They use more complex conditions than just a single variable boolean check, which would become unreadable with generator expressions. Signed-off-by: Tomi Fontanilles <[email protected]>
TF-M now propagates this CMake option as a compile definition. Pass to the build system the same value that we set in tfm_config.h, otherwise we end up with different redefinitions of PS_ROLLBACK_PROTECTION between the command line (CMake options) and the generated configuration header file. Signed-off-by: Tomi Fontanilles <[email protected]>
TF-M has added a context argument to tfm_plat_err_t. Adjust the definition of our HUK/IAK functions. Message of the upstream commit which made this change: "To allow generic loader functions which load multiple keys. For the time being no loader function actively uses the ctx parameter, but it will be used in RSE in a future patch set" Signed-off-by: Tomi Fontanilles <[email protected]>
The tf-m-tests repo now specifically checks that TFM_PROFILE is equal to profile_large. Because we are using our own profile, it gets considered as invalid configuration. Just fool the TF-M configuration system by passing it what it wants. Signed-off-by: Tomi Fontanilles <[email protected]>
Vge0rge
force-pushed
the
tf-m_upmerge_2025.08.15_2.2.0
branch
from
a0e7545 to
8522032
Compare
|
You can find the documentation preview for this PR here. |
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.
Align TF-M version with Zephyr (2.2.0) and additionally pull in commits related to TF-M from the Zephyr repo.
test_crypto: PR-846
test_tfm: PR-203