[nrf fromtree] modules: CMSIS_6: fix path and use it for TF-M and Cortex-M #2914
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:
Additional metadata changed:
⛔ DNM label due to: 1 project with metadata changes Note: This message is automatically posted and updated by the Manifest GitHub Action. |
What is the change? Fix the path for module CMSIS_6 and use CMSIS_6 module for TF-M. Why do we need this change? After Zephyr updated TF-M to v2.1.0, bb037d4469842c96f5872b271490aceb0734d965 added a local copy of CMSIS_6 to stop Zephyr's TF-M from downloading the CMSIS_6 from upstream. The correct way would be to have CMSIS_6 as a module in Zephyr (which we have now) and pass the path of this module to TF-M. A fork of the upstream CMSIS_6 was added to Zephyr however, the path in west.yml makes it a lib and not a module. Fixing the path generates the ZEPHYR_CMSIS_6_MODULE_DIR symbol which can now be used to pass to TF-M and the copy in TF-M would no longer be required. Signed-off-by: Sudan Landge <sudan.landge@arm.com> (cherry picked from commit c4235fa48908737f0055c8ab883b28d0599f5b89)
What is the change? Switch to module CMSIS_6 for Cortex-M while continuing to use cmsis module (version 5.9.0) for Cortex-A/R. Why do we need this change? The current cmsis module consists of: - Cortex-M support from upstream cmsis 5.9.0 - Cortex-A/R support which was not upstreamed to CMSIS Upstream cmsis 5.9 was deprecated so we should be using CMSIS_6 however, it seems due to lack of Cortex-A/R support in upstream and other reasons, this was pushed back. While upstreaming Cortex-A/R support to CMSIS_6 could take its time, this shouldn't stop Cortex-M to start using CMSIS_6. Also, if we do not use CMSIS_6 for Cortex-M then using the newer GCC 14.2 toolchain will return below compiler error: ``` zephyrproject/modules/hal/cmsis/CMSIS/Core/Include/core_cm85.h:4406:10: fatal error: pac_armv81.h: No such file or directory 4406 | #include "pac_armv81.h" ``` Using CMSIS_6 for Cortex-M will fix this. Signed-off-by: Sudan Landge <sudan.landge@arm.com> (cherry picked from commit f726cb5123eda12feb8746e3acb34a1f7d7b0340)
tomi-font
force-pushed
the
tf-m_upmerge_2025.05.27
branch
from
3722f44 to
78f9681
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.
Cherry pick for downstream TF-M upmerge.