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/arm/ccn.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/drivers/arm/ccn.h') diff --git a/include/drivers/arm/ccn.h b/include/drivers/arm/ccn.h index 9c3abac6..7f737681 100644 --- a/include/drivers/arm/ccn.h +++ b/include/drivers/arm/ccn.h @@ -46,7 +46,7 @@ */ #define CCN_GET_RUN_STATE(pstate) (pstate & 0xf) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include /* @@ -109,5 +109,5 @@ unsigned long long ccn_read_node_reg(node_types_t node_type, unsigned int node_id, unsigned int reg_offset); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* CCN_H */ -- cgit v1.2.3