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/rockchip/common | |
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/rockchip/common')
-rw-r--r-- | plat/rockchip/common/include/plat_private.h | 4 | ||||
-rw-r--r-- | plat/rockchip/common/pmusram/cpus_on_fixed_addr.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plat/rockchip/common/include/plat_private.h b/plat/rockchip/common/include/plat_private.h index 66b61850db..9041bdb3e5 100644 --- a/plat/rockchip/common/include/plat_private.h +++ b/plat/rockchip/common/include/plat_private.h @@ -7,7 +7,7 @@ #ifndef PLAT_PRIVATE_H #define PLAT_PRIVATE_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <stdint.h> @@ -140,7 +140,7 @@ extern const mmap_region_t plat_rk_mmap[]; uint32_t rockchip_get_uart_base(void); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ /****************************************************************************** * cpu up status diff --git a/plat/rockchip/common/pmusram/cpus_on_fixed_addr.h b/plat/rockchip/common/pmusram/cpus_on_fixed_addr.h index b22ddc29cd..34af29a8ab 100644 --- a/plat/rockchip/common/pmusram/cpus_on_fixed_addr.h +++ b/plat/rockchip/common/pmusram/cpus_on_fixed_addr.h @@ -26,7 +26,7 @@ #define PM_WARM_BOOT_SHT 0 #define PM_WARM_BOOT_BIT (1 << PM_WARM_BOOT_SHT) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ struct psram_data_t { uint64_t sp; @@ -50,6 +50,6 @@ CASSERT(__builtin_offsetof(struct psram_data_t, boot_mpidr) == PSRAM_DT_MPIDR, extern void *sys_sleep_flag_sram; -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif |