aboutsummaryrefslogtreecommitdiff
path: root/include/drivers/marvell/uart/a3700_console.h
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2019-07-09 13:49:11 -0700
committerJulius Werner <jwerner@chromium.org>2019-08-01 13:14:12 -0700
commitd5dfdeb65ff5b7f24dded201d2945c7b74565ce8 (patch)
treec6f6607a5bab02c7497689e043db50fad88158f8 /include/drivers/marvell/uart/a3700_console.h
parentf61469e532c05bfe0de06620e8762db18414a357 (diff)
downloadtrusted-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 'include/drivers/marvell/uart/a3700_console.h')
-rw-r--r--include/drivers/marvell/uart/a3700_console.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/drivers/marvell/uart/a3700_console.h b/include/drivers/marvell/uart/a3700_console.h
index 5511d96c44..517f01a8f9 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 <stdint.h>
@@ -74,6 +74,6 @@ typedef struct {
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 */