From d5dfdeb65ff5b7f24dded201d2945c7b74565ce8 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Tue, 9 Jul 2019 13:49:11 -0700 Subject: Replace __ASSEMBLY__ with compiler-builtin __ASSEMBLER__ NOTE: __ASSEMBLY__ macro is now deprecated in favor of __ASSEMBLER__. All common C compilers predefine a macro called __ASSEMBLER__ when preprocessing a .S file. There is no reason for TF-A to define it's own __ASSEMBLY__ macro for this purpose instead. To unify code with the export headers (which use __ASSEMBLER__ to avoid one extra dependency), let's deprecate __ASSEMBLY__ and switch the code base over to the predefined standard. Change-Id: Id7d0ec8cf330195da80499c68562b65cb5ab7417 Signed-off-by: Julius Werner --- include/drivers/st/stm32_console.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/drivers/st/stm32_console.h') diff --git a/include/drivers/st/stm32_console.h b/include/drivers/st/stm32_console.h index b30376828..a2ad87cb5 100644 --- a/include/drivers/st/stm32_console.h +++ b/include/drivers/st/stm32_console.h @@ -11,7 +11,7 @@ #define CONSOLE_T_STM32_BASE CONSOLE_T_DRVDATA -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -29,6 +29,6 @@ struct console_stm32 { int console_stm32_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, struct console_stm32 *console); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* STM32_CONSOLE_H */ -- cgit v1.2.3