Revert "arch: arm: cortex_m: Add API for scb save and restore" #93707
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
mathieuchopstm
added
the
Hotfix
zephyrbot
requested review from
bbolen,
carlocaione,
dcpleung,
galak,
ithinuel,
MaureenHelm,
microbuilder,
nashif,
stephanosio and
wearyzen
henrikbrixandersen
approved these changes
Jul 25, 2025
|
CC: @msmttchr |
This reverts commit a90a47b. This commit was written with CMSIS 5 in mind, where some Cortex-M cores have "SHP" in the SCB_Type, and some have "SHPR". This is not correct as Zephyr is *supposed* to be using CMSIS 6 for Cortex-M... but CI actually picks up CMSIS 5 instead (it includes both with CMSIS 5 taking priority). The end result is that Zephyr's CI builds this happily but it causes build failures on downstream users (e.g., example-application). Revert the commit now, as it is not used yet by anyone. The revised version using only "SHPR" shall be reintroduced once the CI issue has been fixed. Signed-off-by: Mathieu Choplain <[email protected]>
mathieuchopstm
force-pushed
the
revert_scb_bkp_restore
branch
from
cefe797 to
6ce952d
Compare
|
fabiobaltieri
approved these changes
Jul 25, 2025
4 tasks
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.
This reverts commit a90a47b.
This commit was written with CMSIS 5 in mind, where some Cortex-M cores have "SHP" in the SCB_Type, and some have "SHPR". This is not correct as Zephyr is supposed to be using CMSIS 6 for Cortex-M... but CI actually picks up CMSIS 5 instead (it includes both with CMSIS 5 taking priority).
The end result is that Zephyr's CI builds this happily but it causes build failures on downstream users (e.g., example-application).
Revert the commit now, as it is not used yet by anyone. The revised version using only "SHPR" shall be reintroduced once the CI issue has been fixed.
See also: #93161 / #93689 / #93699