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 /plat/arm | |
| 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 'plat/arm')
| -rw-r--r-- | plat/arm/css/sgi/include/sgi_base_platform_def.h | 4 | ||||
| -rw-r--r-- | plat/arm/css/sgm/include/sgm_base_platform_def.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plat/arm/css/sgi/include/sgi_base_platform_def.h b/plat/arm/css/sgi/include/sgi_base_platform_def.h index 032a1f47..a9cc8527 100644 --- a/plat/arm/css/sgi/include/sgi_base_platform_def.h +++ b/plat/arm/css/sgi/include/sgi_base_platform_def.h @@ -187,7 +187,7 @@ /* Platform ID address */ #define SSC_VERSION (SSC_REG_BASE + SSC_VERSION_OFFSET) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* SSC_VERSION related accessors */ /* Returns the part number of the platform */ #define GET_SGI_PART_NUM \ @@ -195,7 +195,7 @@ /* Returns the configuration number of the platform */ #define GET_SGI_CONFIG_NUM \ GET_SSC_VERSION_CONFIG(mmio_read_32(SSC_VERSION)) -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ /******************************************************************************* * Memprotect definitions diff --git a/plat/arm/css/sgm/include/sgm_base_platform_def.h b/plat/arm/css/sgm/include/sgm_base_platform_def.h index 4ecfc969..f349c196 100644 --- a/plat/arm/css/sgm/include/sgm_base_platform_def.h +++ b/plat/arm/css/sgm/include/sgm_base_platform_def.h @@ -51,7 +51,7 @@ /* Platform ID address */ #define SSC_VERSION (SSC_REG_BASE + SSC_VERSION_OFFSET) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* SSC_VERSION related accessors */ /* Returns the part number of the platform */ #define GET_PLAT_PART_NUM \ @@ -59,7 +59,7 @@ /* Returns the configuration number of the platform */ #define GET_PLAT_CONFIG_NUM \ GET_SSC_VERSION_CONFIG(mmio_read_32(SSC_VERSION)) -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ /************************************************************************* |