From 66fdc53419a157c8b3c6eed6a2e8b56b13bff28b Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
Date: Fri, 30 Jun 2023 09:58:41 +0200
Subject: [PATCH] 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 | 2 +-
 boot/zephyr/main.c        | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/boot/zephyr/arm_cleanup.c b/boot/zephyr/arm_cleanup.c
index d58956f86..3b6c71ace 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
diff --git a/boot/zephyr/main.c b/boot/zephyr/main.c
index d8d4cff28..855164915 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"