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/lib/psci/psci.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/lib/psci/psci.h') diff --git a/include/lib/psci/psci.h b/include/lib/psci/psci.h index fe279d4f2..04e5e3d72 100644 --- a/include/lib/psci/psci.h +++ b/include/lib/psci/psci.h @@ -166,7 +166,7 @@ #define PSCI_RESET2_TYPE_ARCH (U(0) << PSCI_RESET2_TYPE_VENDOR_SHIFT) #define PSCI_RESET2_SYSTEM_WARM_RESET (PSCI_RESET2_TYPE_ARCH | U(0)) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -348,6 +348,6 @@ int psci_features(unsigned int psci_fid); void __dead2 psci_power_down_wfi(void); void psci_arch_setup(void); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* PSCI_H */ -- cgit v1.2.3