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 /plat/imx/common | |
parent | f61469e532c05bfe0de06620e8762db18414a357 (diff) | |
download | trusted-firmware-a-d5dfdeb65ff5b7f24dded201d2945c7b74565ce8.tar.gz |
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 'plat/imx/common')
-rw-r--r-- | plat/imx/common/include/imx8_lpuart.h | 4 | ||||
-rw-r--r-- | plat/imx/common/include/imx_uart.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plat/imx/common/include/imx8_lpuart.h b/plat/imx/common/include/imx8_lpuart.h index 63449e7def..0ea284fdf1 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 <stdint.h> @@ -61,6 +61,6 @@ typedef struct { 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 1b52e2f0b8..cc1b5318ea 100644 --- a/plat/imx/common/include/imx_uart.h +++ b/plat/imx/common/include/imx_uart.h @@ -9,7 +9,7 @@ #include <drivers/console.h> -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ typedef struct { console_t console; @@ -18,6 +18,6 @@ typedef struct { 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 */ |