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 | |
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')
-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 | ||||
-rw-r--r-- | plat/hisilicon/hikey/include/hisi_pwrc.h | 4 | ||||
-rw-r--r-- | plat/imx/common/include/imx8_lpuart.h | 4 | ||||
-rw-r--r-- | plat/imx/common/include/imx_uart.h | 4 | ||||
-rw-r--r-- | plat/layerscape/common/include/ls_16550.h | 4 | ||||
-rw-r--r-- | plat/marvell/a3700/common/include/platform_def.h | 4 | ||||
-rw-r--r-- | plat/marvell/a8k/common/include/platform_def.h | 4 | ||||
-rw-r--r-- | plat/mediatek/mt8183/drivers/mcsi/mcsi.h | 4 | ||||
-rw-r--r-- | plat/nvidia/tegra/include/drivers/memctrl_v2.h | 4 | ||||
-rw-r--r-- | plat/nvidia/tegra/include/tegra_platform.h | 4 | ||||
-rw-r--r-- | plat/renesas/rcar/include/platform_def.h | 2 | ||||
-rw-r--r-- | plat/rockchip/common/include/plat_private.h | 4 | ||||
-rw-r--r-- | plat/rockchip/common/pmusram/cpus_on_fixed_addr.h | 4 | ||||
-rw-r--r-- | plat/st/stm32mp1/stm32mp1_def.h | 6 |
15 files changed, 30 insertions, 30 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__ */ /************************************************************************* diff --git a/plat/hisilicon/hikey/include/hisi_pwrc.h b/plat/hisilicon/hikey/include/hisi_pwrc.h index f1cc297d..cbb46513 100644 --- a/plat/hisilicon/hikey/include/hisi_pwrc.h +++ b/plat/hisilicon/hikey/include/hisi_pwrc.h @@ -7,7 +7,7 @@ #ifndef HISI_PWRC_H #define HISI_PWRC_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ void hisi_pwrc_set_cluster_wfi(unsigned int id); void hisi_pwrc_set_core_bx_addr(unsigned int core, @@ -17,6 +17,6 @@ void hisi_pwrc_enable_debug(unsigned int core, unsigned int cluster); int hisi_pwrc_setup(void); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* HISI_PWRC_H */ diff --git a/plat/imx/common/include/imx8_lpuart.h b/plat/imx/common/include/imx8_lpuart.h index 63449e7d..0ea284fd 100644 --- a/plat/imx/common/include/imx8_lpuart.h +++ b/plat/imx/common/include/imx8_lpuart.h @@ -50,7 +50,7 @@ #define LPUART_BAUD_BOTHEDGE_MASK (0x20000U) #define LPUART_BAUD_M10_MASK (0x20000000U) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <stdint.h> @@ -61,6 +61,6 @@ typedef struct { int console_lpuart_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, console_lpuart_t *console); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* IMX8_LPUART_H */ diff --git a/plat/imx/common/include/imx_uart.h b/plat/imx/common/include/imx_uart.h index 1b52e2f0..cc1b5318 100644 --- a/plat/imx/common/include/imx_uart.h +++ b/plat/imx/common/include/imx_uart.h @@ -9,7 +9,7 @@ #include <drivers/console.h> -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ typedef struct { console_t console; @@ -18,6 +18,6 @@ typedef struct { int console_imx_uart_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, console_uart_t *console); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* IMX_UART_H */ diff --git a/plat/layerscape/common/include/ls_16550.h b/plat/layerscape/common/include/ls_16550.h index b0b1856f..cb4514f3 100644 --- a/plat/layerscape/common/include/ls_16550.h +++ b/plat/layerscape/common/include/ls_16550.h @@ -63,7 +63,7 @@ #define CONSOLE_T_16550_BASE CONSOLE_T_DRVDATA -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <stdint.h> @@ -81,6 +81,6 @@ typedef struct { int console_ls_16550_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, console_ls_16550_t *console); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* LS_16550_H */ diff --git a/plat/marvell/a3700/common/include/platform_def.h b/plat/marvell/a3700/common/include/platform_def.h index 16865c4d..591f0458 100644 --- a/plat/marvell/a3700/common/include/platform_def.h +++ b/plat/marvell/a3700/common/include/platform_def.h @@ -8,9 +8,9 @@ #ifndef PLATFORM_DEF_H #define PLATFORM_DEF_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <stdio.h> -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #include <board_marvell_def.h> #include <mvebu_def.h> diff --git a/plat/marvell/a8k/common/include/platform_def.h b/plat/marvell/a8k/common/include/platform_def.h index 3f6154e7..b9c2e0ed 100644 --- a/plat/marvell/a8k/common/include/platform_def.h +++ b/plat/marvell/a8k/common/include/platform_def.h @@ -8,9 +8,9 @@ #ifndef PLATFORM_DEF_H #define PLATFORM_DEF_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <stdio.h> -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #include <common/interrupt_props.h> #include <drivers/arm/gic_common.h> diff --git a/plat/mediatek/mt8183/drivers/mcsi/mcsi.h b/plat/mediatek/mt8183/drivers/mcsi/mcsi.h index 8a588bfb..863e7dab 100644 --- a/plat/mediatek/mt8183/drivers/mcsi/mcsi.h +++ b/plat/mediatek/mt8183/drivers/mcsi/mcsi.h @@ -85,7 +85,7 @@ #define CCI_CLK_CTRL (MCUCFG_BASE + 0x660) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <plat/common/common_def.h> #include <stdint.h> @@ -112,5 +112,5 @@ void cci_secure_switch(unsigned int ns); void cci_init_sf(void); unsigned long cci_reg_access(unsigned int op, unsigned long offset, unsigned long val); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* MCSI_H */ diff --git a/plat/nvidia/tegra/include/drivers/memctrl_v2.h b/plat/nvidia/tegra/include/drivers/memctrl_v2.h index 9cbadd3e..a4085e24 100644 --- a/plat/nvidia/tegra/include/drivers/memctrl_v2.h +++ b/plat/nvidia/tegra/include/drivers/memctrl_v2.h @@ -9,7 +9,7 @@ #include <tegra_def.h> -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <lib/mmio.h> #include <stdint.h> @@ -173,6 +173,6 @@ tegra_mc_settings_t *tegra_get_mc_settings(void); ******************************************************************************/ void plat_memctrl_tzdram_setup(uint64_t phys_base, uint64_t size_in_bytes); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* MEMCTRL_V2_H */ diff --git a/plat/nvidia/tegra/include/tegra_platform.h b/plat/nvidia/tegra/include/tegra_platform.h index b9c37824..d83ce48b 100644 --- a/plat/nvidia/tegra/include/tegra_platform.h +++ b/plat/nvidia/tegra/include/tegra_platform.h @@ -30,7 +30,7 @@ #define TEGRA_CHIPID_TEGRA21 U(0x21) #define TEGRA_CHIPID_TEGRA18 U(0x18) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* * Tegra chip ID major/minor identifiers @@ -57,6 +57,6 @@ bool tegra_platform_is_fpga(void); bool tegra_platform_is_unit_fpga(void); bool tegra_platform_is_virt_dev_kit(void); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* TEGRA_PLATFORM_H */ diff --git a/plat/renesas/rcar/include/platform_def.h b/plat/renesas/rcar/include/platform_def.h index bbe4a548..b7f0ca11 100644 --- a/plat/renesas/rcar/include/platform_def.h +++ b/plat/renesas/rcar/include/platform_def.h @@ -7,7 +7,7 @@ #ifndef PLATFORM_DEF_H #define PLATFORM_DEF_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <stdlib.h> #endif diff --git a/plat/rockchip/common/include/plat_private.h b/plat/rockchip/common/include/plat_private.h index 66b61850..9041bdb3 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 b22ddc29..34af29a8 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 diff --git a/plat/st/stm32mp1/stm32mp1_def.h b/plat/st/stm32mp1/stm32mp1_def.h index 94c4c5b3..37941aa7 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); |