Skip to content
Permalink
Browse files

arch: arm: Move header files to common location

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

Signed-off-by: Bradley Bolen <bbolen@lexmark.com>
  • Loading branch information...
Bradley Bolen authored and ioannisg committed Jun 8, 2018
1 parent e788290 commit 4cee0eecdc411fecb42f4e759b9d78d7d3030d7f
@@ -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
@@ -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
@@ -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
@@ -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_ */
@@ -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>

/**
@@ -15,7 +15,7 @@
#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_ERROR_H_

#include <arch/arm/syscall.h>
#include <arch/arm/cortex_m/exc.h>
#include <arch/arm/exc.h>
#include <stdbool.h>

#ifdef __cplusplus
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 4cee0ee

Please sign in to comment.
You can’t perform that action at this time.