arch: arm: Move ARM code to AArch32 sub-directory
Before introducing the code for ARM64 (AArch64) we need to relocate the current ARM code to a new AArch32 sub-directory. For now we can assume that no code is shared between ARM and ARM64. There are no functional changes. The code is moved to the new location and the file paths are fixed to reflect this change. Signed-off-by: Carlo Caione <ccaione@baylibre.com>
This commit is contained in:
Carlo Caione
Anas Nashif
parent
8e5e812252
commit
aec9a8c4be
203 changed files with 199 additions and 196 deletions
|
|
@ -22,23 +22,23 @@
|
|||
/* ARM GPRs are often designated by two different names */
|
||||
#define sys_define_gpr_with_alias(name1, name2) union { u32_t name1, name2; }
|
||||
|
||||
#include <arch/arm/thread.h>
|
||||
#include <arch/arm/exc.h>
|
||||
#include <arch/arm/irq.h>
|
||||
#include <arch/arm/error.h>
|
||||
#include <arch/arm/misc.h>
|
||||
#include <arch/arm/aarch32/thread.h>
|
||||
#include <arch/arm/aarch32/exc.h>
|
||||
#include <arch/arm/aarch32/irq.h>
|
||||
#include <arch/arm/aarch32/error.h>
|
||||
#include <arch/arm/aarch32/misc.h>
|
||||
#include <arch/common/addr_types.h>
|
||||
#include <arch/common/ffs.h>
|
||||
#include <arch/arm/nmi.h>
|
||||
#include <arch/arm/asm_inline.h>
|
||||
#include <arch/arm/aarch32/nmi.h>
|
||||
#include <arch/arm/aarch32/asm_inline.h>
|
||||
|
||||
#ifdef CONFIG_CPU_CORTEX_M
|
||||
#include <arch/arm/cortex_m/cpu.h>
|
||||
#include <arch/arm/cortex_m/memory_map.h>
|
||||
#include <arch/arm/aarch32/cortex_m/cpu.h>
|
||||
#include <arch/arm/aarch32/cortex_m/memory_map.h>
|
||||
#include <arch/common/sys_io.h>
|
||||
#elif defined(CONFIG_CPU_CORTEX_R)
|
||||
#include <arch/arm/cortex_r/cpu.h>
|
||||
#include <arch/arm/cortex_r/sys_io.h>
|
||||
#include <arch/arm/aarch32/cortex_r/cpu.h>
|
||||
#include <arch/arm/aarch32/cortex_r/sys_io.h>
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
@ -245,10 +245,10 @@ extern "C" {
|
|||
/* Legacy case: retain containing extern "C" with C++ */
|
||||
#ifdef CONFIG_ARM_MPU
|
||||
#ifdef CONFIG_CPU_HAS_ARM_MPU
|
||||
#include <arch/arm/cortex_m/mpu/arm_mpu.h>
|
||||
#include <arch/arm/aarch32/cortex_m/mpu/arm_mpu.h>
|
||||
#endif /* CONFIG_CPU_HAS_ARM_MPU */
|
||||
#ifdef CONFIG_CPU_HAS_NXP_MPU
|
||||
#include <arch/arm/cortex_m/mpu/nxp_mpu.h>
|
||||
#include <arch/arm/aarch32/cortex_m/mpu/nxp_mpu.h>
|
||||
#endif /* CONFIG_CPU_HAS_NXP_MPU */
|
||||
#endif /* CONFIG_ARM_MPU */
|
||||
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
*/
|
||||
|
||||
#if defined(__GNUC__)
|
||||
#include <arch/arm/asm_inline_gcc.h>
|
||||
#include <arch/arm/aarch32/asm_inline_gcc.h>
|
||||
#else
|
||||
#include <arch/arm/asm_inline_other.h>
|
||||
#endif
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
#ifndef _ASMLANGUAGE
|
||||
|
||||
#include <zephyr/types.h>
|
||||
#include <arch/arm/exc.h>
|
||||
#include <arch/arm/aarch32/exc.h>
|
||||
#include <irq.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
@ -10,10 +10,10 @@
|
|||
defined(CONFIG_CPU_CORTEX_M3) || \
|
||||
defined(CONFIG_CPU_CORTEX_M4) || \
|
||||
defined(CONFIG_CPU_CORTEX_M7)
|
||||
#include <arch/arm/cortex_m/mpu/arm_mpu_v7m.h>
|
||||
#include <arch/arm/aarch32/cortex_m/mpu/arm_mpu_v7m.h>
|
||||
#elif defined(CONFIG_CPU_CORTEX_M23) || \
|
||||
defined(CONFIG_CPU_CORTEX_M33)
|
||||
#include <arch/arm/cortex_m/mpu/arm_mpu_v8m.h>
|
||||
#include <arch/arm/aarch32/cortex_m/mpu/arm_mpu_v8m.h>
|
||||
#else
|
||||
#error "Unsupported ARM CPU"
|
||||
#endif
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
#ifndef _ASMLANGUAGE
|
||||
|
||||
#include <arch/arm/cortex_m/cmsis.h>
|
||||
#include <arch/arm/aarch32/cortex_m/cmsis.h>
|
||||
|
||||
/* Convenience macros to represent the ARMv7-M-specific
|
||||
* configuration for memory access permission and
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
#ifndef _ASMLANGUAGE
|
||||
|
||||
#include <arch/arm/cortex_m/cmsis.h>
|
||||
#include <arch/arm/aarch32/cortex_m/cmsis.h>
|
||||
|
||||
/* Convenience macros to represent the ARMv8-M-specific
|
||||
* configuration for memory access permission and
|
||||
|
|
@ -14,8 +14,8 @@
|
|||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_ERROR_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_ERROR_H_
|
||||
|
||||
#include <arch/arm/syscall.h>
|
||||
#include <arch/arm/exc.h>
|
||||
#include <arch/arm/aarch32/syscall.h>
|
||||
#include <arch/arm/aarch32/exc.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
@ -100,7 +100,7 @@ extern void _arch_isr_direct_pm(void);
|
|||
#define ARCH_ISR_DIRECT_HEADER() arch_isr_direct_header()
|
||||
#define ARCH_ISR_DIRECT_FOOTER(swap) arch_isr_direct_footer(swap)
|
||||
|
||||
/* arch/arm/core/exc_exit.S */
|
||||
/* arch/arm/core/aarch32/exc_exit.S */
|
||||
extern void z_arm_int_exit(void);
|
||||
|
||||
#ifdef CONFIG_TRACING
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
#include <zephyr/types.h>
|
||||
#include <stdbool.h>
|
||||
#include <arch/arm/cortex_m/cmsis.h>
|
||||
#include <arch/arm/aarch32/cortex_m/cmsis.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
#if defined(CONFIG_X86)
|
||||
#include <arch/x86/arch.h>
|
||||
#elif defined(CONFIG_ARM)
|
||||
#include <arch/arm/arch.h>
|
||||
#include <arch/arm/aarch32/arch.h>
|
||||
#elif defined(CONFIG_ARC)
|
||||
#include <arch/arc/arch.h>
|
||||
#elif defined(CONFIG_NIOS2)
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
#if defined(CONFIG_X86) && !defined(CONFIG_X86_64)
|
||||
#include <arch/x86/ia32/syscall.h>
|
||||
#elif defined(CONFIG_ARM)
|
||||
#include <arch/arm/syscall.h>
|
||||
#include <arch/arm/aarch32/syscall.h>
|
||||
#elif defined(CONFIG_ARC)
|
||||
#include <arch/arc/syscall.h>
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue