Commit 320db7b
committed
modules: hal_nordic: fix errors with CMSIS_6
What is the change?
Switch to updated hal_nordic module which doesn't include header files
from CMSIS_6 module when compiling for BSIM/POSIX.
Why do we need this change?
BSIM ci reported compiler errors when CMSIS_6 module was used for
Cortex-M instead of the older cmsis module.
The error was because CMSIS_6 couldn't find "arm_acle.h" and that
__ARM_ARCH_PROFILE was not defined to an expected value however,
this error highlighted that hal_nordic was including cmsis header
files even CONFIG_ARCH was "posix" and not "arm".
Updating to CMSIS_6 is important for future maintenance and to add new
features so we can't include those header files in hal_nordic but,
hal_nordic still needs some cmsis alternative header file to compile.
Upon inspection it was found that there is a cmsis.h created as an
alternative when compiling for POSIX/BSIM in Zephyr so,
we use that file and fix the issue.
Signed-off-by: Sudan Landge <sudan.landge@arm.com>1 parent 9eb3ad3 commit 320db7b
2 files changed
Lines changed: 17 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
39 | 55 | | |
40 | 56 | | |
41 | 57 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
200 | 200 | | |
201 | 201 | | |
202 | 202 | | |
203 | | - | |
| 203 | + | |
204 | 204 | | |
205 | 205 | | |
206 | 206 | | |
| |||
0 commit comments