arch: arm: Fix header guards
Fix the header guards for the ARM header files to reflect the new code location. Signed-off-by: Carlo Caione <ccaione@baylibre.com>
This commit is contained in:
Carlo Caione
Anas Nashif
parent
aec9a8c4be
commit
13e671e381
23 changed files with 69 additions and 69 deletions
|
|
@ -13,8 +13,8 @@
|
|||
* (include/arm/cpu.h)
|
||||
*/
|
||||
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_ARCH_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_ARCH_H_
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ARCH_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ARCH_H_
|
||||
|
||||
/* Add include for DTS generated information */
|
||||
#include <generated_dts_board.h>
|
||||
|
|
@ -256,4 +256,4 @@ extern "C" {
|
|||
}
|
||||
#endif
|
||||
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_ARCH_H_ */
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ARCH_H_ */
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_H_
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ASM_INLINE_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ASM_INLINE_H_
|
||||
|
||||
/*
|
||||
* The file must not be included directly
|
||||
|
|
@ -20,4 +20,4 @@
|
|||
#include <arch/arm/asm_inline_other.h>
|
||||
#endif
|
||||
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_H_ */
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ASM_INLINE_H_ */
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@
|
|||
|
||||
/* Either public functions or macros or invoked by public functions */
|
||||
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_GCC_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_GCC_H_
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ASM_INLINE_GCC_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ASM_INLINE_GCC_H_
|
||||
|
||||
/*
|
||||
* The file must not be included directly
|
||||
|
|
@ -112,4 +112,4 @@ static ALWAYS_INLINE bool arch_irq_unlocked(unsigned int key)
|
|||
|
||||
#endif /* _ASMLANGUAGE */
|
||||
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_GCC_H_ */
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ASM_INLINE_GCC_H_ */
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@
|
|||
* This header contains the interface to the ARM CMSIS Core headers.
|
||||
*/
|
||||
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_CMSIS_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_CMSIS_H_
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_CMSIS_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_CMSIS_H_
|
||||
|
||||
#include <soc.h>
|
||||
|
||||
|
|
@ -114,4 +114,4 @@ typedef enum {
|
|||
#error "Unknown Cortex-M device"
|
||||
#endif
|
||||
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_CMSIS_H_ */
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_CMSIS_H_ */
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@
|
|||
* processors.
|
||||
*/
|
||||
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MEMORY_MAP_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MEMORY_MAP_H_
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MEMORY_MAP_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MEMORY_MAP_H_
|
||||
|
||||
#include <sys/util.h>
|
||||
|
||||
|
|
@ -107,4 +107,4 @@
|
|||
#define _VENDOR_BASE_ADDR 0xE0100000
|
||||
#define _VENDOR_END_ADDR 0xFFFFFFFF
|
||||
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MEMORY_MAP_H_ */
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MEMORY_MAP_H_ */
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_MPU_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_MPU_H_
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_ARM_MPU_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_ARM_MPU_H_
|
||||
|
||||
#if defined(CONFIG_CPU_CORTEX_M0PLUS) || \
|
||||
defined(CONFIG_CPU_CORTEX_M3) || \
|
||||
|
|
@ -57,4 +57,4 @@ extern const struct arm_mpu_config mpu_config;
|
|||
|
||||
#endif /* _ASMLANGUAGE */
|
||||
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_MPU_H_ */
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_ARM_MPU_H_ */
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_NXP_MPU_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_NXP_MPU_H_
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_NXP_MPU_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_NXP_MPU_H_
|
||||
|
||||
#ifndef _ASMLANGUAGE
|
||||
|
||||
|
|
@ -270,4 +270,4 @@ extern const struct nxp_mpu_config mpu_config;
|
|||
"start address of the partition must align with minimum MPU \
|
||||
region size.")
|
||||
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_NXP_MPU_H_ */
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_NXP_MPU_H_ */
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
* gcc builtins)
|
||||
*/
|
||||
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_R_SYS_IO_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_R_SYS_IO_H_
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_SYS_IO_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_SYS_IO_H_
|
||||
|
||||
#ifndef _ASMLANGUAGE
|
||||
|
||||
|
|
@ -159,4 +159,4 @@ static ALWAYS_INLINE
|
|||
|
||||
#endif /* _ASMLANGUAGE */
|
||||
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_R_SYS_IO_H_ */
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_SYS_IO_H_ */
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@
|
|||
* ARM-specific kernel error handling interface. Included by arm/arch.h.
|
||||
*/
|
||||
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_ERROR_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_ERROR_H_
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ERROR_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ERROR_H_
|
||||
|
||||
#include <arch/arm/aarch32/syscall.h>
|
||||
#include <arch/arm/aarch32/exc.h>
|
||||
|
|
@ -62,4 +62,4 @@ do { \
|
|||
}
|
||||
#endif
|
||||
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_ERROR_H_ */
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ERROR_H_ */
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@
|
|||
* ARM-specific kernel exception handling interface. Included by arm/arch.h.
|
||||
*/
|
||||
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_EXC_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_EXC_H_
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_EXC_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_EXC_H_
|
||||
|
||||
/* for assembler, only works with constants */
|
||||
#define Z_EXC_PRIO(pri) (((pri) << (8 - DT_NUM_IRQ_PRIO_BITS)) & 0xff)
|
||||
|
|
@ -72,4 +72,4 @@ extern void z_arm_exc_exit(void);
|
|||
|
||||
#endif /* _ASMLANGUAGE */
|
||||
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_EXC_H_ */
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_EXC_H_ */
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@
|
|||
* ARM-specific kernel interrupt handling interface. Included by arm/arch.h.
|
||||
*/
|
||||
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_IRQ_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_IRQ_H_
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_IRQ_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_IRQ_H_
|
||||
|
||||
#include <irq.h>
|
||||
#include <sw_isr_table.h>
|
||||
|
|
@ -153,4 +153,4 @@ extern void _isr_wrapper(void);
|
|||
}
|
||||
#endif
|
||||
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_IRQ_H_ */
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_IRQ_H_ */
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@
|
|||
* ARM-specific kernel miscellaneous interface. Included by arm/arch.h.
|
||||
*/
|
||||
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_MISC_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_MISC_H_
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_MISC_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_MISC_H_
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
@ -37,4 +37,4 @@ static ALWAYS_INLINE void arch_nop(void)
|
|||
}
|
||||
#endif
|
||||
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_MISC_H_ */
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_MISC_H_ */
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@
|
|||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_NMI_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_NMI_H_
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_NMI_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_NMI_H_
|
||||
|
||||
#ifndef _ASMLANGUAGE
|
||||
#ifdef CONFIG_RUNTIME_NMI
|
||||
|
|
@ -22,4 +22,4 @@ extern void z_arm_nmi_init(void);
|
|||
#endif
|
||||
#endif
|
||||
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_NMI_H_ */
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_NMI_H_ */
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@
|
|||
* (include/arch/syscall.h)
|
||||
*/
|
||||
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_SYSCALL_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_SYSCALL_H_
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_SYSCALL_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_SYSCALL_H_
|
||||
|
||||
#define _SVC_CALL_CONTEXT_SWITCH 0
|
||||
#define _SVC_CALL_IRQ_OFFLOAD 1
|
||||
|
|
@ -184,4 +184,4 @@ static inline bool arch_is_user_context(void)
|
|||
|
||||
#endif /* _ASMLANGUAGE */
|
||||
#endif /* CONFIG_USERSPACE */
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_SYSCALL_H_ */
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_SYSCALL_H_ */
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@
|
|||
* necessary to instantiate instances of struct k_thread.
|
||||
*/
|
||||
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_THREAD_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_THREAD_H_
|
||||
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_THREAD_H_
|
||||
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_THREAD_H_
|
||||
|
||||
#ifndef _ASMLANGUAGE
|
||||
#include <zephyr/types.h>
|
||||
|
|
@ -92,4 +92,4 @@ typedef struct _thread_arch _thread_arch_t;
|
|||
|
||||
#endif /* _ASMLANGUAGE */
|
||||
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_THREAD_H_ */
|
||||
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_THREAD_H_ */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue