diff --git a/Makefile b/Makefile index aca57b6..beb0237 100644 --- a/Makefile +++ b/Makefile @@ -273,8 +273,7 @@ CPPFLAGS = ${DEFINES} ${INCLUDES} ${MBEDTLS_INC} -nostdinc \ -Wmissing-include-dirs $(ERRORS) $(WARNINGS) ASFLAGS += $(CPPFLAGS) $(ASFLAGS_$(ARCH)) \ - -D__ASSEMBLY__ -ffreestanding \ - -Wa,--fatal-warnings + -ffreestanding -Wa,--fatal-warnings TF_CFLAGS += $(CPPFLAGS) $(TF_CFLAGS_$(ARCH)) \ -ffreestanding -fno-builtin -Wall -std=gnu99 \ -Os -ffunction-sections -fdata-sections @@ -763,14 +762,16 @@ msg_start: @echo "Building ${PLAT}" -# Check if deprecated declarations and cpp warnings should be treated as error or not. ifeq (${ERROR_DEPRECATED},0) +# Check if deprecated declarations and cpp warnings should be treated as error or not. ifneq ($(findstring clang,$(notdir $(CC))),) CPPFLAGS += -Wno-error=deprecated-declarations else CPPFLAGS += -Wno-error=deprecated-declarations -Wno-error=cpp endif -endif +# __ASSEMBLY__ is deprecated in favor of the compiler-builtin __ASSEMBLER__. +ASFLAGS += -D__ASSEMBLY__ +endif # !ERROR_DEPRECATED $(eval $(call MAKE_LIB_DIRS)) $(eval $(call MAKE_LIB,c)) diff --git a/bl32/tsp/tsp_private.h b/bl32/tsp/tsp_private.h index e39f291..cbd527f 100644 --- a/bl32/tsp/tsp_private.h +++ b/bl32/tsp/tsp_private.h @@ -20,7 +20,7 @@ #define TSP_ARGS_END 0x40 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -148,6 +148,6 @@ uint64_t arg7); uint64_t tsp_main(void); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* TSP_PRIVATE_H */ diff --git a/drivers/arm/css/sds/sds_private.h b/drivers/arm/css/sds/sds_private.h index 2101dd0..d801a04 100644 --- a/drivers/arm/css/sds/sds_private.h +++ b/drivers/arm/css/sds/sds_private.h @@ -58,7 +58,7 @@ #define SDS_REGION_REGIONSIZE_OFFSET 0x4 #define SDS_REGION_DESC_SIZE 0x8 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include @@ -95,6 +95,6 @@ & SDS_REGION_SCH_VERSION_MASK) #define GET_SDS_REGION_SIZE(region) ((((region_desc_t *)(region))->reg[1])) -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* SDS_PRIVATE_H */ diff --git a/drivers/imx/uart/imx_uart.h b/drivers/imx/uart/imx_uart.h index b71504c..4f6d3de 100644 --- a/drivers/imx/uart/imx_uart.h +++ b/drivers/imx/uart/imx_uart.h @@ -152,7 +152,7 @@ #define IMX_UART_TS_RXFULL BIT(3) #define IMX_UART_TS_SOFTRST BIT(0) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ typedef struct { console_t console; @@ -163,6 +163,6 @@ uint32_t clock, uint32_t baud, console_imx_uart_t *console); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* IMX_UART_H */ diff --git a/drivers/renesas/rcar/delay/micro_delay.h b/drivers/renesas/rcar/delay/micro_delay.h index 193daba..37b71f8 100644 --- a/drivers/renesas/rcar/delay/micro_delay.h +++ b/drivers/renesas/rcar/delay/micro_delay.h @@ -7,7 +7,7 @@ #ifndef MICRO_DELAY_H #define MICRO_DELAY_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include void rcar_micro_delay(uint64_t micro_sec); #endif diff --git a/drivers/renesas/rcar/pwrc/pwrc.c b/drivers/renesas/rcar/pwrc/pwrc.c index f4c9d3a..32e04a7 100644 --- a/drivers/renesas/rcar/pwrc/pwrc.c +++ b/drivers/renesas/rcar/pwrc/pwrc.c @@ -148,7 +148,7 @@ #define IS_CA57(c) ((c) == RCAR_CLUSTER_CA57) #define IS_CA53(c) ((c) == RCAR_CLUSTER_CA53) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ IMPORT_SYM(unsigned long, __system_ram_start__, SYSTEM_RAM_START); IMPORT_SYM(unsigned long, __system_ram_end__, SYSTEM_RAM_END); IMPORT_SYM(unsigned long, __SRAM_COPY_START__, SRAM_COPY_START); diff --git a/drivers/renesas/rcar/pwrc/pwrc.h b/drivers/renesas/rcar/pwrc/pwrc.h index e67c6ef..2b81783 100644 --- a/drivers/renesas/rcar/pwrc/pwrc.h +++ b/drivers/renesas/rcar/pwrc/pwrc.h @@ -38,7 +38,7 @@ #define RCAR_CLUSTER_CA53 (1U) #define RCAR_CLUSTER_CA57 (2U) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ void rcar_pwrc_disable_interrupt_wakeup(uint64_t mpidr); void rcar_pwrc_enable_interrupt_wakeup(uint64_t mpidr); void rcar_pwrc_clusteroff(uint64_t mpidr); diff --git a/include/arch/aarch32/smccc_helpers.h b/include/arch/aarch32/smccc_helpers.h index d3e5e59..b2ee3cf 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 @@ /* 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 e28697d..fac6fd9 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 937b8c7..d81f434 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 @@ 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 ee00d09..c13d28c 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_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 b1683cc..8bb1bab 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 @@ 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 18d3079..637e14a 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 @@ 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 eb96df0..896a03f 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 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 f8faf68..245e698 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 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 6cb903e..2998150 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 @@ __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 6c6a853..07bafaa 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 @@ 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 b885286..4dab4e3 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 e5e36c7..3b0a224 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 @@ 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 c5ddcfd..5aea95a 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_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 9c3abac..7f73768 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 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 114ae92..db4cbaa 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 @@ 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 ca173f3..39e2516 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 @@ 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 6bc5101..ebcb216 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 @@ 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 72221ac..9c72d4d 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_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 f201f00..8733d19 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 @@ 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 551bfe4..b00ede1 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_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 98ef0ec..32aeb03 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 @@ 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 24bfaeb..cce074c 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 @@ 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 d143d73..acfde26 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 0a1cf77..64a062c 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 @@ 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 f31de95..cada771 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 @@ /* 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 1aa4c88..85babb8 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 546d9f1..b0d1ec9 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 5511d96..517f01a 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 @@ 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 5da1e3f..70e3b0b 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 @@ 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 5bc10b7..0e4ed8f 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 @@ 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 b303768..a2ad87c 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 @@ 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 4320eaf..e241f58 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 92b1ea8..32e38f0 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 @@ 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 a2f540c..1fece01 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 @@ #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 1fb0a92..a8c978a 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 204bfdd..e5ca1ba 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_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 921abdb..463f890 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 @@ 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 81c076a..02657a0 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 17b2c30..7cac77e 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 @@ 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 86ff53a..c5567c9 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 @@ 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 5bd0de4..a76a59b 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_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 9e1d7f1..66c47ab 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 @@ 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 98daab6..4fc8f04 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 @@ 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 e9375a3..0c98c4a 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 @@ /* 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 174b3eb..f880a17 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 5661201..be8e2c0 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 74961f9..ef7c86b 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 @@ 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 fe279d4..04e5e3d 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 @@ 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 53d7711..76c1a8d 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_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 f5a3f13..303f27e 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 94c39d2..76e6023 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 @@ 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 fcd36e8..0bf3ee0 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 6748454..cdb125c 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 @@ /* 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 41f71e8..7098bac 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 85effca..efe0dd5 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 @@ 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 9e2543f..082bb5e 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 @@ 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 5551426..0e09998 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 @@ 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 6a1be32..b17b71a 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 @@ .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 f982b57..4637b67 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 ec28db0..2adf11d 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 57912e8..a3723a0 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 @@ #endif /* SPM_MM */ -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* SPM_SVC_H */ diff --git a/lib/romlib/Makefile b/lib/romlib/Makefile index 60c1458..cec9404 100644 --- a/lib/romlib/Makefile +++ b/lib/romlib/Makefile @@ -15,7 +15,7 @@ WRAPPER_DIR = ../../$(BUILD_PLAT)/libwrapper LIBS = -lmbedtls -lfdt -lc INC = $(INCLUDES:-I%=-I../../%) -PPFLAGS = $(INC) $(DEFINES) -P -D__ASSEMBLY__ -D__LINKER__ -MD -MP -MT $(BUILD_DIR)/romlib.ld +PPFLAGS = $(INC) $(DEFINES) -P -x assembler-with-cpp -D__LINKER__ -MD -MP -MT $(BUILD_DIR)/romlib.ld OBJS = $(BUILD_DIR)/jmptbl.o $(BUILD_DIR)/init.o MAPFILE = ../../$(BUILD_PLAT)/romlib/romlib.map diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk index 2d41b2d..4a9677b 100644 --- a/make_helpers/build_macros.mk +++ b/make_helpers/build_macros.mk @@ -273,7 +273,7 @@ $(1): $(2) $(filter-out %.d,$(MAKEFILE_LIST)) | bl$(3)_dirs $$(ECHO) " PP $$<" - $$(Q)$$(CPP) $$(CPPFLAGS) -P -D__ASSEMBLY__ -D__LINKER__ $(MAKE_DEP) -D$(IMAGE) -o $$@ $$< + $$(Q)$$(CPP) $$(CPPFLAGS) -P -x assembler-with-cpp -D__LINKER__ $(MAKE_DEP) -D$(IMAGE) -o $$@ $$< -include $(DEP) diff --git a/plat/arm/css/sgi/include/sgi_base_platform_def.h b/plat/arm/css/sgi/include/sgi_base_platform_def.h index 032a1f4..a9cc852 100644 --- a/plat/arm/css/sgi/include/sgi_base_platform_def.h +++ b/plat/arm/css/sgi/include/sgi_base_platform_def.h @@ -187,7 +187,7 @@ /* Platform ID address */ #define SSC_VERSION (SSC_REG_BASE + SSC_VERSION_OFFSET) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* SSC_VERSION related accessors */ /* Returns the part number of the platform */ #define GET_SGI_PART_NUM \ @@ -195,7 +195,7 @@ /* Returns the configuration number of the platform */ #define GET_SGI_CONFIG_NUM \ GET_SSC_VERSION_CONFIG(mmio_read_32(SSC_VERSION)) -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ /******************************************************************************* * Memprotect definitions diff --git a/plat/arm/css/sgm/include/sgm_base_platform_def.h b/plat/arm/css/sgm/include/sgm_base_platform_def.h index 4ecfc96..f349c19 100644 --- a/plat/arm/css/sgm/include/sgm_base_platform_def.h +++ b/plat/arm/css/sgm/include/sgm_base_platform_def.h @@ -51,7 +51,7 @@ /* Platform ID address */ #define SSC_VERSION (SSC_REG_BASE + SSC_VERSION_OFFSET) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* SSC_VERSION related accessors */ /* Returns the part number of the platform */ #define GET_PLAT_PART_NUM \ @@ -59,7 +59,7 @@ /* Returns the configuration number of the platform */ #define GET_PLAT_CONFIG_NUM \ GET_SSC_VERSION_CONFIG(mmio_read_32(SSC_VERSION)) -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ /************************************************************************* diff --git a/plat/hisilicon/hikey/include/hisi_pwrc.h b/plat/hisilicon/hikey/include/hisi_pwrc.h index f1cc297..cbb4651 100644 --- a/plat/hisilicon/hikey/include/hisi_pwrc.h +++ b/plat/hisilicon/hikey/include/hisi_pwrc.h @@ -7,7 +7,7 @@ #ifndef HISI_PWRC_H #define HISI_PWRC_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ void hisi_pwrc_set_cluster_wfi(unsigned int id); void hisi_pwrc_set_core_bx_addr(unsigned int core, @@ -17,6 +17,6 @@ unsigned int cluster); int hisi_pwrc_setup(void); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* HISI_PWRC_H */ diff --git a/plat/imx/common/include/imx8_lpuart.h b/plat/imx/common/include/imx8_lpuart.h index 63449e7..0ea284f 100644 --- a/plat/imx/common/include/imx8_lpuart.h +++ b/plat/imx/common/include/imx8_lpuart.h @@ -50,7 +50,7 @@ #define LPUART_BAUD_BOTHEDGE_MASK (0x20000U) #define LPUART_BAUD_M10_MASK (0x20000000U) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -61,6 +61,6 @@ int console_lpuart_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, console_lpuart_t *console); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* IMX8_LPUART_H */ diff --git a/plat/imx/common/include/imx_uart.h b/plat/imx/common/include/imx_uart.h index 1b52e2f..cc1b531 100644 --- a/plat/imx/common/include/imx_uart.h +++ b/plat/imx/common/include/imx_uart.h @@ -9,7 +9,7 @@ #include -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ typedef struct { console_t console; @@ -18,6 +18,6 @@ int console_imx_uart_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, console_uart_t *console); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* IMX_UART_H */ diff --git a/plat/layerscape/common/include/ls_16550.h b/plat/layerscape/common/include/ls_16550.h index b0b1856..cb4514f 100644 --- a/plat/layerscape/common/include/ls_16550.h +++ b/plat/layerscape/common/include/ls_16550.h @@ -63,7 +63,7 @@ #define CONSOLE_T_16550_BASE CONSOLE_T_DRVDATA -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -81,6 +81,6 @@ int console_ls_16550_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, console_ls_16550_t *console); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* LS_16550_H */ diff --git a/plat/marvell/a3700/common/include/platform_def.h b/plat/marvell/a3700/common/include/platform_def.h index 16865c4..591f045 100644 --- a/plat/marvell/a3700/common/include/platform_def.h +++ b/plat/marvell/a3700/common/include/platform_def.h @@ -8,9 +8,9 @@ #ifndef PLATFORM_DEF_H #define PLATFORM_DEF_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #include #include diff --git a/plat/marvell/a8k/common/include/platform_def.h b/plat/marvell/a8k/common/include/platform_def.h index 3f6154e..b9c2e0e 100644 --- a/plat/marvell/a8k/common/include/platform_def.h +++ b/plat/marvell/a8k/common/include/platform_def.h @@ -8,9 +8,9 @@ #ifndef PLATFORM_DEF_H #define PLATFORM_DEF_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #include #include diff --git a/plat/mediatek/mt8183/drivers/mcsi/mcsi.h b/plat/mediatek/mt8183/drivers/mcsi/mcsi.h index 8a588bf..863e7da 100644 --- a/plat/mediatek/mt8183/drivers/mcsi/mcsi.h +++ b/plat/mediatek/mt8183/drivers/mcsi/mcsi.h @@ -85,7 +85,7 @@ #define CCI_CLK_CTRL (MCUCFG_BASE + 0x660) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include @@ -112,5 +112,5 @@ void cci_init_sf(void); unsigned long cci_reg_access(unsigned int op, unsigned long offset, unsigned long val); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* MCSI_H */ diff --git a/plat/nvidia/tegra/include/drivers/memctrl_v2.h b/plat/nvidia/tegra/include/drivers/memctrl_v2.h index 9cbadd3..a4085e2 100644 --- a/plat/nvidia/tegra/include/drivers/memctrl_v2.h +++ b/plat/nvidia/tegra/include/drivers/memctrl_v2.h @@ -9,7 +9,7 @@ #include -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include @@ -173,6 +173,6 @@ ******************************************************************************/ void plat_memctrl_tzdram_setup(uint64_t phys_base, uint64_t size_in_bytes); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* MEMCTRL_V2_H */ diff --git a/plat/nvidia/tegra/include/tegra_platform.h b/plat/nvidia/tegra/include/tegra_platform.h index b9c3782..d83ce48 100644 --- a/plat/nvidia/tegra/include/tegra_platform.h +++ b/plat/nvidia/tegra/include/tegra_platform.h @@ -30,7 +30,7 @@ #define TEGRA_CHIPID_TEGRA21 U(0x21) #define TEGRA_CHIPID_TEGRA18 U(0x18) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* * Tegra chip ID major/minor identifiers @@ -57,6 +57,6 @@ bool tegra_platform_is_unit_fpga(void); bool tegra_platform_is_virt_dev_kit(void); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* TEGRA_PLATFORM_H */ diff --git a/plat/renesas/rcar/include/platform_def.h b/plat/renesas/rcar/include/platform_def.h index bbe4a54..b7f0ca1 100644 --- a/plat/renesas/rcar/include/platform_def.h +++ b/plat/renesas/rcar/include/platform_def.h @@ -7,7 +7,7 @@ #ifndef PLATFORM_DEF_H #define PLATFORM_DEF_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #endif diff --git a/plat/rockchip/common/include/plat_private.h b/plat/rockchip/common/include/plat_private.h index 66b6185..9041bdb 100644 --- a/plat/rockchip/common/include/plat_private.h +++ b/plat/rockchip/common/include/plat_private.h @@ -7,7 +7,7 @@ #ifndef PLAT_PRIVATE_H #define PLAT_PRIVATE_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -140,7 +140,7 @@ uint32_t rockchip_get_uart_base(void); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ /****************************************************************************** * cpu up status diff --git a/plat/rockchip/common/pmusram/cpus_on_fixed_addr.h b/plat/rockchip/common/pmusram/cpus_on_fixed_addr.h index b22ddc2..34af29a 100644 --- a/plat/rockchip/common/pmusram/cpus_on_fixed_addr.h +++ b/plat/rockchip/common/pmusram/cpus_on_fixed_addr.h @@ -26,7 +26,7 @@ #define PM_WARM_BOOT_SHT 0 #define PM_WARM_BOOT_BIT (1 << PM_WARM_BOOT_SHT) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ struct psram_data_t { uint64_t sp; @@ -50,6 +50,6 @@ extern void *sys_sleep_flag_sram; -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif diff --git a/plat/st/stm32mp1/stm32mp1_def.h b/plat/st/stm32mp1/stm32mp1_def.h index 94c4c5b..37941aa 100644 --- a/plat/st/stm32mp1/stm32mp1_def.h +++ b/plat/st/stm32mp1/stm32mp1_def.h @@ -14,7 +14,7 @@ #include #include -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #include @@ -40,7 +40,7 @@ #endif /* DDR power initializations */ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ enum ddr_type { STM32MP_DDR3, STM32MP_LPDDR2, @@ -254,7 +254,7 @@ #define TAMP_BASE U(0x5C00A000) #define TAMP_BKP_REGISTER_BASE (TAMP_BASE + U(0x100)) -#if !(defined(__LINKER__) || defined(__ASSEMBLY__)) +#if !(defined(__LINKER__) || defined(__ASSEMBLER__)) static inline uint32_t tamp_bkpr(uint32_t idx) { return TAMP_BKP_REGISTER_BASE + (idx << 2); diff --git a/services/spd/opteed/opteed_private.h b/services/spd/opteed/opteed_private.h index 847b9c5..242154f 100644 --- a/services/spd/opteed/opteed_private.h +++ b/services/spd/opteed/opteed_private.h @@ -79,7 +79,7 @@ #define OPTEED_C_RT_CTX_SIZE 0x60 #define OPTEED_C_RT_CTX_ENTRIES (OPTEED_C_RT_CTX_SIZE >> DWORD_SHIFT) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -157,6 +157,6 @@ extern optee_context_t opteed_sp_context[OPTEED_CORE_COUNT]; extern uint32_t opteed_rw; extern struct optee_vectors *optee_vector_table; -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* OPTEED_PRIVATE_H */ diff --git a/services/spd/tlkd/tlkd_private.h b/services/spd/tlkd/tlkd_private.h index 53f9e20..5d5d0e8 100644 --- a/services/spd/tlkd/tlkd_private.h +++ b/services/spd/tlkd/tlkd_private.h @@ -71,7 +71,7 @@ #define TLKD_C_RT_CTX_SIZE 0x60 #define TLKD_C_RT_CTX_ENTRIES (TLKD_C_RT_CTX_SIZE >> DWORD_SHIFT) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -119,6 +119,6 @@ uint64_t pc, tlk_context_t *tlk_ctx); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* TLKD_PRIVATE_H */ diff --git a/services/spd/tspd/tspd_private.h b/services/spd/tspd/tspd_private.h index 50f3b87..a81eb21 100644 --- a/services/spd/tspd/tspd_private.h +++ b/services/spd/tspd/tspd_private.h @@ -126,7 +126,7 @@ #define TSPD_SP_CTX_SIZE 0x90 #define TSPD_SP_CTX_ENTRIES (TSPD_SP_CTX_SIZE >> DWORD_SHIFT) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -227,6 +227,6 @@ extern tsp_context_t tspd_sp_context[TSPD_CORE_COUNT]; extern tsp_vectors_t *tsp_vectors; -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* TSPD_PRIVATE_H */ diff --git a/services/std_svc/spm/spm_private.h b/services/std_svc/spm/spm_private.h index 740fee5..efc91cb 100644 --- a/services/std_svc/spm/spm_private.h +++ b/services/std_svc/spm/spm_private.h @@ -32,7 +32,7 @@ /* Value returned by spm_sp_synchronous_entry() when a partition is preempted */ #define SPM_SECURE_PARTITION_PREEMPTED U(0x1234) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -114,6 +114,6 @@ int spm_response_get(uint16_t client_id, uint16_t handle, uint32_t token, u_register_t *x1, u_register_t *x2, u_register_t *x3); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* SPM_PRIVATE_H */ diff --git a/services/std_svc/spm_mm/spm_private.h b/services/std_svc/spm_mm/spm_private.h index 8e94a28..ba94a4d 100644 --- a/services/std_svc/spm_mm/spm_private.h +++ b/services/std_svc/spm_mm/spm_private.h @@ -29,7 +29,7 @@ #define SP_C_RT_CTX_SIZE 0x60 #define SP_C_RT_CTX_ENTRIES (SP_C_RT_CTX_SIZE >> DWORD_SHIFT) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -66,6 +66,6 @@ u_register_t pages_count, u_register_t smc_attributes); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* SPM_PRIVATE_H */