arch: arm: Move Cortex-M specific CPU defines

These defines are specific to the Cortex-M.  Move them to their own
header file to prepare for Cortex-R support.

Signed-off-by: Bradley Bolen <[email protected]>

Author: Bradley Bolen

include/arch/arm/arch.h

@@ -32,6 +32,7 @@
 #include <arch/arm/asm_inline.h>
 
 #ifdef CONFIG_CPU_CORTEX_M
+#include <arch/arm/cortex_m/cpu.h>
 #include <arch/arm/cortex_m/memory_map.h>
 #endif
 

include/arch/arm/asm_inline_gcc.h

@@ -20,15 +20,8 @@ extern "C" {
  * Include arch/cpu.h instead
  */
 
-#ifdef _ASMLANGUAGE
+#ifndef _ASMLANGUAGE
 
-#define _SCS_BASE_ADDR _PPB_INT_SCS
-#define _SCS_ICSR (_SCS_BASE_ADDR + 0xd04)
-#define _SCS_ICSR_PENDSV (1 << 28)
-#define _SCS_ICSR_UNPENDSV (1 << 27)
-#define _SCS_ICSR_RETTOBASE (1 << 11)
-
-#else /* !_ASMLANGUAGE */
 #include <zephyr/types.h>
 #include <arch/arm/exc.h>
 #include <irq.h>

include/arch/arm/cortex_m/cpu.h

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2015, Wind River Systems, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef _CORTEX_M_CPU_H
+#define _CORTEX_M_CPU_H
+
+#ifdef _ASMLANGUAGE
+
+#define _SCS_BASE_ADDR _PPB_INT_SCS
+#define _SCS_ICSR (_SCS_BASE_ADDR + 0xd04)
+#define _SCS_ICSR_PENDSV (1 << 28)
+#define _SCS_ICSR_UNPENDSV (1 << 27)
+#define _SCS_ICSR_RETTOBASE (1 << 11)
+
+#endif
+
+#endif