diff options
| author | Julius Werner <jwerner@chromium.org> | 2019-07-09 13:49:11 -0700 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2019-08-01 13:14:12 -0700 |
| commit | d5dfdeb65ff5b7f24dded201d2945c7b74565ce8 (patch) | |
| tree | c6f6607a5bab02c7497689e043db50fad88158f8 /include/plat | |
| parent | f61469e532c05bfe0de06620e8762db18414a357 (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/plat')
| -rw-r--r-- | include/plat/arm/board/common/board_css_def.h | 4 | ||||
| -rw-r--r-- | include/plat/arm/css/common/css_def.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/plat/arm/board/common/board_css_def.h b/include/plat/arm/board/common/board_css_def.h index f982b57b..4637b678 100644 --- a/include/plat/arm/board/common/board_css_def.h +++ b/include/plat/arm/board/common/board_css_def.h @@ -29,7 +29,7 @@ #define BOARD_CSS_PLAT_TYPE_EMULATOR 0x02 #define BOARD_CSS_PLAT_TYPE_FVP 0x03 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <lib/mmio.h> @@ -37,7 +37,7 @@ ((mmio_read_32(addr) & BOARD_CSS_PLAT_ID_REG_ID_MASK) \ >> BOARD_CSS_PLAT_ID_REG_ID_SHIFT) -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #define MAX_IO_DEVICES 3 diff --git a/include/plat/arm/css/common/css_def.h b/include/plat/arm/css/common/css_def.h index ec28db07..2adf11d6 100644 --- a/include/plat/arm/css/common/css_def.h +++ b/include/plat/arm/css/common/css_def.h @@ -136,7 +136,7 @@ #define SPIDEN_INT_CLR_SHIFT 6 #define SPIDEN_SEL_SET_SHIFT 7 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* SSC_VERSION related accessors */ @@ -150,7 +150,7 @@ (((val) >> SSC_VERSION_CONFIG_SHIFT) & \ SSC_VERSION_CONFIG_MASK) -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ /************************************************************************* * Required platform porting definitions common to all |