path: root/include/bl1/bl1.h
diff options
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/bl1/bl1.h
parentf61469e532c05bfe0de06620e8762db18414a357 (diff)
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/bl1/bl1.h')
1 files changed, 2 insertions, 2 deletions
diff --git a/include/bl1/bl1.h b/include/bl1/bl1.h
index 937b8c7e8c..d81f434045 100644
--- a/include/bl1/bl1.h
+++ b/include/bl1/bl1.h
@@ -61,7 +61,7 @@
#define is_fwu_fid(_fid) \
((_fid >= FWU_SMC_FID_START) && (_fid <= FWU_SMC_FID_END))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <lib/cassert.h>
@@ -98,5 +98,5 @@ CASSERT(FWU_NUM_SMC_CALLS == \
void bl1_calc_bl2_mem_layout(const meminfo_t *bl1_mem_layout,
meminfo_t *bl2_mem_layout);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* BL1_H */