From d5dfdeb65ff5b7f24dded201d2945c7b74565ce8 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Tue, 9 Jul 2019 13:49:11 -0700 Subject: Replace __ASSEMBLY__ with compiler-builtin __ASSEMBLER__ NOTE: __ASSEMBLY__ macro is now deprecated in favor of __ASSEMBLER__. All common C compilers predefine a macro called __ASSEMBLER__ when preprocessing a .S file. There is no reason for TF-A to define it's own __ASSEMBLY__ macro for this purpose instead. To unify code with the export headers (which use __ASSEMBLER__ to avoid one extra dependency), let's deprecate __ASSEMBLY__ and switch the code base over to the predefined standard. Change-Id: Id7d0ec8cf330195da80499c68562b65cb5ab7417 Signed-off-by: Julius Werner --- include/arch/aarch32/smccc_helpers.h | 4 ++-- include/arch/aarch64/smccc_helpers.h | 4 ++-- include/bl1/bl1.h | 4 ++-- include/bl31/ehf.h | 4 ++-- include/bl31/interrupt_mgmt.h | 4 ++-- include/bl32/tsp/tsp.h | 4 ++-- include/common/bl_common.h | 8 ++++---- include/common/debug.h | 4 ++-- include/common/ep_info.h | 8 ++++---- include/common/interrupt_props.h | 4 ++-- include/common/param_header.h | 4 ++-- include/common/runtime_svc.h | 4 ++-- include/drivers/arm/cci.h | 4 ++-- include/drivers/arm/ccn.h | 4 ++-- include/drivers/arm/css/sds.h | 4 ++-- include/drivers/arm/fvp/fvp_pwrc.h | 4 ++-- include/drivers/arm/gicv2.h | 4 ++-- include/drivers/arm/gicv3.h | 4 ++-- include/drivers/arm/pl011.h | 4 ++-- include/drivers/arm/sp805.h | 4 ++-- include/drivers/arm/tzc400.h | 4 ++-- include/drivers/arm/tzc_dmc500.h | 4 ++-- include/drivers/auth/mbedtls/mbedtls_config.h | 2 +- include/drivers/cadence/cdns_uart.h | 4 ++-- include/drivers/console.h | 4 ++-- include/drivers/marvell/cache_llc.h | 2 +- include/drivers/marvell/ccu.h | 4 ++-- include/drivers/marvell/uart/a3700_console.h | 4 ++-- include/drivers/meson/meson_console.h | 4 ++-- include/drivers/renesas/rcar/console/console.h | 4 ++-- include/drivers/st/stm32_console.h | 4 ++-- include/drivers/st/stm32_gpio.h | 4 ++-- include/drivers/ti/uart/uart_16550.h | 4 ++-- include/lib/bakery_lock.h | 4 ++-- include/lib/cpus/aarch32/cortex_a9.h | 2 +- include/lib/cpus/aarch64/cortex_a75.h | 4 ++-- include/lib/cpus/aarch64/cpuamu.h | 4 ++-- include/lib/cpus/aarch64/denver.h | 4 ++-- include/lib/cpus/errata_report.h | 4 ++-- include/lib/el3_runtime/aarch32/context.h | 4 ++-- include/lib/el3_runtime/aarch64/context.h | 4 ++-- include/lib/el3_runtime/cpu_data.h | 4 ++-- include/lib/extensions/ras.h | 4 ++-- include/lib/extensions/ras_arch.h | 4 ++-- include/lib/libc/aarch64/setjmp_.h | 4 ++-- include/lib/libc/setjmp.h | 4 ++-- include/lib/libfdt/fdt.h | 4 ++-- include/lib/psci/psci.h | 4 ++-- include/lib/psci/psci_lib.h | 4 ++-- include/lib/runtime_instr.h | 4 ++-- include/lib/smccc.h | 4 ++-- include/lib/spinlock.h | 2 +- include/lib/utils.h | 4 ++-- include/lib/utils_def.h | 2 +- include/lib/xlat_tables/xlat_mmu_helpers.h | 4 ++-- include/lib/xlat_tables/xlat_tables.h | 4 ++-- include/lib/xlat_tables/xlat_tables_v2.h | 4 ++-- include/lib/xlat_tables/xlat_tables_v2_helpers.h | 4 ++-- include/plat/arm/board/common/board_css_def.h | 4 ++-- include/plat/arm/css/common/css_def.h | 4 ++-- include/services/spm_svc.h | 4 ++-- 61 files changed, 121 insertions(+), 121 deletions(-) (limited to 'include') diff --git a/include/arch/aarch32/smccc_helpers.h b/include/arch/aarch32/smccc_helpers.h index d3e5e59c5..b2ee3cfe0 100644 --- a/include/arch/aarch32/smccc_helpers.h +++ b/include/arch/aarch32/smccc_helpers.h @@ -24,7 +24,7 @@ #define SMC_CTX_PMCR U(0x88) #define SMC_CTX_SIZE U(0x90) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -156,6 +156,6 @@ void smc_set_next_ctx(unsigned int security_state); /* Get the pointer to next `smc_ctx_t` already set by `smc_set_next_ctx()`. */ void *smc_get_next_ctx(void); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* SMCCC_HELPERS_H */ diff --git a/include/arch/aarch64/smccc_helpers.h b/include/arch/aarch64/smccc_helpers.h index e28697d7e..fac6fd9cf 100644 --- a/include/arch/aarch64/smccc_helpers.h +++ b/include/arch/aarch64/smccc_helpers.h @@ -9,7 +9,7 @@ #include -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -82,6 +82,6 @@ _x4 = read_ctx_reg(regs, CTX_GPREG_X4); \ } while (false) -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* SMCCC_HELPERS_H */ diff --git a/include/bl1/bl1.h b/include/bl1/bl1.h index 937b8c7e8..d81f43404 100644 --- a/include/bl1/bl1.h +++ b/include/bl1/bl1.h @@ -61,7 +61,7 @@ #define is_fwu_fid(_fid) \ ((_fid >= FWU_SMC_FID_START) && (_fid <= FWU_SMC_FID_END)) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -98,5 +98,5 @@ CASSERT(FWU_NUM_SMC_CALLS == \ void bl1_calc_bl2_mem_layout(const meminfo_t *bl1_mem_layout, meminfo_t *bl2_mem_layout); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* BL1_H */ diff --git a/include/bl31/ehf.h b/include/bl31/ehf.h index ee00d0936..c13d28c35 100644 --- a/include/bl31/ehf.h +++ b/include/bl31/ehf.h @@ -7,7 +7,7 @@ #ifndef EHF_H #define EHF_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include @@ -87,6 +87,6 @@ void ehf_register_priority_handler(unsigned int pri, ehf_handler_t handler); void ehf_allow_ns_preemption(uint64_t preempt_ret_code); unsigned int ehf_is_ns_preemption_allowed(void); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* EHF_H */ diff --git a/include/bl31/interrupt_mgmt.h b/include/bl31/interrupt_mgmt.h index b1683cc11..8bb1bab24 100644 --- a/include/bl31/interrupt_mgmt.h +++ b/include/bl31/interrupt_mgmt.h @@ -79,7 +79,7 @@ #define get_interrupt_src_ss(flag) (((flag) >> INTR_SRC_SS_FLAG_SHIFT) & \ INTR_SRC_SS_FLAG_MASK) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include @@ -143,5 +143,5 @@ interrupt_type_handler_t get_interrupt_type_handler(uint32_t type); int disable_intr_rm_local(uint32_t type, uint32_t security_state); int enable_intr_rm_local(uint32_t type, uint32_t security_state); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* INTERRUPT_MGMT_H */ diff --git a/include/bl32/tsp/tsp.h b/include/bl32/tsp/tsp.h index 18d3079e2..637e14abf 100644 --- a/include/bl32/tsp/tsp.h +++ b/include/bl32/tsp/tsp.h @@ -84,7 +84,7 @@ #define TOS_CALL_VERSION 0xbf00ff03 /* Trusted OS Call Version */ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -106,6 +106,6 @@ typedef struct tsp_vectors { void tsp_setup(void); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* TSP_H */ 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 #include -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include #include -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #include @@ -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 #include @@ -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 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #include @@ -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 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #include 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 */ diff --git a/include/drivers/arm/cci.h b/include/drivers/arm/cci.h index c5ddcfd44..5aea95a0c 100644 --- a/include/drivers/arm/cci.h +++ b/include/drivers/arm/cci.h @@ -100,7 +100,7 @@ #define SLAVE_IF_UNUSED -1 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -121,5 +121,5 @@ void cci_init(uintptr_t base, const int *map, unsigned int num_cci_masters); void cci_enable_snoop_dvm_reqs(unsigned int master_id); void cci_disable_snoop_dvm_reqs(unsigned int master_id); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* CCI_H */ diff --git a/include/drivers/arm/ccn.h b/include/drivers/arm/ccn.h index 9c3abac6b..7f737681e 100644 --- a/include/drivers/arm/ccn.h +++ b/include/drivers/arm/ccn.h @@ -46,7 +46,7 @@ */ #define CCN_GET_RUN_STATE(pstate) (pstate & 0xf) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include /* @@ -109,5 +109,5 @@ unsigned long long ccn_read_node_reg(node_types_t node_type, unsigned int node_id, unsigned int reg_offset); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* CCN_H */ diff --git a/include/drivers/arm/css/sds.h b/include/drivers/arm/css/sds.h index 114ae9258..db4cbaaf5 100644 --- a/include/drivers/arm/css/sds.h +++ b/include/drivers/arm/css/sds.h @@ -70,7 +70,7 @@ #define SDS_ERR_STRUCT_NOT_FOUND -3 #define SDS_ERR_STRUCT_NOT_FINALIZED -4 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include @@ -85,6 +85,6 @@ int sds_struct_read(uint32_t structure_id, unsigned int fld_off, void *data, size_t size, sds_access_mode_t mode); int sds_struct_write(uint32_t structure_id, unsigned int fld_off, void *data, size_t size, sds_access_mode_t mode); -#endif /*__ASSEMBLY__ */ +#endif /*__ASSEMBLER__ */ #endif /* SDS_H */ diff --git a/include/drivers/arm/fvp/fvp_pwrc.h b/include/drivers/arm/fvp/fvp_pwrc.h index ca173f36f..39e251620 100644 --- a/include/drivers/arm/fvp/fvp_pwrc.h +++ b/include/drivers/arm/fvp/fvp_pwrc.h @@ -35,7 +35,7 @@ #define PSYSR_INVALID U(0xffffffff) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -50,6 +50,6 @@ void fvp_pwrc_clr_wen(u_register_t mpidr); unsigned int fvp_pwrc_read_psysr(u_register_t mpidr); unsigned int fvp_pwrc_get_cpu_wkr(u_register_t mpidr); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* FVP_PWRC_H */ diff --git a/include/drivers/arm/gicv2.h b/include/drivers/arm/gicv2.h index 6bc5101d1..ebcb216d6 100644 --- a/include/drivers/arm/gicv2.h +++ b/include/drivers/arm/gicv2.h @@ -116,7 +116,7 @@ /* Interrupt ID mask for HPPIR, AHPPIR, IAR and AIAR CPU Interface registers */ #define INT_ID_MASK U(0x3ff) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include @@ -184,5 +184,5 @@ void gicv2_clear_interrupt_pending(unsigned int id); unsigned int gicv2_set_pmr(unsigned int mask); void gicv2_interrupt_set_cfg(unsigned int id, unsigned int cfg); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* GICV2_H */ diff --git a/include/drivers/arm/gicv3.h b/include/drivers/arm/gicv3.h index 72221acb0..9c72d4dff 100644 --- a/include/drivers/arm/gicv3.h +++ b/include/drivers/arm/gicv3.h @@ -208,7 +208,7 @@ #define GITS_CTLR_QUIESCENT_SHIFT 31 #define GITS_CTLR_QUIESCENT_BIT BIT_32(GITS_CTLR_QUIESCENT_SHIFT) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include @@ -406,5 +406,5 @@ void gicv3_set_interrupt_pending(unsigned int id, unsigned int proc_num); void gicv3_clear_interrupt_pending(unsigned int id, unsigned int proc_num); unsigned int gicv3_set_pmr(unsigned int mask); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* GICV3_H */ diff --git a/include/drivers/arm/pl011.h b/include/drivers/arm/pl011.h index f201f0048..8733d1964 100644 --- a/include/drivers/arm/pl011.h +++ b/include/drivers/arm/pl011.h @@ -83,7 +83,7 @@ #define CONSOLE_T_PL011_BASE CONSOLE_T_DRVDATA -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -101,6 +101,6 @@ typedef struct { int console_pl011_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, console_pl011_t *console); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* PL011_H */ diff --git a/include/drivers/arm/sp805.h b/include/drivers/arm/sp805.h index 551bfe4ba..b00ede1d6 100644 --- a/include/drivers/arm/sp805.h +++ b/include/drivers/arm/sp805.h @@ -21,7 +21,7 @@ #define SP805_CTR_RESEN (U(1) << 1) #define SP805_CTR_INTEN (U(1) << 0) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -31,6 +31,6 @@ void sp805_start(uintptr_t base, unsigned int ticks); void sp805_stop(uintptr_t base); void sp805_refresh(uintptr_t base, unsigned int ticks); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* SP805_H */ diff --git a/include/drivers/arm/tzc400.h b/include/drivers/arm/tzc400.h index 98ef0ec1e..32aeb0350 100644 --- a/include/drivers/arm/tzc400.h +++ b/include/drivers/arm/tzc400.h @@ -93,7 +93,7 @@ #define TZC_400_REGION_SIZE U(0x20) #define TZC_400_ACTION_OFF U(0x4) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include @@ -154,6 +154,6 @@ static inline void tzc_disable_filters(void) tzc400_disable_filters(); } -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* TZC400_H */ diff --git a/include/drivers/arm/tzc_dmc500.h b/include/drivers/arm/tzc_dmc500.h index 24bfaeb14..cce074cb9 100644 --- a/include/drivers/arm/tzc_dmc500.h +++ b/include/drivers/arm/tzc_dmc500.h @@ -121,7 +121,7 @@ /* Length of registers for configuring each region */ #define TZC_DMC500_REGION_SIZE U(0x018) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -147,5 +147,5 @@ void tzc_dmc500_config_complete(void); int tzc_dmc500_verify_complete(void); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* TZC_DMC500_H */ diff --git a/include/drivers/auth/mbedtls/mbedtls_config.h b/include/drivers/auth/mbedtls/mbedtls_config.h index d143d7351..acfde268a 100644 --- a/include/drivers/auth/mbedtls/mbedtls_config.h +++ b/include/drivers/auth/mbedtls/mbedtls_config.h @@ -86,7 +86,7 @@ /* Memory buffer allocator options */ #define MBEDTLS_MEMORY_ALIGN_MULTIPLE 8 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* System headers required to build mbed TLS with the current configuration */ #include #include "mbedtls/check_config.h" diff --git a/include/drivers/cadence/cdns_uart.h b/include/drivers/cadence/cdns_uart.h index 0a1cf7781..64a062ca1 100644 --- a/include/drivers/cadence/cdns_uart.h +++ b/include/drivers/cadence/cdns_uart.h @@ -27,7 +27,7 @@ #define CONSOLE_T_CDNS_BASE CONSOLE_T_DRVDATA -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -45,6 +45,6 @@ typedef struct { int console_cdns_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, console_cdns_t *console); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* CDNS_UART_H */ diff --git a/include/drivers/console.h b/include/drivers/console.h index f31de9549..cada771b4 100644 --- a/include/drivers/console.h +++ b/include/drivers/console.h @@ -28,7 +28,7 @@ /* Returned by console_xxx() if no registered console implements xxx. */ #define ERROR_NO_VALID_CONSOLE (-128) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -75,6 +75,6 @@ int console_getc(void); /* Flush all consoles registered for the current state. */ int console_flush(void); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* CONSOLE_H */ diff --git a/include/drivers/marvell/cache_llc.h b/include/drivers/marvell/cache_llc.h index 1aa4c889e..85babb8d4 100644 --- a/include/drivers/marvell/cache_llc.h +++ b/include/drivers/marvell/cache_llc.h @@ -27,7 +27,7 @@ #define LLC_EXCLUSIVE_EN 0x100 #define LLC_WAY_MASK 0xFFFFFFFF -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ void llc_cache_sync(int ap_index); void llc_flush_all(int ap_index); void llc_clean_all(int ap_index); diff --git a/include/drivers/marvell/ccu.h b/include/drivers/marvell/ccu.h index 546d9f13b..b0d1ec984 100644 --- a/include/drivers/marvell/ccu.h +++ b/include/drivers/marvell/ccu.h @@ -10,7 +10,7 @@ #ifndef CCU_H #define CCU_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #endif @@ -36,7 +36,7 @@ #define CCU_SRAM_WIN_CR CCU_WIN_CR_OFFSET(MVEBU_AP0, 1) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ int init_ccu(int); void ccu_win_check(struct addr_map_win *win); void ccu_enable_win(int ap_index, struct addr_map_win *win, uint32_t win_id); diff --git a/include/drivers/marvell/uart/a3700_console.h b/include/drivers/marvell/uart/a3700_console.h index 5511d96c4..517f01a8f 100644 --- a/include/drivers/marvell/uart/a3700_console.h +++ b/include/drivers/marvell/uart/a3700_console.h @@ -56,7 +56,7 @@ #define CONSOLE_T_A3700_BASE CONSOLE_T_DRVDATA -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -74,6 +74,6 @@ typedef struct { int console_a3700_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, console_a3700_t *console); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* A3700_CONSOLE_H */ diff --git a/include/drivers/meson/meson_console.h b/include/drivers/meson/meson_console.h index 5da1e3fd4..70e3b0bd4 100644 --- a/include/drivers/meson/meson_console.h +++ b/include/drivers/meson/meson_console.h @@ -11,7 +11,7 @@ #define CONSOLE_T_MESON_BASE CONSOLE_T_DRVDATA -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -32,6 +32,6 @@ typedef struct { int console_meson_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, console_meson_t *console); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* MESON_CONSOLE_H */ diff --git a/include/drivers/renesas/rcar/console/console.h b/include/drivers/renesas/rcar/console/console.h index 5bc10b7b1..0e4ed8f35 100644 --- a/include/drivers/renesas/rcar/console/console.h +++ b/include/drivers/renesas/rcar/console/console.h @@ -9,7 +9,7 @@ #define CONSOLE_T_RCAR_BASE CONSOLE_T_DRVDATA -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -27,6 +27,6 @@ typedef struct { int console_rcar_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, console_rcar_t *console); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* RCAR_PRINTF_H */ diff --git a/include/drivers/st/stm32_console.h b/include/drivers/st/stm32_console.h index b30376828..a2ad87cb5 100644 --- a/include/drivers/st/stm32_console.h +++ b/include/drivers/st/stm32_console.h @@ -11,7 +11,7 @@ #define CONSOLE_T_STM32_BASE CONSOLE_T_DRVDATA -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -29,6 +29,6 @@ struct console_stm32 { int console_stm32_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, struct console_stm32 *console); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* STM32_CONSOLE_H */ diff --git a/include/drivers/st/stm32_gpio.h b/include/drivers/st/stm32_gpio.h index 4320eafcd..e241f584f 100644 --- a/include/drivers/st/stm32_gpio.h +++ b/include/drivers/st/stm32_gpio.h @@ -45,13 +45,13 @@ #define GPIO_PULL_DOWN 0x02 #define GPIO_PULL_MASK U(0x03) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include int dt_set_pinctrl_config(int node); void set_gpio(uint32_t bank, uint32_t pin, uint32_t mode, uint32_t speed, uint32_t pull, uint32_t alternate, uint8_t status); void set_gpio_secure_cfg(uint32_t bank, uint32_t pin, bool secure); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* STM32_GPIO_H */ diff --git a/include/drivers/ti/uart/uart_16550.h b/include/drivers/ti/uart/uart_16550.h index 92b1ea8c3..32e38f0ac 100644 --- a/include/drivers/ti/uart/uart_16550.h +++ b/include/drivers/ti/uart/uart_16550.h @@ -73,7 +73,7 @@ #define CONSOLE_T_16550_BASE CONSOLE_T_DRVDATA -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -91,6 +91,6 @@ typedef struct { int console_16550_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, console_16550_t *console); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* UART_16550_H */ diff --git a/include/lib/bakery_lock.h b/include/lib/bakery_lock.h index a2f540c62..1fece01af 100644 --- a/include/lib/bakery_lock.h +++ b/include/lib/bakery_lock.h @@ -11,7 +11,7 @@ #define BAKERY_LOCK_MAX_CPUS PLATFORM_CORE_COUNT -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include #include @@ -101,5 +101,5 @@ void bakery_lock_release(bakery_lock_t *bakery); #define DECLARE_BAKERY_LOCK(_name) extern bakery_lock_t _name -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* BAKERY_LOCK_H */ diff --git a/include/lib/cpus/aarch32/cortex_a9.h b/include/lib/cpus/aarch32/cortex_a9.h index 1fb0a923c..a8c978a8b 100644 --- a/include/lib/cpus/aarch32/cortex_a9.h +++ b/include/lib/cpus/aarch32/cortex_a9.h @@ -25,7 +25,7 @@ ******************************************************************************/ #define PCR p15, 0, c15, c0, 0 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include DEFINE_COPROCR_RW_FUNCS(pcr, PCR) #endif diff --git a/include/lib/cpus/aarch64/cortex_a75.h b/include/lib/cpus/aarch64/cortex_a75.h index 204bfdd46..e5ca1ba31 100644 --- a/include/lib/cpus/aarch64/cortex_a75.h +++ b/include/lib/cpus/aarch64/cortex_a75.h @@ -41,7 +41,7 @@ #define CORTEX_A75_AMU_GROUP0_MASK U(0x7) #define CORTEX_A75_AMU_GROUP1_MASK (U(0) << 3) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include uint64_t cortex_a75_amu_cnt_read(int idx); @@ -50,6 +50,6 @@ unsigned int cortex_a75_amu_read_cpuamcntenset_el0(void); unsigned int cortex_a75_amu_read_cpuamcntenclr_el0(void); void cortex_a75_amu_write_cpuamcntenset_el0(unsigned int mask); void cortex_a75_amu_write_cpuamcntenclr_el0(unsigned int mask); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* CORTEX_A75_H */ diff --git a/include/lib/cpus/aarch64/cpuamu.h b/include/lib/cpus/aarch64/cpuamu.h index 921abdbd4..463f890fd 100644 --- a/include/lib/cpus/aarch64/cpuamu.h +++ b/include/lib/cpus/aarch64/cpuamu.h @@ -29,7 +29,7 @@ #define CPUAMEVTYPER3_EL0 S3_3_C15_C10_3 #define CPUAMEVTYPER4_EL0 S3_3_C15_C10_4 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include uint64_t cpuamu_cnt_read(unsigned int idx); @@ -43,6 +43,6 @@ int midr_match(unsigned int cpu_midr); void cpuamu_context_save(unsigned int nr_counters); void cpuamu_context_restore(unsigned int nr_counters); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* CPUAMU_H */ diff --git a/include/lib/cpus/aarch64/denver.h b/include/lib/cpus/aarch64/denver.h index 81c076a1a..02657a0fb 100644 --- a/include/lib/cpus/aarch64/denver.h +++ b/include/lib/cpus/aarch64/denver.h @@ -34,11 +34,11 @@ #define DENVER_CPU_PMSTATE_C7 U(0x7) #define DENVER_CPU_PMSTATE_MASK U(0xF) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* Disable Dynamic Code Optimisation */ void denver_disable_dco(void); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* DENVER_H */ diff --git a/include/lib/cpus/errata_report.h b/include/lib/cpus/errata_report.h index 17b2c30f8..7cac77ebe 100644 --- a/include/lib/cpus/errata_report.h +++ b/include/lib/cpus/errata_report.h @@ -7,7 +7,7 @@ #ifndef ERRATA_REPORT_H #define ERRATA_REPORT_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include @@ -23,7 +23,7 @@ static inline void print_errata_status(void) {} void errata_print_msg(unsigned int status, const char *cpu, const char *id); int errata_needs_reporting(spinlock_t *lock, uint32_t *reported); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ /* Errata status */ #define ERRATA_NOT_APPLIES 0 diff --git a/include/lib/el3_runtime/aarch32/context.h b/include/lib/el3_runtime/aarch32/context.h index 86ff53a67..c5567c974 100644 --- a/include/lib/el3_runtime/aarch32/context.h +++ b/include/lib/el3_runtime/aarch32/context.h @@ -24,7 +24,7 @@ #define CTX_NS_SCTLR U(0x1C) #define CTX_REGS_END U(0x20) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -65,6 +65,6 @@ typedef struct cpu_context { CASSERT(CTX_REGS_OFFSET == __builtin_offsetof(cpu_context_t, regs_ctx), \ assert_core_context_regs_offset_mismatch); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* CONTEXT_H */ diff --git a/include/lib/el3_runtime/aarch64/context.h b/include/lib/el3_runtime/aarch64/context.h index 5bd0de424..a76a59b78 100644 --- a/include/lib/el3_runtime/aarch64/context.h +++ b/include/lib/el3_runtime/aarch64/context.h @@ -207,7 +207,7 @@ #define CTX_PAUTH_REGS_END U(0) #endif /* CTX_INCLUDE_PAUTH_REGS */ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -384,6 +384,6 @@ void fpregs_context_save(fp_regs_t *regs); void fpregs_context_restore(fp_regs_t *regs); #endif -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* CONTEXT_H */ diff --git a/include/lib/el3_runtime/cpu_data.h b/include/lib/el3_runtime/cpu_data.h index 9e1d7f16c..66c47ab78 100644 --- a/include/lib/el3_runtime/cpu_data.h +++ b/include/lib/el3_runtime/cpu_data.h @@ -49,7 +49,7 @@ #define CPU_DATA_PMF_TS0_IDX 0 #endif -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include @@ -161,5 +161,5 @@ void init_cpu_ops(void); sizeof(((cpu_data_t *)0)->_m)) -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* CPU_DATA_H */ diff --git a/include/lib/extensions/ras.h b/include/lib/extensions/ras.h index 98daab601..4fc8f04b1 100644 --- a/include/lib/extensions/ras.h +++ b/include/lib/extensions/ras.h @@ -68,7 +68,7 @@ .num_intrs = ARRAY_SIZE(_array), \ } -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -196,6 +196,6 @@ int ras_ea_handler(unsigned int ea_reason, uint64_t syndrome, void *cookie, void *handle, uint64_t flags); void ras_init(void); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* RAS_H */ diff --git a/include/lib/extensions/ras_arch.h b/include/lib/extensions/ras_arch.h index e9375a356..0c98c4a0e 100644 --- a/include/lib/extensions/ras_arch.h +++ b/include/lib/extensions/ras_arch.h @@ -178,7 +178,7 @@ /* I/DFSC code for synchronous external abort */ #define SYNC_EA_FSC 0x10 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include @@ -256,6 +256,6 @@ static inline void ser_sys_select_record(unsigned int idx) /* Library functions to probe Standard Error Record */ int ser_probe_memmap(uintptr_t base, unsigned int size_num_k, int *probe_data); int ser_probe_sysreg(unsigned int idx_start, unsigned int num_idx, int *probe_data); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* RAS_ARCH_H */ diff --git a/include/lib/libc/aarch64/setjmp_.h b/include/lib/libc/aarch64/setjmp_.h index 174b3eb18..f880a17b7 100644 --- a/include/lib/libc/aarch64/setjmp_.h +++ b/include/lib/libc/aarch64/setjmp_.h @@ -18,13 +18,13 @@ #define JMP_SIZE (JMP_CTX_END >> 3) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include /* Jump buffer hosting x18 - x30 and sp_el0 registers */ typedef uint64_t jmp_buf[JMP_SIZE] __aligned(16); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* SETJMP__H */ diff --git a/include/lib/libc/setjmp.h b/include/lib/libc/setjmp.h index 5661201a0..be8e2c01a 100644 --- a/include/lib/libc/setjmp.h +++ b/include/lib/libc/setjmp.h @@ -9,12 +9,12 @@ #include -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include int setjmp(jmp_buf env); __dead2 void longjmp(jmp_buf env, int val); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* SETJMP_H */ diff --git a/include/lib/libfdt/fdt.h b/include/lib/libfdt/fdt.h index 74961f902..ef7c86b6d 100644 --- a/include/lib/libfdt/fdt.h +++ b/include/lib/libfdt/fdt.h @@ -52,7 +52,7 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ struct fdt_header { fdt32_t magic; /* magic word FDT_MAGIC */ @@ -90,7 +90,7 @@ struct fdt_property { char data[0]; }; -#endif /* !__ASSEMBLY */ +#endif /* !__ASSEMBLER__ */ #define FDT_MAGIC 0xd00dfeed /* 4: version, 4: total size */ #define FDT_TAGSIZE sizeof(fdt32_t) diff --git a/include/lib/psci/psci.h b/include/lib/psci/psci.h index fe279d4f2..04e5e3d72 100644 --- a/include/lib/psci/psci.h +++ b/include/lib/psci/psci.h @@ -166,7 +166,7 @@ #define PSCI_RESET2_TYPE_ARCH (U(0) << PSCI_RESET2_TYPE_VENDOR_SHIFT) #define PSCI_RESET2_SYSTEM_WARM_RESET (PSCI_RESET2_TYPE_ARCH | U(0)) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -348,6 +348,6 @@ int psci_features(unsigned int psci_fid); void __dead2 psci_power_down_wfi(void); void psci_arch_setup(void); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* PSCI_H */ diff --git a/include/lib/psci/psci_lib.h b/include/lib/psci/psci_lib.h index 53d7711b1..76c1a8dcf 100644 --- a/include/lib/psci/psci_lib.h +++ b/include/lib/psci/psci_lib.h @@ -9,7 +9,7 @@ #include -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include @@ -89,6 +89,6 @@ void psci_warmboot_entrypoint(void); void psci_register_spd_pm_hook(const spd_pm_ops_t *pm); void psci_prepare_next_non_secure_ctx( entry_point_info_t *next_image_info); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* PSCI_LIB_H */ diff --git a/include/lib/runtime_instr.h b/include/lib/runtime_instr.h index f5a3f1386..303f27e5b 100644 --- a/include/lib/runtime_instr.h +++ b/include/lib/runtime_instr.h @@ -17,9 +17,9 @@ #define RT_INSTR_EXIT_CFLUSH U(5) #define RT_INSTR_TOTAL_IDS U(6) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ PMF_DECLARE_CAPTURE_TIMESTAMP(rt_instr_svc) PMF_DECLARE_GET_TIMESTAMP(rt_instr_svc) -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* RUNTIME_INSTR_H */ diff --git a/include/lib/smccc.h b/include/lib/smccc.h index 94c39d2a6..76e60231f 100644 --- a/include/lib/smccc.h +++ b/include/lib/smccc.h @@ -87,7 +87,7 @@ #define SMC_FROM_SECURE (U(0) << 0) #define SMC_FROM_NON_SECURE (U(1) << 0) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -155,5 +155,5 @@ static inline uint32_t smc_uuid_word(uint8_t b0, uint8_t b1, uint8_t b2, uint8_t smc_uuid_word((_uuid).node[2], (_uuid).node[3], \ (_uuid).node[4], (_uuid).node[5])) -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* SMCCC_H */ diff --git a/include/lib/spinlock.h b/include/lib/spinlock.h index fcd36e856..0bf3ee066 100644 --- a/include/lib/spinlock.h +++ b/include/lib/spinlock.h @@ -7,7 +7,7 @@ #ifndef SPINLOCK_H #define SPINLOCK_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include diff --git a/include/lib/utils.h b/include/lib/utils.h index 674845404..cdb125cfa 100644 --- a/include/lib/utils.h +++ b/include/lib/utils.h @@ -11,7 +11,7 @@ * C code should be put in this part of the header to avoid breaking ASM files * or linker scripts including it. */ -#if !(defined(__LINKER__) || defined(__ASSEMBLY__)) +#if !(defined(__LINKER__) || defined(__ASSEMBLER__)) #include #include @@ -91,6 +91,6 @@ static inline u_register_t load_addr_## _name(void) \ /* Helper to invoke the function defined by DEFINE_LOAD_SYM_ADDR() */ #define LOAD_ADDR_OF(_name) (typeof(_name) *) load_addr_## _name() -#endif /* !(defined(__LINKER__) || defined(__ASSEMBLY__)) */ +#endif /* !(defined(__LINKER__) || defined(__ASSEMBLER__)) */ #endif /* UTILS_H */ diff --git a/include/lib/utils_def.h b/include/lib/utils_def.h index 41f71e84a..7098bace1 100644 --- a/include/lib/utils_def.h +++ b/include/lib/utils_def.h @@ -32,7 +32,7 @@ * position @h. For example * GENMASK_64(39, 21) gives us the 64bit vector 0x000000ffffe00000. */ -#if defined(__LINKER__) || defined(__ASSEMBLY__) +#if defined(__LINKER__) || defined(__ASSEMBLER__) #define GENMASK_32(h, l) \ (((0xFFFFFFFF) << (l)) & (0xFFFFFFFF >> (32 - 1 - (h)))) diff --git a/include/lib/xlat_tables/xlat_mmu_helpers.h b/include/lib/xlat_tables/xlat_mmu_helpers.h index 85effcaa5..efe0dd5e5 100644 --- a/include/lib/xlat_tables/xlat_mmu_helpers.h +++ b/include/lib/xlat_tables/xlat_mmu_helpers.h @@ -50,7 +50,7 @@ #define MMU_CFG_TTBR0 2 #define MMU_CFG_PARAM_MAX 3 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include @@ -86,6 +86,6 @@ void enable_mmu_direct_el3(unsigned int flags); bool xlat_arch_is_granule_size_supported(size_t size); size_t xlat_arch_get_max_supported_granule_size(void); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* XLAT_MMU_HELPERS_H */ diff --git a/include/lib/xlat_tables/xlat_tables.h b/include/lib/xlat_tables/xlat_tables.h index 9e2543fbb..082bb5e45 100644 --- a/include/lib/xlat_tables/xlat_tables.h +++ b/include/lib/xlat_tables/xlat_tables.h @@ -9,7 +9,7 @@ #include -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include @@ -88,5 +88,5 @@ void mmap_add_region(unsigned long long base_pa, uintptr_t base_va, size_t size, unsigned int attr); void mmap_add(const mmap_region_t *mm); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* XLAT_TABLES_H */ diff --git a/include/lib/xlat_tables/xlat_tables_v2.h b/include/lib/xlat_tables/xlat_tables_v2.h index 555142683..0e099987e 100644 --- a/include/lib/xlat_tables/xlat_tables_v2.h +++ b/include/lib/xlat_tables/xlat_tables_v2.h @@ -10,7 +10,7 @@ #include #include -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include @@ -364,5 +364,5 @@ int xlat_get_mem_attributes_ctx(const xlat_ctx_t *ctx, uintptr_t base_va, uint32_t *attr); int xlat_get_mem_attributes(uintptr_t base_va, uint32_t *attr); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* XLAT_TABLES_V2_H */ diff --git a/include/lib/xlat_tables/xlat_tables_v2_helpers.h b/include/lib/xlat_tables/xlat_tables_v2_helpers.h index 6a1be3258..b17b71a87 100644 --- a/include/lib/xlat_tables/xlat_tables_v2_helpers.h +++ b/include/lib/xlat_tables/xlat_tables_v2_helpers.h @@ -16,7 +16,7 @@ #error "Do not include this header file directly. Include xlat_tables_v2.h instead." #endif -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include @@ -160,6 +160,6 @@ struct xlat_ctx { .initialized = false, \ } -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* XLAT_TABLES_V2_HELPERS_H */ diff --git a/include/plat/arm/board/common/board_css_def.h b/include/plat/arm/board/common/board_css_def.h index f982b57b4..4637b6785 100644 --- a/include/plat/arm/board/common/board_css_def.h +++ b/include/plat/arm/board/common/board_css_def.h @@ -29,7 +29,7 @@ #define BOARD_CSS_PLAT_TYPE_EMULATOR 0x02 #define BOARD_CSS_PLAT_TYPE_FVP 0x03 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -37,7 +37,7 @@ ((mmio_read_32(addr) & BOARD_CSS_PLAT_ID_REG_ID_MASK) \ >> BOARD_CSS_PLAT_ID_REG_ID_SHIFT) -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #define MAX_IO_DEVICES 3 diff --git a/include/plat/arm/css/common/css_def.h b/include/plat/arm/css/common/css_def.h index ec28db075..2adf11d66 100644 --- a/include/plat/arm/css/common/css_def.h +++ b/include/plat/arm/css/common/css_def.h @@ -136,7 +136,7 @@ #define SPIDEN_INT_CLR_SHIFT 6 #define SPIDEN_SEL_SET_SHIFT 7 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* SSC_VERSION related accessors */ @@ -150,7 +150,7 @@ (((val) >> SSC_VERSION_CONFIG_SHIFT) & \ SSC_VERSION_CONFIG_MASK) -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ /************************************************************************* * Required platform porting definitions common to all diff --git a/include/services/spm_svc.h b/include/services/spm_svc.h index 57912e883..a3723a0f5 100644 --- a/include/services/spm_svc.h +++ b/include/services/spm_svc.h @@ -63,7 +63,7 @@ #endif /* SPM_MM */ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -85,6 +85,6 @@ uint64_t spm_sp_call(uint32_t smc_fid, uint64_t x1, uint64_t x2, uint64_t x3); #endif /* SPM_MM */ -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* SPM_SVC_H */ -- cgit v1.2.3