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/st/stm32mp1/stm32mp1_def.h | |
parent | f61469e532c05bfe0de06620e8762db18414a357 (diff) | |
download | trusted-firmware-a-d5dfdeb65ff5b7f24dded201d2945c7b74565ce8.tar.gz |
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/st/stm32mp1/stm32mp1_def.h')
-rw-r--r-- | plat/st/stm32mp1/stm32mp1_def.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plat/st/stm32mp1/stm32mp1_def.h b/plat/st/stm32mp1/stm32mp1_def.h index 94c4c5b38a..37941aa74b 100644 --- a/plat/st/stm32mp1/stm32mp1_def.h +++ b/plat/st/stm32mp1/stm32mp1_def.h @@ -14,7 +14,7 @@ #include <lib/utils_def.h> #include <lib/xlat_tables/xlat_tables_defs.h> -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <drivers/st/stm32mp1_clk.h> #include <boot_api.h> @@ -40,7 +40,7 @@ #endif /* DDR power initializations */ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ enum ddr_type { STM32MP_DDR3, STM32MP_LPDDR2, @@ -254,7 +254,7 @@ enum ddr_type { #define TAMP_BASE U(0x5C00A000) #define TAMP_BKP_REGISTER_BASE (TAMP_BASE + U(0x100)) -#if !(defined(__LINKER__) || defined(__ASSEMBLY__)) +#if !(defined(__LINKER__) || defined(__ASSEMBLER__)) static inline uint32_t tamp_bkpr(uint32_t idx) { return TAMP_BKP_REGISTER_BASE + (idx << 2); |