Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-15 17:14:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace __ASSEMBLY__ with compiler-builtin __ASSEMBLER__

Browse source 
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 <jwerner@chromium.org>
This commit is contained in:
Julius Werner 2019-07-09 13:49:11 -07:00
parent f61469e532
commit d5dfdeb65f
90 changed files with 177 additions and 176 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -273,8 +273,7 @@ endif
CPPFLAGS = ${DEFINES} ${INCLUDES} ${MBEDTLS_INC} -nostdinc \ CPPFLAGS = ${DEFINES} ${INCLUDES} ${MBEDTLS_INC} -nostdinc \
-Wmissing-include-dirs $(ERRORS) $(WARNINGS) -Wmissing-include-dirs $(ERRORS) $(WARNINGS)
ASFLAGS += $(CPPFLAGS) $(ASFLAGS_$(ARCH)) \ ASFLAGS += $(CPPFLAGS) $(ASFLAGS_$(ARCH)) \
-D__ASSEMBLY__ -ffreestanding \ -ffreestanding -Wa,--fatal-warnings
-Wa,--fatal-warnings
TF_CFLAGS += $(CPPFLAGS) $(TF_CFLAGS_$(ARCH)) \ TF_CFLAGS += $(CPPFLAGS) $(TF_CFLAGS_$(ARCH)) \
-ffreestanding -fno-builtin -Wall -std=gnu99 \ -ffreestanding -fno-builtin -Wall -std=gnu99 \
-Os -ffunction-sections -fdata-sections -Os -ffunction-sections -fdata-sections
@ -763,14 +762,16 @@ all: msg_start
msg_start: msg_start:
@echo "Building ${PLAT}" @echo "Building ${PLAT}"
# Check if deprecated declarations and cpp warnings should be treated as error or not.
ifeq (${ERROR_DEPRECATED},0) ifeq (${ERROR_DEPRECATED},0)
# Check if deprecated declarations and cpp warnings should be treated as error or not.
ifneq ($(findstring clang,$(notdir $(CC))),) ifneq ($(findstring clang,$(notdir $(CC))),)
CPPFLAGS += -Wno-error=deprecated-declarations CPPFLAGS += -Wno-error=deprecated-declarations
else else
CPPFLAGS += -Wno-error=deprecated-declarations -Wno-error=cpp CPPFLAGS += -Wno-error=deprecated-declarations -Wno-error=cpp
endif 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_DIRS))
$(eval $(call MAKE_LIB,c)) $(eval $(call MAKE_LIB,c))

4
bl32/tsp/tsp_private.h
View file

@ -20,7 +20,7 @@
#define TSP_ARGS_END 0x40 #define TSP_ARGS_END 0x40
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -148,6 +148,6 @@ tsp_args_t *tsp_system_off_main(uint64_t arg0,
uint64_t arg7); uint64_t arg7);
uint64_t tsp_main(void); uint64_t tsp_main(void);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* TSP_PRIVATE_H */ #endif /* TSP_PRIVATE_H */

4
drivers/arm/css/sds/sds_private.h
View file

@ -58,7 +58,7 @@
#define SDS_REGION_REGIONSIZE_OFFSET 0x4 #define SDS_REGION_REGIONSIZE_OFFSET 0x4
#define SDS_REGION_DESC_SIZE 0x8 #define SDS_REGION_DESC_SIZE 0x8
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
@ -95,6 +95,6 @@ typedef struct region_descriptor {
& SDS_REGION_SCH_VERSION_MASK) & SDS_REGION_SCH_VERSION_MASK)
#define GET_SDS_REGION_SIZE(region) ((((region_desc_t *)(region))->reg[1])) #define GET_SDS_REGION_SIZE(region) ((((region_desc_t *)(region))->reg[1]))
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* SDS_PRIVATE_H */ #endif /* SDS_PRIVATE_H */

4
drivers/imx/uart/imx_uart.h
View file

@ -152,7 +152,7 @@
#define IMX_UART_TS_RXFULL BIT(3) #define IMX_UART_TS_RXFULL BIT(3)
#define IMX_UART_TS_SOFTRST BIT(0) #define IMX_UART_TS_SOFTRST BIT(0)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
typedef struct { typedef struct {
console_t console; console_t console;
@ -163,6 +163,6 @@ int console_imx_uart_register(uintptr_t baseaddr,
uint32_t clock, uint32_t clock,
uint32_t baud, uint32_t baud,
console_imx_uart_t *console); console_imx_uart_t *console);
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* IMX_UART_H */ #endif /* IMX_UART_H */

2
drivers/renesas/rcar/delay/micro_delay.h
View file

@ -7,7 +7,7 @@
#ifndef MICRO_DELAY_H #ifndef MICRO_DELAY_H
#define MICRO_DELAY_H #define MICRO_DELAY_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
void rcar_micro_delay(uint64_t micro_sec); void rcar_micro_delay(uint64_t micro_sec);
#endif #endif

2
drivers/renesas/rcar/pwrc/pwrc.c
View file

@ -148,7 +148,7 @@ RCAR_INSTANTIATE_LOCK
#define IS_CA57(c) ((c) == RCAR_CLUSTER_CA57) #define IS_CA57(c) ((c) == RCAR_CLUSTER_CA57)
#define IS_CA53(c) ((c) == RCAR_CLUSTER_CA53) #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_start__, SYSTEM_RAM_START);
IMPORT_SYM(unsigned long, __system_ram_end__, SYSTEM_RAM_END); IMPORT_SYM(unsigned long, __system_ram_end__, SYSTEM_RAM_END);
IMPORT_SYM(unsigned long, __SRAM_COPY_START__, SRAM_COPY_START); IMPORT_SYM(unsigned long, __SRAM_COPY_START__, SRAM_COPY_START);

2
drivers/renesas/rcar/pwrc/pwrc.h
View file

@ -38,7 +38,7 @@
#define RCAR_CLUSTER_CA53 (1U) #define RCAR_CLUSTER_CA53 (1U)
#define RCAR_CLUSTER_CA57 (2U) #define RCAR_CLUSTER_CA57 (2U)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
void rcar_pwrc_disable_interrupt_wakeup(uint64_t mpidr); void rcar_pwrc_disable_interrupt_wakeup(uint64_t mpidr);
void rcar_pwrc_enable_interrupt_wakeup(uint64_t mpidr); void rcar_pwrc_enable_interrupt_wakeup(uint64_t mpidr);
void rcar_pwrc_clusteroff(uint64_t mpidr); void rcar_pwrc_clusteroff(uint64_t mpidr);

4
include/arch/aarch32/smccc_helpers.h
View file

@ -24,7 +24,7 @@
#define SMC_CTX_PMCR U(0x88) #define SMC_CTX_PMCR U(0x88)
#define SMC_CTX_SIZE U(0x90) #define SMC_CTX_SIZE U(0x90)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -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()`. */ /* Get the pointer to next `smc_ctx_t` already set by `smc_set_next_ctx()`. */
void *smc_get_next_ctx(void); void *smc_get_next_ctx(void);
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* SMCCC_HELPERS_H */ #endif /* SMCCC_HELPERS_H */

4
include/arch/aarch64/smccc_helpers.h
View file

@ -9,7 +9,7 @@
#include <lib/smccc.h> #include <lib/smccc.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdbool.h> #include <stdbool.h>
@ -82,6 +82,6 @@
_x4 = read_ctx_reg(regs, CTX_GPREG_X4); \ _x4 = read_ctx_reg(regs, CTX_GPREG_X4); \
} while (false) } while (false)
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* SMCCC_HELPERS_H */ #endif /* SMCCC_HELPERS_H */

4
include/bl1/bl1.h
View file

