Commit 4cee0eec authored by Bradley Bolen's avatar Bradley Bolen Committed by Ioannis Glaropoulos
Browse files

arch: arm: Move header files to common location



These files will be used for Cortex-R support as well.

Signed-off-by: default avatarBradley Bolen <bbolen@lexmark.com>
parent e7882905
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@
/include/arch/arc/arch.h                  @andrewboie
/include/arch/arc/v2/irq.h                @andrewboie
/include/arch/arm/                        @MaureenHelm @galak @ioannisg
/include/arch/arm/cortex_m/irq.h          @andrewboie
/include/arch/arm/irq.h                   @andrewboie
/include/arch/nios2/                      @andrewboie
/include/arch/nios2/arch.h                @andrewboie
/include/arch/posix/                      @aescolar
+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ extern "C" {
#else

#include <arch/arm/cortex_m/cmsis.h>
#include <arch/arm/cortex_m/exc.h>
#include <arch/arm/exc.h>
#include <irq_offload.h>

#ifdef CONFIG_IRQ_OFFLOAD
+9 −8
Original line number Diff line number Diff line
@@ -22,17 +22,18 @@
/* ARM GPRs are often designated by two different names */
#define sys_define_gpr_with_alias(name1, name2) union { u32_t name1, name2; }

#ifdef CONFIG_CPU_CORTEX_M
#include <arch/arm/cortex_m/exc.h>
#include <arch/arm/cortex_m/irq.h>
#include <arch/arm/cortex_m/error.h>
#include <arch/arm/cortex_m/misc.h>
#include <arch/arm/cortex_m/memory_map.h>
#include <arch/arm/cortex_m/asm_inline.h>
#include <arch/arm/exc.h>
#include <arch/arm/irq.h>
#include <arch/arm/error.h>
#include <arch/arm/misc.h>
#include <arch/common/sys_io.h>
#include <arch/common/addr_types.h>
#include <arch/common/ffs.h>
#include <arch/arm/cortex_m/nmi.h>
#include <arch/arm/nmi.h>
#include <arch/arm/asm_inline.h>

#ifdef CONFIG_CPU_CORTEX_M
#include <arch/arm/cortex_m/memory_map.h>
#endif

#ifdef __cplusplus
+2 −2
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@
 */

#if defined(__GNUC__)
#include <arch/arm/cortex_m/asm_inline_gcc.h>
#include <arch/arm/asm_inline_gcc.h>
#else
#include <arch/arm/cortex_m/asm_inline_other.h>
#include <arch/arm/asm_inline_other.h>
#endif

#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_ASM_INLINE_H_ */
+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ extern "C" {

#else /* !_ASMLANGUAGE */
#include <zephyr/types.h>
#include <arch/arm/cortex_m/exc.h>
#include <arch/arm/exc.h>
#include <irq.h>

/**
Loading