-
Notifications
You must be signed in to change notification settings - Fork 7.7k
Open
Labels
area: ARMARM (32-bit) ArchitectureARM (32-bit) Architecture
Description
Describe the bug
Failure to build because CMSIS5 and CMSIS6 name these registers differently for CM0+. The PR below doesn't account for the CMSIS6 naming.
Regression
[x] This is a regression.
Steps to reproduce
Build an application for CM0+ using CMSIS_6
Relevant log output
/home/runner/work/x/x/zephyr/arch/arm/core/cortex_m/scb.c: In function 'z_arm_save_scb_context':
/home/runner/work/x/x/zephyr/arch/arm/core/cortex_m/scb.c:37:25: error: 'SCB_Type' has no member named 'SHP'; did you mean 'SHPR'?
37 | #define SHPR_FIELD_NAME SHP
| ^~~
/home/runner/work/x/x/zephyr/arch/arm/core/cortex_m/scb.c:194:62: note: in expansion of macro 'SHPR_FIELD_NAME'
194 | volatile uint32_t *shpr = (volatile uint32_t *) SCB->SHPR_FIELD_NAME;
| ^~~~~~~~~~~~~~~
Impact
Showstopper – Prevents release or major functionality; system unusable.
Environment
OS : Ubuntu 22.04
Toolchain : zephyr
Extra
@msmttchr
⚠️ CMSIS calls it SHPR on CM0+
Originally posted by @sgfeniex in a90a47b
Ref #93161
Metadata
Metadata
Assignees
Labels
area: ARMARM (32-bit) ArchitectureARM (32-bit) Architecture