@ -61,7 +61,7 @@
#define is_fwu_fid(_fid) \ #define is_fwu_fid(_fid) \
((_fid >= FWU_SMC_FID_START) && (_fid <= FWU_SMC_FID_END)) ((_fid >= FWU_SMC_FID_START) && (_fid <= FWU_SMC_FID_END))
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <lib/cassert.h> #include <lib/cassert.h>
@ -98,5 +98,5 @@ CASSERT(FWU_NUM_SMC_CALLS == \
void bl1_calc_bl2_mem_layout(const meminfo_t *bl1_mem_layout, void bl1_calc_bl2_mem_layout(const meminfo_t *bl1_mem_layout,
meminfo_t *bl2_mem_layout); meminfo_t *bl2_mem_layout);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* BL1_H */ #endif /* BL1_H */

4
include/bl31/ehf.h
View file

@ -7,7 +7,7 @@
#ifndef EHF_H #ifndef EHF_H
#define EHF_H #define EHF_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <cdefs.h> #include <cdefs.h>
#include <stdint.h> #include <stdint.h>
@ -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); void ehf_allow_ns_preemption(uint64_t preempt_ret_code);
unsigned int ehf_is_ns_preemption_allowed(void); unsigned int ehf_is_ns_preemption_allowed(void);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* EHF_H */ #endif /* EHF_H */

4
include/bl31/interrupt_mgmt.h
View file

@ -79,7 +79,7 @@
#define get_interrupt_src_ss(flag) (((flag) >> INTR_SRC_SS_FLAG_SHIFT) & \ #define get_interrupt_src_ss(flag) (((flag) >> INTR_SRC_SS_FLAG_SHIFT) & \
INTR_SRC_SS_FLAG_MASK) INTR_SRC_SS_FLAG_MASK)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <errno.h> #include <errno.h>
#include <stdint.h> #include <stdint.h>
@ -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 disable_intr_rm_local(uint32_t type, uint32_t security_state);
int enable_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 */ #endif /* INTERRUPT_MGMT_H */

4
include/bl32/tsp/tsp.h
View file

@ -84,7 +84,7 @@
#define TOS_CALL_VERSION 0xbf00ff03 /* Trusted OS Call Version */ #define TOS_CALL_VERSION 0xbf00ff03 /* Trusted OS Call Version */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -106,6 +106,6 @@ typedef struct tsp_vectors {
void tsp_setup(void); void tsp_setup(void);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* TSP_H */ #endif /* TSP_H */

8
include/common/bl_common.h
View file

@ -11,11 +11,11 @@
#include <common/param_header.h> #include <common/param_header.h>
#include <lib/utils_def.h> #include <lib/utils_def.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <lib/cassert.h> #include <lib/cassert.h>
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#include <export/common/bl_common_exp.h> #include <export/common/bl_common_exp.h>
@ -91,7 +91,7 @@
#define __TEXT_END__ Load$$__TEXT_EPILOGUE__$$Base #define __TEXT_END__ Load$$__TEXT_EPILOGUE__$$Base
#endif /* USE_ARM_LINK */ #endif /* USE_ARM_LINK */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
/* /*
* Declarations of linker defined symbols to help determine memory layout of * 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); void bl_handle_pauth(void);
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* BL_COMMON_H */ #endif /* BL_COMMON_H */

4
include/common/debug.h
View file

@ -27,7 +27,7 @@
#define LOG_LEVEL_INFO U(40) #define LOG_LEVEL_INFO U(40)
#define LOG_LEVEL_VERBOSE U(50) #define LOG_LEVEL_VERBOSE U(50)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <cdefs.h> #include <cdefs.h>
#include <stdarg.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(const char *fmt, ...) __printflike(1, 2);
void tf_log_set_max_level(unsigned int log_level); void tf_log_set_max_level(unsigned int log_level);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* DEBUG_H */ #endif /* DEBUG_H */

8
include/common/ep_info.h
View file

@ -9,10 +9,10 @@
#include <common/param_header.h> #include <common/param_header.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
#include <lib/cassert.h> #include <lib/cassert.h>
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#include <export/common/ep_info_exp.h> #include <export/common/ep_info_exp.h>
@ -30,7 +30,7 @@
#define SET_SECURITY_STATE(x, security) \ #define SET_SECURITY_STATE(x, security) \
((x) = ((x) & ~EP_SECURITY_MASK) | (security)) ((x) = ((x) & ~EP_SECURITY_MASK) | (security))
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
/* /*
* Compile time assertions related to the 'entry_point_info' structure to * 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), \ __builtin_offsetof(entry_point_info_t, pc), \
assert_entrypoint_and_spsr_should_be_adjacent); assert_entrypoint_and_spsr_should_be_adjacent);
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* EP_INFO_H */ #endif /* EP_INFO_H */

4
include/common/interrupt_props.h
View file

@ -7,7 +7,7 @@
#ifndef INTERRUPT_PROPS_H #ifndef INTERRUPT_PROPS_H
#define INTERRUPT_PROPS_H #define INTERRUPT_PROPS_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
/* Create an interrupt property descriptor from various interrupt properties */ /* Create an interrupt property descriptor from various interrupt properties */
#define INTR_PROP_DESC(num, pri, grp, cfg) \ #define INTR_PROP_DESC(num, pri, grp, cfg) \
@ -25,5 +25,5 @@ typedef struct interrupt_prop {
unsigned int intr_cfg:2; unsigned int intr_cfg:2;
} interrupt_prop_t; } interrupt_prop_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* INTERRUPT_PROPS_H */ #endif /* INTERRUPT_PROPS_H */

4
include/common/param_header.h
View file

@ -9,9 +9,9 @@
#include <stdbool.h> #include <stdbool.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#include <export/common/param_header_exp.h> #include <export/common/param_header_exp.h>

4
include/common/runtime_svc.h
View file

@ -39,7 +39,7 @@
*/ */
#define MAX_RT_SVCS U(128) #define MAX_RT_SVCS U(128)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
/* Prototype for runtime service initializing function */ /* Prototype for runtime service initializing function */
typedef int32_t (*rt_svc_init_t)(void); 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]; extern uint8_t rt_svc_descs_indices[MAX_RT_SVCS];
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* RUNTIME_SVC_H */ #endif /* RUNTIME_SVC_H */

4
include/drivers/arm/cci.h
View file

@ -100,7 +100,7 @@
#define SLAVE_IF_UNUSED -1 #define SLAVE_IF_UNUSED -1
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -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_enable_snoop_dvm_reqs(unsigned int master_id);
void cci_disable_snoop_dvm_reqs(unsigned int master_id); void cci_disable_snoop_dvm_reqs(unsigned int master_id);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* CCI_H */ #endif /* CCI_H */

4
include/drivers/arm/ccn.h
View file

@ -46,7 +46,7 @@
*/ */
#define CCN_GET_RUN_STATE(pstate) (pstate & 0xf) #define CCN_GET_RUN_STATE(pstate) (pstate & 0xf)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
/* /*
@ -109,5 +109,5 @@ unsigned long long ccn_read_node_reg(node_types_t node_type,
unsigned int node_id, unsigned int node_id,
unsigned int reg_offset); unsigned int reg_offset);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* CCN_H */ #endif /* CCN_H */

4
include/drivers/arm/css/sds.h
View file

@ -70,7 +70,7 @@
#define SDS_ERR_STRUCT_NOT_FOUND -3 #define SDS_ERR_STRUCT_NOT_FOUND -3
#define SDS_ERR_STRUCT_NOT_FINALIZED -4 #define SDS_ERR_STRUCT_NOT_FINALIZED -4
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
@ -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); size_t size, sds_access_mode_t mode);
int sds_struct_write(uint32_t structure_id, unsigned int fld_off, void *data, int sds_struct_write(uint32_t structure_id, unsigned int fld_off, void *data,
size_t size, sds_access_mode_t mode); size_t size, sds_access_mode_t mode);
#endif /*__ASSEMBLY__ */ #endif /*__ASSEMBLER__ */
#endif /* SDS_H */ #endif /* SDS_H */

