commit 11ecbf639d826c084973beed709a63d51d9b684e
author Gerard Marull-Paretas <gerard.marull@nordicsemi.no> Fri Jun 30 09:58:41 2023 +0200
committer Dominik Ermel <56024351+de-nordic@users.noreply.github.com> Fri Aug 25 11:30:17 2023 +0200
tree 0a4b754c3e82101407b938fe46dc982b98f48982
parent da65db0076906d369bef7c9e6b46d5c3e4418e53

zephyr: use cmsis_core.h header

CMSIS glue code is now provided by the CMSIS Zephyr module in
<cmsis_core.h>. Header is generic for M/A/R.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>

boot/zephyr/arm_cleanup.c

diff --git a/boot/zephyr/arm_cleanup.c b/boot/zephyr/arm_cleanup.c
index d58956f..3b6c71a 100644
--- a/boot/zephyr/arm_cleanup.c
+++ b/boot/zephyr/arm_cleanup.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #include <zephyr/toolchain.h>
 
+#include <cmsis_core.h>
 #if CONFIG_CPU_HAS_NXP_MPU
 #include <fsl_sysmpu.h>
 #endif

boot/zephyr/main.c

diff --git a/boot/zephyr/main.c b/boot/zephyr/main.c
index d8d4cff..8551649 100644
--- a/boot/zephyr/main.c
+++ b/boot/zephyr/main.c
@@ -27,11 +27,7 @@
 #include <soc.h>
 #include <zephyr/linker/linker-defs.h>
 
-#if defined(CONFIG_CPU_AARCH32_CORTEX_A) || defined(CONFIG_CPU_AARCH32_CORTEX_R)
-#include <zephyr/arch/arm/aarch32/cortex_a_r/cmsis.h>
-#elif defined(CONFIG_CPU_CORTEX_M)
-#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
-#endif
+#include <cmsis_core.h>
 
 #include "target.h"