diff options
Diffstat (limited to 'include/common')
| -rw-r--r-- | include/common/bl_common.h | 8 | ||||
| -rw-r--r-- | include/common/debug.h | 4 | ||||
| -rw-r--r-- | include/common/ep_info.h | 8 | ||||
| -rw-r--r-- | include/common/interrupt_props.h | 4 | ||||
| -rw-r--r-- | include/common/param_header.h | 4 | ||||
| -rw-r--r-- | include/common/runtime_svc.h | 4 |
6 files changed, 16 insertions, 16 deletions
diff --git a/include/common/bl_common.h b/include/common/bl_common.h index eb96df0b1..896a03f0a 100644 --- a/include/common/bl_common.h +++ b/include/common/bl_common.h @@ -11,11 +11,11 @@ #include <common/param_header.h> #include <lib/utils_def.h> -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <stddef.h> #include <stdint.h> #include <lib/cassert.h> -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #include <export/common/bl_common_exp.h> @@ -91,7 +91,7 @@ #define __TEXT_END__ Load$$__TEXT_EPILOGUE__$$Base #endif /* USE_ARM_LINK */ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* * Declarations of linker defined symbols to help determine memory layout of @@ -178,6 +178,6 @@ void setup_page_tables(const struct mmap_region *bl_regions, void bl_handle_pauth(void); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* BL_COMMON_H */ diff --git a/include/common/debug.h b/include/common/debug.h index f8faf6835..245e69865 100644 --- a/include/common/debug.h +++ b/include/common/debug.h @@ -27,7 +27,7 @@ #define LOG_LEVEL_INFO U(40) #define LOG_LEVEL_VERBOSE U(50) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <cdefs.h> #include <stdarg.h> @@ -110,5 +110,5 @@ void __dead2 __stack_chk_fail(void); void tf_log(const char *fmt, ...) __printflike(1, 2); void tf_log_set_max_level(unsigned int log_level); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* DEBUG_H */ diff --git a/include/common/ep_info.h b/include/common/ep_info.h index 6cb903ef6..29981509b 100644 --- a/include/common/ep_info.h +++ b/include/common/ep_info.h @@ -9,10 +9,10 @@ #include <common/param_header.h> -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <stdint.h> #include <lib/cassert.h> -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #include <export/common/ep_info_exp.h> @@ -30,7 +30,7 @@ #define SET_SECURITY_STATE(x, security) \ ((x) = ((x) & ~EP_SECURITY_MASK) | (security)) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* * Compile time assertions related to the 'entry_point_info' structure to @@ -56,6 +56,6 @@ CASSERT(sizeof(uintptr_t) == __builtin_offsetof(entry_point_info_t, pc), \ assert_entrypoint_and_spsr_should_be_adjacent); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* EP_INFO_H */ diff --git a/include/common/interrupt_props.h b/include/common/interrupt_props.h index 6c6a85361..07bafaae5 100644 --- a/include/common/interrupt_props.h +++ b/include/common/interrupt_props.h @@ -7,7 +7,7 @@ #ifndef INTERRUPT_PROPS_H #define INTERRUPT_PROPS_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* Create an interrupt property descriptor from various interrupt properties */ #define INTR_PROP_DESC(num, pri, grp, cfg) \ @@ -25,5 +25,5 @@ typedef struct interrupt_prop { unsigned int intr_cfg:2; } interrupt_prop_t; -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* INTERRUPT_PROPS_H */ diff --git a/include/common/param_header.h b/include/common/param_header.h index b8852869a..4dab4e3c4 100644 --- a/include/common/param_header.h +++ b/include/common/param_header.h @@ -9,9 +9,9 @@ #include <stdbool.h> -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <stdint.h> -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #include <export/common/param_header_exp.h> diff --git a/include/common/runtime_svc.h b/include/common/runtime_svc.h index e5e36c71e..3b0a22484 100644 --- a/include/common/runtime_svc.h +++ b/include/common/runtime_svc.h @@ -39,7 +39,7 @@ */ #define MAX_RT_SVCS U(128) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* Prototype for runtime service initializing function */ typedef int32_t (*rt_svc_init_t)(void); @@ -134,5 +134,5 @@ void init_crash_reporting(void); extern uint8_t rt_svc_descs_indices[MAX_RT_SVCS]; -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* RUNTIME_SVC_H */ |