4
include/drivers/arm/fvp/fvp_pwrc.h
View file

@ -35,7 +35,7 @@
#define PSYSR_INVALID U(0xffffffff) #define PSYSR_INVALID U(0xffffffff)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -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_read_psysr(u_register_t mpidr);
unsigned int fvp_pwrc_get_cpu_wkr(u_register_t mpidr); unsigned int fvp_pwrc_get_cpu_wkr(u_register_t mpidr);
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* FVP_PWRC_H */ #endif /* FVP_PWRC_H */

4
include/drivers/arm/gicv2.h
View file

@ -116,7 +116,7 @@
/* Interrupt ID mask for HPPIR, AHPPIR, IAR and AIAR CPU Interface registers */ /* Interrupt ID mask for HPPIR, AHPPIR, IAR and AIAR CPU Interface registers */
#define INT_ID_MASK U(0x3ff) #define INT_ID_MASK U(0x3ff)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <cdefs.h> #include <cdefs.h>
#include <stdint.h> #include <stdint.h>
@ -184,5 +184,5 @@ void gicv2_clear_interrupt_pending(unsigned int id);
unsigned int gicv2_set_pmr(unsigned int mask); unsigned int gicv2_set_pmr(unsigned int mask);
void gicv2_interrupt_set_cfg(unsigned int id, unsigned int cfg); void gicv2_interrupt_set_cfg(unsigned int id, unsigned int cfg);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* GICV2_H */ #endif /* GICV2_H */

4
include/drivers/arm/gicv3.h
View file

@ -208,7 +208,7 @@
#define GITS_CTLR_QUIESCENT_SHIFT 31 #define GITS_CTLR_QUIESCENT_SHIFT 31
#define GITS_CTLR_QUIESCENT_BIT BIT_32(GITS_CTLR_QUIESCENT_SHIFT) #define GITS_CTLR_QUIESCENT_BIT BIT_32(GITS_CTLR_QUIESCENT_SHIFT)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
@ -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); void gicv3_clear_interrupt_pending(unsigned int id, unsigned int proc_num);
unsigned int gicv3_set_pmr(unsigned int mask); unsigned int gicv3_set_pmr(unsigned int mask);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* GICV3_H */ #endif /* GICV3_H */

4
include/drivers/arm/pl011.h
View file

@ -83,7 +83,7 @@
#define CONSOLE_T_PL011_BASE CONSOLE_T_DRVDATA #define CONSOLE_T_PL011_BASE CONSOLE_T_DRVDATA
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -101,6 +101,6 @@ typedef struct {
int console_pl011_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, int console_pl011_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud,
console_pl011_t *console); console_pl011_t *console);
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* PL011_H */ #endif /* PL011_H */

4
include/drivers/arm/sp805.h
View file

@ -21,7 +21,7 @@
#define SP805_CTR_RESEN (U(1) << 1) #define SP805_CTR_RESEN (U(1) << 1)
#define SP805_CTR_INTEN (U(1) << 0) #define SP805_CTR_INTEN (U(1) << 0)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -31,6 +31,6 @@ void sp805_start(uintptr_t base, unsigned int ticks);
void sp805_stop(uintptr_t base); void sp805_stop(uintptr_t base);
void sp805_refresh(uintptr_t base, unsigned int ticks); void sp805_refresh(uintptr_t base, unsigned int ticks);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* SP805_H */ #endif /* SP805_H */

4
include/drivers/arm/tzc400.h
View file

@ -93,7 +93,7 @@
#define TZC_400_REGION_SIZE U(0x20) #define TZC_400_REGION_SIZE U(0x20)
#define TZC_400_ACTION_OFF U(0x4) #define TZC_400_ACTION_OFF U(0x4)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <cdefs.h> #include <cdefs.h>
#include <stdint.h> #include <stdint.h>
@ -154,6 +154,6 @@ static inline void tzc_disable_filters(void)
tzc400_disable_filters(); tzc400_disable_filters();
} }
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* TZC400_H */ #endif /* TZC400_H */

4
include/drivers/arm/tzc_dmc500.h
View file

@ -121,7 +121,7 @@
/* Length of registers for configuring each region */ /* Length of registers for configuring each region */
#define TZC_DMC500_REGION_SIZE U(0x018) #define TZC_DMC500_REGION_SIZE U(0x018)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -147,5 +147,5 @@ void tzc_dmc500_config_complete(void);
int tzc_dmc500_verify_complete(void); int tzc_dmc500_verify_complete(void);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* TZC_DMC500_H */ #endif /* TZC_DMC500_H */

2
include/drivers/auth/mbedtls/mbedtls_config.h
View file

@ -86,7 +86,7 @@
/* Memory buffer allocator options */ /* Memory buffer allocator options */
#define MBEDTLS_MEMORY_ALIGN_MULTIPLE 8 #define MBEDTLS_MEMORY_ALIGN_MULTIPLE 8
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
/* System headers required to build mbed TLS with the current configuration */ /* System headers required to build mbed TLS with the current configuration */
#include <stdlib.h> #include <stdlib.h>
#include "mbedtls/check_config.h" #include "mbedtls/check_config.h"

4
include/drivers/cadence/cdns_uart.h
View file

@ -27,7 +27,7 @@
#define CONSOLE_T_CDNS_BASE CONSOLE_T_DRVDATA #define CONSOLE_T_CDNS_BASE CONSOLE_T_DRVDATA
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -45,6 +45,6 @@ typedef struct {
int console_cdns_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, int console_cdns_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud,
console_cdns_t *console); console_cdns_t *console);
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* CDNS_UART_H */ #endif /* CDNS_UART_H */

4
include/drivers/console.h
View file

@ -28,7 +28,7 @@
/* Returned by console_xxx() if no registered console implements xxx. */ /* Returned by console_xxx() if no registered console implements xxx. */
#define ERROR_NO_VALID_CONSOLE (-128) #define ERROR_NO_VALID_CONSOLE (-128)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -75,6 +75,6 @@ int console_getc(void);
/* Flush all consoles registered for the current state. */ /* Flush all consoles registered for the current state. */
int console_flush(void); int console_flush(void);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* CONSOLE_H */ #endif /* CONSOLE_H */

2
include/drivers/marvell/cache_llc.h
View file

@ -27,7 +27,7 @@
#define LLC_EXCLUSIVE_EN 0x100 #define LLC_EXCLUSIVE_EN 0x100
#define LLC_WAY_MASK 0xFFFFFFFF #define LLC_WAY_MASK 0xFFFFFFFF
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
void llc_cache_sync(int ap_index); void llc_cache_sync(int ap_index);
void llc_flush_all(int ap_index); void llc_flush_all(int ap_index);
void llc_clean_all(int ap_index); void llc_clean_all(int ap_index);

4
include/drivers/marvell/ccu.h
View file

@ -10,7 +10,7 @@
#ifndef CCU_H #ifndef CCU_H
#define CCU_H #define CCU_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <drivers/marvell/addr_map.h> #include <drivers/marvell/addr_map.h>
#endif #endif
@ -36,7 +36,7 @@
#define CCU_SRAM_WIN_CR CCU_WIN_CR_OFFSET(MVEBU_AP0, 1) #define CCU_SRAM_WIN_CR CCU_WIN_CR_OFFSET(MVEBU_AP0, 1)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
int init_ccu(int); int init_ccu(int);
void ccu_win_check(struct addr_map_win *win); 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); void ccu_enable_win(int ap_index, struct addr_map_win *win, uint32_t win_id);

