diff options
| author | Julius Werner <jwerner@chromium.org> | 2019-07-09 13:49:11 -0700 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2019-08-01 13:14:12 -0700 |
| commit | d5dfdeb65ff5b7f24dded201d2945c7b74565ce8 (patch) | |
| tree | c6f6607a5bab02c7497689e043db50fad88158f8 /drivers | |
| parent | f61469e532c05bfe0de06620e8762db18414a357 (diff) | |
Replace __ASSEMBLY__ with compiler-builtin __ASSEMBLER__
NOTE: __ASSEMBLY__ macro is now deprecated in favor of __ASSEMBLER__.
All common C compilers predefine a macro called __ASSEMBLER__ when
preprocessing a .S file. There is no reason for TF-A to define it's own
__ASSEMBLY__ macro for this purpose instead. To unify code with the
export headers (which use __ASSEMBLER__ to avoid one extra dependency),
let's deprecate __ASSEMBLY__ and switch the code base over to the
predefined standard.
Change-Id: Id7d0ec8cf330195da80499c68562b65cb5ab7417
Signed-off-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/arm/css/sds/sds_private.h | 4 | ||||
| -rw-r--r-- | drivers/imx/uart/imx_uart.h | 4 | ||||
| -rw-r--r-- | drivers/renesas/rcar/delay/micro_delay.h | 2 | ||||
| -rw-r--r-- | drivers/renesas/rcar/pwrc/pwrc.c | 2 | ||||
| -rw-r--r-- | drivers/renesas/rcar/pwrc/pwrc.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/drivers/arm/css/sds/sds_private.h b/drivers/arm/css/sds/sds_private.h index 2101dd04..d801a04d 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 <stddef.h> #include <stdint.h> @@ -95,6 +95,6 @@ typedef struct region_descriptor { & 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 b71504c7..4f6d3de2 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 @@ int console_imx_uart_register(uintptr_t baseaddr, 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 193daba6..37b71f80 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 <stdint.h> 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 f4c9d3ab..32e04a73 100644 --- a/drivers/renesas/rcar/pwrc/pwrc.c +++ b/drivers/renesas/rcar/pwrc/pwrc.c @@ -148,7 +148,7 @@ RCAR_INSTANTIATE_LOCK #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 e67c6ef2..2b817839 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); |