4
include/drivers/marvell/uart/a3700_console.h
View file

@ -56,7 +56,7 @@
#define CONSOLE_T_A3700_BASE CONSOLE_T_DRVDATA #define CONSOLE_T_A3700_BASE CONSOLE_T_DRVDATA
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -74,6 +74,6 @@ typedef struct {
int console_a3700_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, int console_a3700_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud,
console_a3700_t *console); console_a3700_t *console);
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* A3700_CONSOLE_H */ #endif /* A3700_CONSOLE_H */

4
include/drivers/meson/meson_console.h
View file

@ -11,7 +11,7 @@
#define CONSOLE_T_MESON_BASE CONSOLE_T_DRVDATA #define CONSOLE_T_MESON_BASE CONSOLE_T_DRVDATA
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -32,6 +32,6 @@ typedef struct {
int console_meson_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, int console_meson_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud,
console_meson_t *console); console_meson_t *console);
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* MESON_CONSOLE_H */ #endif /* MESON_CONSOLE_H */

4
include/drivers/renesas/rcar/console/console.h
View file

@ -9,7 +9,7 @@
#define CONSOLE_T_RCAR_BASE CONSOLE_T_DRVDATA #define CONSOLE_T_RCAR_BASE CONSOLE_T_DRVDATA
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -27,6 +27,6 @@ typedef struct {
int console_rcar_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, int console_rcar_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud,
console_rcar_t *console); console_rcar_t *console);
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* RCAR_PRINTF_H */ #endif /* RCAR_PRINTF_H */

4
include/drivers/st/stm32_console.h
View file

@ -11,7 +11,7 @@
#define CONSOLE_T_STM32_BASE CONSOLE_T_DRVDATA #define CONSOLE_T_STM32_BASE CONSOLE_T_DRVDATA
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -29,6 +29,6 @@ struct console_stm32 {
int console_stm32_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, int console_stm32_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud,
struct console_stm32 *console); struct console_stm32 *console);
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* STM32_CONSOLE_H */ #endif /* STM32_CONSOLE_H */

4
include/drivers/st/stm32_gpio.h
View file

@ -45,13 +45,13 @@
#define GPIO_PULL_DOWN 0x02 #define GPIO_PULL_DOWN 0x02
#define GPIO_PULL_MASK U(0x03) #define GPIO_PULL_MASK U(0x03)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
int dt_set_pinctrl_config(int node); int dt_set_pinctrl_config(int node);
void set_gpio(uint32_t bank, uint32_t pin, uint32_t mode, uint32_t speed, void set_gpio(uint32_t bank, uint32_t pin, uint32_t mode, uint32_t speed,
uint32_t pull, uint32_t alternate, uint8_t status); uint32_t pull, uint32_t alternate, uint8_t status);
void set_gpio_secure_cfg(uint32_t bank, uint32_t pin, bool secure); void set_gpio_secure_cfg(uint32_t bank, uint32_t pin, bool secure);
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* STM32_GPIO_H */ #endif /* STM32_GPIO_H */

4
include/drivers/ti/uart/uart_16550.h
View file

@ -73,7 +73,7 @@
#define CONSOLE_T_16550_BASE CONSOLE_T_DRVDATA #define CONSOLE_T_16550_BASE CONSOLE_T_DRVDATA
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -91,6 +91,6 @@ typedef struct {
int console_16550_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, int console_16550_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud,
console_16550_t *console); console_16550_t *console);
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* UART_16550_H */ #endif /* UART_16550_H */

4
include/lib/bakery_lock.h
View file

@ -11,7 +11,7 @@
#define BAKERY_LOCK_MAX_CPUS PLATFORM_CORE_COUNT #define BAKERY_LOCK_MAX_CPUS PLATFORM_CORE_COUNT
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <cdefs.h> #include <cdefs.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
@ -101,5 +101,5 @@ void bakery_lock_release(bakery_lock_t *bakery);
#define DECLARE_BAKERY_LOCK(_name) extern bakery_lock_t _name #define DECLARE_BAKERY_LOCK(_name) extern bakery_lock_t _name
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* BAKERY_LOCK_H */ #endif /* BAKERY_LOCK_H */

2
include/lib/cpus/aarch32/cortex_a9.h
View file

@ -25,7 +25,7 @@
******************************************************************************/ ******************************************************************************/
#define PCR p15, 0, c15, c0, 0 #define PCR p15, 0, c15, c0, 0
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <arch_helpers.h> #include <arch_helpers.h>
DEFINE_COPROCR_RW_FUNCS(pcr, PCR) DEFINE_COPROCR_RW_FUNCS(pcr, PCR)
#endif #endif

4
include/lib/cpus/aarch64/cortex_a75.h
View file

@ -41,7 +41,7 @@
#define CORTEX_A75_AMU_GROUP0_MASK U(0x7) #define CORTEX_A75_AMU_GROUP0_MASK U(0x7)
#define CORTEX_A75_AMU_GROUP1_MASK (U(0) << 3) #define CORTEX_A75_AMU_GROUP1_MASK (U(0) << 3)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
uint64_t cortex_a75_amu_cnt_read(int idx); 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); unsigned int cortex_a75_amu_read_cpuamcntenclr_el0(void);
void cortex_a75_amu_write_cpuamcntenset_el0(unsigned int mask); void cortex_a75_amu_write_cpuamcntenset_el0(unsigned int mask);
void cortex_a75_amu_write_cpuamcntenclr_el0(unsigned int mask); void cortex_a75_amu_write_cpuamcntenclr_el0(unsigned int mask);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* CORTEX_A75_H */ #endif /* CORTEX_A75_H */

4
include/lib/cpus/aarch64/cpuamu.h
View file

@ -29,7 +29,7 @@
#define CPUAMEVTYPER3_EL0 S3_3_C15_C10_3 #define CPUAMEVTYPER3_EL0 S3_3_C15_C10_3
#define CPUAMEVTYPER4_EL0 S3_3_C15_C10_4 #define CPUAMEVTYPER4_EL0 S3_3_C15_C10_4
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
uint64_t cpuamu_cnt_read(unsigned int idx); 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_save(unsigned int nr_counters);
void cpuamu_context_restore(unsigned int nr_counters); void cpuamu_context_restore(unsigned int nr_counters);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* CPUAMU_H */ #endif /* CPUAMU_H */

4
include/lib/cpus/aarch64/denver.h
View file

@ -34,11 +34,11 @@
#define DENVER_CPU_PMSTATE_C7 U(0x7) #define DENVER_CPU_PMSTATE_C7 U(0x7)
#define DENVER_CPU_PMSTATE_MASK U(0xF) #define DENVER_CPU_PMSTATE_MASK U(0xF)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
/* Disable Dynamic Code Optimisation */ /* Disable Dynamic Code Optimisation */
void denver_disable_dco(void); void denver_disable_dco(void);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* DENVER_H */ #endif /* DENVER_H */

4
include/lib/cpus/errata_report.h
View file

@ -7,7 +7,7 @@
#ifndef ERRATA_REPORT_H #ifndef ERRATA_REPORT_H
#define ERRATA_REPORT_H #define ERRATA_REPORT_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <arch.h> #include <arch.h>
#include <arch_helpers.h> #include <arch_helpers.h>
@ -23,7 +23,7 @@ static inline void print_errata_status(void) {}
void errata_print_msg(unsigned int status, const char *cpu, const char *id); void errata_print_msg(unsigned int status, const char *cpu, const char *id);
int errata_needs_reporting(spinlock_t *lock, uint32_t *reported); int errata_needs_reporting(spinlock_t *lock, uint32_t *reported);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
/* Errata status */ /* Errata status */
#define ERRATA_NOT_APPLIES 0 #define ERRATA_NOT_APPLIES 0

4
include/lib/el3_runtime/aarch32/context.h
View file

@ -24,7 +24,7 @@
#define CTX_NS_SCTLR U(0x1C) #define CTX_NS_SCTLR U(0x1C)
#define CTX_REGS_END U(0x20) #define CTX_REGS_END U(0x20)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -65,6 +65,6 @@ typedef struct cpu_context {
CASSERT(CTX_REGS_OFFSET == __builtin_offsetof(cpu_context_t, regs_ctx), \ CASSERT(CTX_REGS_OFFSET == __builtin_offsetof(cpu_context_t, regs_ctx), \
assert_core_context_regs_offset_mismatch); assert_core_context_regs_offset_mismatch);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* CONTEXT_H */ #endif /* CONTEXT_H */

4
include/lib/el3_runtime/aarch64/context.h
View file

@ -207,7 +207,7 @@
#define CTX_PAUTH_REGS_END U(0) #define CTX_PAUTH_REGS_END U(0)
#endif /* CTX_INCLUDE_PAUTH_REGS */ #endif /* CTX_INCLUDE_PAUTH_REGS */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -384,6 +384,6 @@ void fpregs_context_save(fp_regs_t *regs);
void fpregs_context_restore(fp_regs_t *regs); void fpregs_context_restore(fp_regs_t *regs);
#endif #endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* CONTEXT_H */ #endif /* CONTEXT_H */

4
include/lib/el3_runtime/cpu_data.h
View file

@ -49,7 +49,7 @@
#define CPU_DATA_PMF_TS0_IDX 0 #define CPU_DATA_PMF_TS0_IDX 0
#endif #endif
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <arch_helpers.h> #include <arch_helpers.h>
#include <lib/cassert.h> #include <lib/cassert.h>
@ -161,5 +161,5 @@ void init_cpu_ops(void);
sizeof(((cpu_data_t *)0)->_m)) sizeof(((cpu_data_t *)0)->_m))
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* CPU_DATA_H */ #endif /* CPU_DATA_H */

4
include/lib/extensions/ras.h
View file

@ -68,7 +68,7 @@
.num_intrs = ARRAY_SIZE(_array), \ .num_intrs = ARRAY_SIZE(_array), \
} }
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <assert.h> #include <assert.h>
@ -196,6 +196,6 @@ int ras_ea_handler(unsigned int ea_reason, uint64_t syndrome, void *cookie,
void *handle, uint64_t flags); void *handle, uint64_t flags);
void ras_init(void); void ras_init(void);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* RAS_H */ #endif /* RAS_H */

4
include/lib/extensions/ras_arch.h
View file

@ -178,7 +178,7 @@
/* I/DFSC code for synchronous external abort */ /* I/DFSC code for synchronous external abort */
#define SYNC_EA_FSC 0x10 #define SYNC_EA_FSC 0x10
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <arch.h> #include <arch.h>
#include <arch_helpers.h> #include <arch_helpers.h>
@ -256,6 +256,6 @@ static inline void ser_sys_select_record(unsigned int idx)
/* Library functions to probe Standard Error Record */ /* 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_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); int ser_probe_sysreg(unsigned int idx_start, unsigned int num_idx, int *probe_data);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* RAS_ARCH_H */ #endif /* RAS_ARCH_H */

4
include/lib/libc/aarch64/setjmp_.h
View file

@ -18,13 +18,13 @@
#define JMP_SIZE (JMP_CTX_END >> 3) #define JMP_SIZE (JMP_CTX_END >> 3)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <cdefs.h> #include <cdefs.h>
/* Jump buffer hosting x18 - x30 and sp_el0 registers */ /* Jump buffer hosting x18 - x30 and sp_el0 registers */
typedef uint64_t jmp_buf[JMP_SIZE] __aligned(16); typedef uint64_t jmp_buf[JMP_SIZE] __aligned(16);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* SETJMP__H */ #endif /* SETJMP__H */

4
include/lib/libc/setjmp.h
View file

@ -9,12 +9,12 @@
#include <setjmp_.h> #include <setjmp_.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <cdefs.h> #include <cdefs.h>
int setjmp(jmp_buf env); int setjmp(jmp_buf env);
__dead2 void longjmp(jmp_buf env, int val); __dead2 void longjmp(jmp_buf env, int val);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* SETJMP_H */ #endif /* SETJMP_H */

4
include/lib/libfdt/fdt.h
View file

@ -52,7 +52,7 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
struct fdt_header { struct fdt_header {
fdt32_t magic; /* magic word FDT_MAGIC */ fdt32_t magic; /* magic word FDT_MAGIC */
@ -90,7 +90,7 @@ struct fdt_property {
char data[0]; char data[0];
}; };
#endif /* !__ASSEMBLY */ #endif /* !__ASSEMBLER__ */
#define FDT_MAGIC 0xd00dfeed /* 4: version, 4: total size */ #define FDT_MAGIC 0xd00dfeed /* 4: version, 4: total size */
#define FDT_TAGSIZE sizeof(fdt32_t) #define FDT_TAGSIZE sizeof(fdt32_t)

4
include/lib/psci/psci.h
View file

@ -166,7 +166,7 @@
#define PSCI_RESET2_TYPE_ARCH (U(0) << PSCI_RESET2_TYPE_VENDOR_SHIFT) #define PSCI_RESET2_TYPE_ARCH (U(0) << PSCI_RESET2_TYPE_VENDOR_SHIFT)
#define PSCI_RESET2_SYSTEM_WARM_RESET (PSCI_RESET2_TYPE_ARCH | U(0)) #define PSCI_RESET2_SYSTEM_WARM_RESET (PSCI_RESET2_TYPE_ARCH | U(0))
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -348,6 +348,6 @@ int psci_features(unsigned int psci_fid);
void __dead2 psci_power_down_wfi(void); void __dead2 psci_power_down_wfi(void);
void psci_arch_setup(void); void psci_arch_setup(void);
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* PSCI_H */ #endif /* PSCI_H */

4
include/lib/psci/psci_lib.h
View file

@ -9,7 +9,7 @@
#include <common/ep_info.h> #include <common/ep_info.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <cdefs.h> #include <cdefs.h>
#include <stdint.h> #include <stdint.h>
@ -89,6 +89,6 @@ void psci_warmboot_entrypoint(void);
void psci_register_spd_pm_hook(const spd_pm_ops_t *pm); void psci_register_spd_pm_hook(const spd_pm_ops_t *pm);
void psci_prepare_next_non_secure_ctx( void psci_prepare_next_non_secure_ctx(
entry_point_info_t *next_image_info); entry_point_info_t *next_image_info);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* PSCI_LIB_H */ #endif /* PSCI_LIB_H */

4
include/lib/runtime_instr.h
View file

@ -17,9 +17,9 @@
#define RT_INSTR_EXIT_CFLUSH U(5) #define RT_INSTR_EXIT_CFLUSH U(5)
#define RT_INSTR_TOTAL_IDS U(6) #define RT_INSTR_TOTAL_IDS U(6)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
PMF_DECLARE_CAPTURE_TIMESTAMP(rt_instr_svc) PMF_DECLARE_CAPTURE_TIMESTAMP(rt_instr_svc)
PMF_DECLARE_GET_TIMESTAMP(rt_instr_svc) PMF_DECLARE_GET_TIMESTAMP(rt_instr_svc)
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* RUNTIME_INSTR_H */ #endif /* RUNTIME_INSTR_H */

4
include/lib/smccc.h
View file

@ -87,7 +87,7 @@
#define SMC_FROM_SECURE (U(0) << 0) #define SMC_FROM_SECURE (U(0) << 0)
#define SMC_FROM_NON_SECURE (U(1) << 0) #define SMC_FROM_NON_SECURE (U(1) << 0)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -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], \ smc_uuid_word((_uuid).node[2], (_uuid).node[3], \
(_uuid).node[4], (_uuid).node[5])) (_uuid).node[4], (_uuid).node[5]))
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* SMCCC_H */ #endif /* SMCCC_H */

2
include/lib/spinlock.h
View file

@ -7,7 +7,7 @@
#ifndef SPINLOCK_H #ifndef SPINLOCK_H
#define SPINLOCK_H #define SPINLOCK_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>

4
include/lib/utils.h
View file

@ -11,7 +11,7 @@
* C code should be put in this part of the header to avoid breaking ASM files * C code should be put in this part of the header to avoid breaking ASM files
* or linker scripts including it. * or linker scripts including it.
*/ */
#if !(defined(__LINKER__) || defined(__ASSEMBLY__)) #if !(defined(__LINKER__) || defined(__ASSEMBLER__))
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
@ -91,6 +91,6 @@ static inline u_register_t load_addr_## _name(void) \
/* Helper to invoke the function defined by DEFINE_LOAD_SYM_ADDR() */ /* Helper to invoke the function defined by DEFINE_LOAD_SYM_ADDR() */
#define LOAD_ADDR_OF(_name) (typeof(_name) *) load_addr_## _name() #define LOAD_ADDR_OF(_name) (typeof(_name) *) load_addr_## _name()
#endif /* !(defined(__LINKER__) || defined(__ASSEMBLY__)) */ #endif /* !(defined(__LINKER__) || defined(__ASSEMBLER__)) */
#endif /* UTILS_H */ #endif /* UTILS_H */

2
include/lib/utils_def.h
View file

@ -32,7 +32,7 @@
* position @h. For example * position @h. For example
* GENMASK_64(39, 21) gives us the 64bit vector 0x000000ffffe00000. * 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) \ #define GENMASK_32(h, l) \
(((0xFFFFFFFF) << (l)) & (0xFFFFFFFF >> (32 - 1 - (h)))) (((0xFFFFFFFF) << (l)) & (0xFFFFFFFF >> (32 - 1 - (h))))

4
include/lib/xlat_tables/xlat_mmu_helpers.h
View file

@ -50,7 +50,7 @@
#define MMU_CFG_TTBR0 2 #define MMU_CFG_TTBR0 2
#define MMU_CFG_PARAM_MAX 3 #define MMU_CFG_PARAM_MAX 3
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
@ -86,6 +86,6 @@ void enable_mmu_direct_el3(unsigned int flags);
bool xlat_arch_is_granule_size_supported(size_t size); bool xlat_arch_is_granule_size_supported(size_t size);
size_t xlat_arch_get_max_supported_granule_size(void); size_t xlat_arch_get_max_supported_granule_size(void);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* XLAT_MMU_HELPERS_H */ #endif /* XLAT_MMU_HELPERS_H */

4
include/lib/xlat_tables/xlat_tables.h
View file

@ -9,7 +9,7 @@
#include <lib/xlat_tables/xlat_tables_defs.h> #include <lib/xlat_tables/xlat_tables_defs.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
@ -88,5 +88,5 @@ void mmap_add_region(unsigned long long base_pa, uintptr_t base_va,
size_t size, unsigned int attr); size_t size, unsigned int attr);
void mmap_add(const mmap_region_t *mm); void mmap_add(const mmap_region_t *mm);
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* XLAT_TABLES_H */ #endif /* XLAT_TABLES_H */

4
include/lib/xlat_tables/xlat_tables_v2.h
View file

@ -10,7 +10,7 @@
#include <lib/xlat_tables/xlat_tables_defs.h> #include <lib/xlat_tables/xlat_tables_defs.h>
#include <lib/xlat_tables/xlat_tables_v2_helpers.h> #include <lib/xlat_tables/xlat_tables_v2_helpers.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
@ -364,5 +364,5 @@ int xlat_get_mem_attributes_ctx(const xlat_ctx_t *ctx, uintptr_t base_va,
uint32_t *attr); uint32_t *attr);
int xlat_get_mem_attributes(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 */ #endif /* XLAT_TABLES_V2_H */

4
include/lib/xlat_tables/xlat_tables_v2_helpers.h
View file

@ -16,7 +16,7 @@
#error "Do not include this header file directly. Include xlat_tables_v2.h instead." #error "Do not include this header file directly. Include xlat_tables_v2.h instead."
#endif #endif
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdbool.h> #include <stdbool.h>
#include <stddef.h> #include <stddef.h>
@ -160,6 +160,6 @@ struct xlat_ctx {
.initialized = false, \ .initialized = false, \
} }
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* XLAT_TABLES_V2_HELPERS_H */ #endif /* XLAT_TABLES_V2_HELPERS_H */

4
include/plat/arm/board/common/board_css_def.h
View file

@ -29,7 +29,7 @@
#define BOARD_CSS_PLAT_TYPE_EMULATOR 0x02 #define BOARD_CSS_PLAT_TYPE_EMULATOR 0x02
#define BOARD_CSS_PLAT_TYPE_FVP 0x03 #define BOARD_CSS_PLAT_TYPE_FVP 0x03
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <lib/mmio.h> #include <lib/mmio.h>
@ -37,7 +37,7 @@
((mmio_read_32(addr) & BOARD_CSS_PLAT_ID_REG_ID_MASK) \ ((mmio_read_32(addr) & BOARD_CSS_PLAT_ID_REG_ID_MASK) \
>> BOARD_CSS_PLAT_ID_REG_ID_SHIFT) >> BOARD_CSS_PLAT_ID_REG_ID_SHIFT)
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#define MAX_IO_DEVICES 3 #define MAX_IO_DEVICES 3

4
include/plat/arm/css/common/css_def.h
View file

@ -136,7 +136,7 @@
#define SPIDEN_INT_CLR_SHIFT 6 #define SPIDEN_INT_CLR_SHIFT 6
#define SPIDEN_SEL_SET_SHIFT 7 #define SPIDEN_SEL_SET_SHIFT 7
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
/* SSC_VERSION related accessors */ /* SSC_VERSION related accessors */
@ -150,7 +150,7 @@
(((val) >> SSC_VERSION_CONFIG_SHIFT) & \ (((val) >> SSC_VERSION_CONFIG_SHIFT) & \
SSC_VERSION_CONFIG_MASK) SSC_VERSION_CONFIG_MASK)
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
/************************************************************************* /*************************************************************************
* Required platform porting definitions common to all * Required platform porting definitions common to all

4
include/services/spm_svc.h
View file

@ -63,7 +63,7 @@
#endif /* SPM_MM */ #endif /* SPM_MM */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -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 /* SPM_MM */
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* SPM_SVC_H */ #endif /* SPM_SVC_H */

2
lib/romlib/Makefile
View file

@ -15,7 +15,7 @@ LIB_DIR = ../../$(BUILD_PLAT)/lib
WRAPPER_DIR = ../../$(BUILD_PLAT)/libwrapper WRAPPER_DIR = ../../$(BUILD_PLAT)/libwrapper
LIBS = -lmbedtls -lfdt -lc LIBS = -lmbedtls -lfdt -lc
INC = $(INCLUDES:-I%=-I../../%) 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 OBJS = $(BUILD_DIR)/jmptbl.o $(BUILD_DIR)/init.o
MAPFILE = ../../$(BUILD_PLAT)/romlib/romlib.map MAPFILE = ../../$(BUILD_PLAT)/romlib/romlib.map

2
make_helpers/build_macros.mk
View file

@ -273,7 +273,7 @@ $(eval IMAGE := IMAGE_BL$(call uppercase,$(3)))
$(1): $(2) $(filter-out %.d,$(MAKEFILE_LIST)) | bl$(3)_dirs $(1): $(2) $(filter-out %.d,$(MAKEFILE_LIST)) | bl$(3)_dirs
$$(ECHO) " PP $$<" $$(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) -include $(DEP)

4
plat/arm/css/sgi/include/sgi_base_platform_def.h
View file

@ -187,7 +187,7 @@
/* Platform ID address */ /* Platform ID address */
#define SSC_VERSION (SSC_REG_BASE + SSC_VERSION_OFFSET) #define SSC_VERSION (SSC_REG_BASE + SSC_VERSION_OFFSET)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
/* SSC_VERSION related accessors */ /* SSC_VERSION related accessors */
/* Returns the part number of the platform */ /* Returns the part number of the platform */
#define GET_SGI_PART_NUM \ #define GET_SGI_PART_NUM \
@ -195,7 +195,7 @@
/* Returns the configuration number of the platform */ /* Returns the configuration number of the platform */
#define GET_SGI_CONFIG_NUM \ #define GET_SGI_CONFIG_NUM \
GET_SSC_VERSION_CONFIG(mmio_read_32(SSC_VERSION)) GET_SSC_VERSION_CONFIG(mmio_read_32(SSC_VERSION))
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
/******************************************************************************* /*******************************************************************************
* Memprotect definitions * Memprotect definitions

4
plat/arm/css/sgm/include/sgm_base_platform_def.h
View file

@ -51,7 +51,7 @@
/* Platform ID address */ /* Platform ID address */
#define SSC_VERSION (SSC_REG_BASE + SSC_VERSION_OFFSET) #define SSC_VERSION (SSC_REG_BASE + SSC_VERSION_OFFSET)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
/* SSC_VERSION related accessors */ /* SSC_VERSION related accessors */
/* Returns the part number of the platform */ /* Returns the part number of the platform */
#define GET_PLAT_PART_NUM \ #define GET_PLAT_PART_NUM \
@ -59,7 +59,7 @@
/* Returns the configuration number of the platform */ /* Returns the configuration number of the platform */
#define GET_PLAT_CONFIG_NUM \ #define GET_PLAT_CONFIG_NUM \
GET_SSC_VERSION_CONFIG(mmio_read_32(SSC_VERSION)) GET_SSC_VERSION_CONFIG(mmio_read_32(SSC_VERSION))
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
/************************************************************************* /*************************************************************************

4
plat/hisilicon/hikey/include/hisi_pwrc.h
View file

@ -7,7 +7,7 @@
#ifndef HISI_PWRC_H #ifndef HISI_PWRC_H
#define HISI_PWRC_H #define HISI_PWRC_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
void hisi_pwrc_set_cluster_wfi(unsigned int id); void hisi_pwrc_set_cluster_wfi(unsigned int id);
void hisi_pwrc_set_core_bx_addr(unsigned int core, void hisi_pwrc_set_core_bx_addr(unsigned int core,
@ -17,6 +17,6 @@ void hisi_pwrc_enable_debug(unsigned int core,
unsigned int cluster); unsigned int cluster);
int hisi_pwrc_setup(void); int hisi_pwrc_setup(void);
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* HISI_PWRC_H */ #endif /* HISI_PWRC_H */

4
plat/imx/common/include/imx8_lpuart.h
View file

@ -50,7 +50,7 @@
#define LPUART_BAUD_BOTHEDGE_MASK (0x20000U) #define LPUART_BAUD_BOTHEDGE_MASK (0x20000U)
#define LPUART_BAUD_M10_MASK (0x20000000U) #define LPUART_BAUD_M10_MASK (0x20000000U)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -61,6 +61,6 @@ typedef struct {
int console_lpuart_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, int console_lpuart_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud,
console_lpuart_t *console); console_lpuart_t *console);
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* IMX8_LPUART_H */ #endif /* IMX8_LPUART_H */

4
plat/imx/common/include/imx_uart.h
View file

@ -9,7 +9,7 @@
#include <drivers/console.h> #include <drivers/console.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
typedef struct { typedef struct {
console_t console; console_t console;
@ -18,6 +18,6 @@ typedef struct {
int console_imx_uart_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, int console_imx_uart_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud,
console_uart_t *console); console_uart_t *console);
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* IMX_UART_H */ #endif /* IMX_UART_H */

4
plat/layerscape/common/include/ls_16550.h
View file

@ -63,7 +63,7 @@
#define CONSOLE_T_16550_BASE CONSOLE_T_DRVDATA #define CONSOLE_T_16550_BASE CONSOLE_T_DRVDATA
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -81,6 +81,6 @@ typedef struct {
int console_ls_16550_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, int console_ls_16550_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud,
console_ls_16550_t *console); console_ls_16550_t *console);
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* LS_16550_H */ #endif /* LS_16550_H */

4
plat/marvell/a3700/common/include/platform_def.h
View file

@ -8,9 +8,9 @@
#ifndef PLATFORM_DEF_H #ifndef PLATFORM_DEF_H
#define PLATFORM_DEF_H #define PLATFORM_DEF_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdio.h> #include <stdio.h>
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#include <board_marvell_def.h> #include <board_marvell_def.h>
#include <mvebu_def.h> #include <mvebu_def.h>

4
plat/marvell/a8k/common/include/platform_def.h
View file

@ -8,9 +8,9 @@
#ifndef PLATFORM_DEF_H #ifndef PLATFORM_DEF_H
#define PLATFORM_DEF_H #define PLATFORM_DEF_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdio.h> #include <stdio.h>
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#include <common/interrupt_props.h> #include <common/interrupt_props.h>
#include <drivers/arm/gic_common.h> #include <drivers/arm/gic_common.h>

4
plat/mediatek/mt8183/drivers/mcsi/mcsi.h
View file

@ -85,7 +85,7 @@
#define CCI_CLK_CTRL (MCUCFG_BASE + 0x660) #define CCI_CLK_CTRL (MCUCFG_BASE + 0x660)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <plat/common/common_def.h> #include <plat/common/common_def.h>
#include <stdint.h> #include <stdint.h>
@ -112,5 +112,5 @@ void cci_secure_switch(unsigned int ns);
void cci_init_sf(void); void cci_init_sf(void);
unsigned long cci_reg_access(unsigned int op, unsigned long offset, unsigned long val); unsigned long cci_reg_access(unsigned int op, unsigned long offset, unsigned long val);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* MCSI_H */ #endif /* MCSI_H */

4
plat/nvidia/tegra/include/drivers/memctrl_v2.h
View file

@ -9,7 +9,7 @@
#include <tegra_def.h> #include <tegra_def.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <lib/mmio.h> #include <lib/mmio.h>
#include <stdint.h> #include <stdint.h>
@ -173,6 +173,6 @@ tegra_mc_settings_t *tegra_get_mc_settings(void);
******************************************************************************/ ******************************************************************************/
void plat_memctrl_tzdram_setup(uint64_t phys_base, uint64_t size_in_bytes); void plat_memctrl_tzdram_setup(uint64_t phys_base, uint64_t size_in_bytes);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* MEMCTRL_V2_H */ #endif /* MEMCTRL_V2_H */

4
plat/nvidia/tegra/include/tegra_platform.h
View file

@ -30,7 +30,7 @@
#define TEGRA_CHIPID_TEGRA21 U(0x21) #define TEGRA_CHIPID_TEGRA21 U(0x21)
#define TEGRA_CHIPID_TEGRA18 U(0x18) #define TEGRA_CHIPID_TEGRA18 U(0x18)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
/* /*
* Tegra chip ID major/minor identifiers * Tegra chip ID major/minor identifiers
@ -57,6 +57,6 @@ bool tegra_platform_is_fpga(void);
bool tegra_platform_is_unit_fpga(void); bool tegra_platform_is_unit_fpga(void);
bool tegra_platform_is_virt_dev_kit(void); bool tegra_platform_is_virt_dev_kit(void);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* TEGRA_PLATFORM_H */ #endif /* TEGRA_PLATFORM_H */

2
plat/renesas/rcar/include/platform_def.h
View file

@ -7,7 +7,7 @@
#ifndef PLATFORM_DEF_H #ifndef PLATFORM_DEF_H
#define PLATFORM_DEF_H #define PLATFORM_DEF_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdlib.h> #include <stdlib.h>
#endif #endif

4
plat/rockchip/common/include/plat_private.h
View file

@ -7,7 +7,7 @@
#ifndef PLAT_PRIVATE_H #ifndef PLAT_PRIVATE_H
#define PLAT_PRIVATE_H #define PLAT_PRIVATE_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -140,7 +140,7 @@ extern const mmap_region_t plat_rk_mmap[];
uint32_t rockchip_get_uart_base(void); uint32_t rockchip_get_uart_base(void);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
/****************************************************************************** /******************************************************************************
* cpu up status * cpu up status

4
plat/rockchip/common/pmusram/cpus_on_fixed_addr.h
View file

@ -26,7 +26,7 @@
#define PM_WARM_BOOT_SHT 0 #define PM_WARM_BOOT_SHT 0
#define PM_WARM_BOOT_BIT (1 << PM_WARM_BOOT_SHT) #define PM_WARM_BOOT_BIT (1 << PM_WARM_BOOT_SHT)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
struct psram_data_t { struct psram_data_t {
uint64_t sp; uint64_t sp;
@ -50,6 +50,6 @@ CASSERT(__builtin_offsetof(struct psram_data_t, boot_mpidr) == PSRAM_DT_MPIDR,
extern void *sys_sleep_flag_sram; extern void *sys_sleep_flag_sram;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif #endif

6
plat/st/stm32mp1/stm32mp1_def.h
View file

@ -14,7 +14,7 @@
#include <lib/utils_def.h> #include <lib/utils_def.h>
#include <lib/xlat_tables/xlat_tables_defs.h> #include <lib/xlat_tables/xlat_tables_defs.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <drivers/st/stm32mp1_clk.h> #include <drivers/st/stm32mp1_clk.h>
#include <boot_api.h> #include <boot_api.h>
@ -40,7 +40,7 @@
#endif #endif
/* DDR power initializations */ /* DDR power initializations */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
enum ddr_type { enum ddr_type {
STM32MP_DDR3, STM32MP_DDR3,
STM32MP_LPDDR2, STM32MP_LPDDR2,
@ -254,7 +254,7 @@ enum ddr_type {
#define TAMP_BASE U(0x5C00A000) #define TAMP_BASE U(0x5C00A000)
#define TAMP_BKP_REGISTER_BASE (TAMP_BASE + U(0x100)) #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) static inline uint32_t tamp_bkpr(uint32_t idx)
{ {
return TAMP_BKP_REGISTER_BASE + (idx << 2); return TAMP_BKP_REGISTER_BASE + (idx << 2);

4
services/spd/opteed/opteed_private.h
View file

@ -79,7 +79,7 @@
#define OPTEED_C_RT_CTX_SIZE 0x60 #define OPTEED_C_RT_CTX_SIZE 0x60
#define OPTEED_C_RT_CTX_ENTRIES (OPTEED_C_RT_CTX_SIZE >> DWORD_SHIFT) #define OPTEED_C_RT_CTX_ENTRIES (OPTEED_C_RT_CTX_SIZE >> DWORD_SHIFT)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -157,6 +157,6 @@ void opteed_init_optee_ep_state(struct entry_point_info *optee_entry_point,
extern optee_context_t opteed_sp_context[OPTEED_CORE_COUNT]; extern optee_context_t opteed_sp_context[OPTEED_CORE_COUNT];
extern uint32_t opteed_rw; extern uint32_t opteed_rw;
extern struct optee_vectors *optee_vector_table; extern struct optee_vectors *optee_vector_table;
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* OPTEED_PRIVATE_H */ #endif /* OPTEED_PRIVATE_H */

4
services/spd/tlkd/tlkd_private.h
View file

@ -71,7 +71,7 @@
#define TLKD_C_RT_CTX_SIZE 0x60 #define TLKD_C_RT_CTX_SIZE 0x60
#define TLKD_C_RT_CTX_ENTRIES (TLKD_C_RT_CTX_SIZE >> DWORD_SHIFT) #define TLKD_C_RT_CTX_ENTRIES (TLKD_C_RT_CTX_SIZE >> DWORD_SHIFT)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -119,6 +119,6 @@ void tlkd_init_tlk_ep_state(struct entry_point_info *tlk_entry_point,
uint64_t pc, uint64_t pc,
tlk_context_t *tlk_ctx); tlk_context_t *tlk_ctx);
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* TLKD_PRIVATE_H */ #endif /* TLKD_PRIVATE_H */

4
services/spd/tspd/tspd_private.h
View file

@ -126,7 +126,7 @@
#define TSPD_SP_CTX_SIZE 0x90 #define TSPD_SP_CTX_SIZE 0x90
#define TSPD_SP_CTX_ENTRIES (TSPD_SP_CTX_SIZE >> DWORD_SHIFT) #define TSPD_SP_CTX_ENTRIES (TSPD_SP_CTX_SIZE >> DWORD_SHIFT)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -227,6 +227,6 @@ uint64_t tspd_handle_sp_preemption(void *handle);
extern tsp_context_t tspd_sp_context[TSPD_CORE_COUNT]; extern tsp_context_t tspd_sp_context[TSPD_CORE_COUNT];
extern tsp_vectors_t *tsp_vectors; extern tsp_vectors_t *tsp_vectors;
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLER__*/
#endif /* TSPD_PRIVATE_H */ #endif /* TSPD_PRIVATE_H */

4
services/std_svc/spm/spm_private.h
View file

@ -32,7 +32,7 @@
/* Value returned by spm_sp_synchronous_entry() when a partition is preempted */ /* Value returned by spm_sp_synchronous_entry() when a partition is preempted */
#define SPM_SECURE_PARTITION_PREEMPTED U(0x1234) #define SPM_SECURE_PARTITION_PREEMPTED U(0x1234)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -114,6 +114,6 @@ int spm_response_add(uint16_t client_id, uint16_t handle, uint32_t token,
int spm_response_get(uint16_t client_id, uint16_t handle, uint32_t token, 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); u_register_t *x1, u_register_t *x2, u_register_t *x3);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* SPM_PRIVATE_H */ #endif /* SPM_PRIVATE_H */

4
services/std_svc/spm_mm/spm_private.h
View file

@ -29,7 +29,7 @@
#define SP_C_RT_CTX_SIZE 0x60 #define SP_C_RT_CTX_SIZE 0x60
#define SP_C_RT_CTX_ENTRIES (SP_C_RT_CTX_SIZE >> DWORD_SHIFT) #define SP_C_RT_CTX_ENTRIES (SP_C_RT_CTX_SIZE >> DWORD_SHIFT)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
@ -66,6 +66,6 @@ int spm_memory_attributes_set_smc_handler(sp_context_t *sp_ctx,
u_register_t pages_count, u_register_t pages_count,
u_register_t smc_attributes); u_register_t smc_attributes);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* SPM_PRIVATE_H */ #endif /* SPM_PRIVATE_H */