diff options
Diffstat (limited to 'plat')
242 files changed, 746 insertions, 732 deletions
diff --git a/plat/allwinner/common/include/mentor_i2c_plat.h b/plat/allwinner/common/include/mentor_i2c_plat.h index f547f9a48..d03f2d1c4 100644 --- a/plat/allwinner/common/include/mentor_i2c_plat.h +++ b/plat/allwinner/common/include/mentor_i2c_plat.h @@ -6,8 +6,8 @@ */ /* This driver provides I2C support for Allwinner sunXi SoCs */ -#ifndef SUNXI_I2C_H -#define SUNXI_I2C_H +#ifndef MENTOR_I2C_PLAT_H +#define MENTOR_I2C_PLAT_H #define CONFIG_SYS_TCLK 24000000 #define CONFIG_SYS_I2C_SPEED 100000 @@ -25,4 +25,4 @@ struct mentor_i2c_regs { uint32_t soft_reset; }; -#endif +#endif /* MENTOR_I2C_PLAT_H */ diff --git a/plat/allwinner/common/include/plat_macros.S b/plat/allwinner/common/include/plat_macros.S index 6ee4597f2..77f183dd2 100644 --- a/plat/allwinner/common/include/plat_macros.S +++ b/plat/allwinner/common/include/plat_macros.S @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_MACROS_S__ -#define __PLAT_MACROS_S__ +#ifndef PLAT_MACROS_S +#define PLAT_MACROS_S #include <arm_macros.S> #include <sunxi_mmap.h> @@ -24,4 +24,4 @@ arm_print_gic_regs .endm -#endif /* __PLAT_MACROS_S__ */ +#endif /* PLAT_MACROS_S */ diff --git a/plat/allwinner/common/include/sunxi_def.h b/plat/allwinner/common/include/sunxi_def.h index da87b2389..73c445386 100644 --- a/plat/allwinner/common/include/sunxi_def.h +++ b/plat/allwinner/common/include/sunxi_def.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SUNXI_DEF_H__ -#define __SUNXI_DEF_H__ +#ifndef SUNXI_DEF_H +#define SUNXI_DEF_H /* Clock configuration */ #define SUNXI_OSC24M_CLK_IN_HZ 24000000 @@ -18,4 +18,4 @@ #define SUNXI_SOC_H5 0x1718 #define SUNXI_SOC_H6 0x1728 -#endif /* __SUNXI_DEF_H__ */ +#endif /* SUNXI_DEF_H */ diff --git a/plat/allwinner/sun50i_a64/include/sunxi_cpucfg.h b/plat/allwinner/sun50i_a64/include/sunxi_cpucfg.h index 049c2ad23..c3eeadbaa 100644 --- a/plat/allwinner/sun50i_a64/include/sunxi_cpucfg.h +++ b/plat/allwinner/sun50i_a64/include/sunxi_cpucfg.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SUNXI_CPUCFG_H__ -#define __SUNXI_CPUCFG_H__ +#ifndef SUNXI_CPUCFG_H +#define SUNXI_CPUCFG_H #include <sunxi_mmap.h> @@ -33,4 +33,4 @@ #define SUNXI_R_CPUCFG_SS_ENTRY_REG (SUNXI_R_CPUCFG_BASE + 0x01a8) #define SUNXI_R_CPUCFG_HP_FLAG_REG (SUNXI_R_CPUCFG_BASE + 0x01ac) -#endif /* __SUNXI_CPUCFG_H__ */ +#endif /* SUNXI_CPUCFG_H */ diff --git a/plat/allwinner/sun50i_a64/include/sunxi_mmap.h b/plat/allwinner/sun50i_a64/include/sunxi_mmap.h index 28b1dd3b8..db4409118 100644 --- a/plat/allwinner/sun50i_a64/include/sunxi_mmap.h +++ b/plat/allwinner/sun50i_a64/include/sunxi_mmap.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SUNXI_MMAP_H__ -#define __SUNXI_MMAP_H__ +#ifndef SUNXI_MMAP_H +#define SUNXI_MMAP_H /* Memory regions */ #define SUNXI_ROM_BASE 0x00000000 @@ -71,4 +71,4 @@ #define SUNXI_R_RSB_BASE 0x01f03400 #define SUNXI_R_PWM_BASE 0x01f03800 -#endif /* __SUNXI_MMAP_H__ */ +#endif /* SUNXI_MMAP_H */ diff --git a/plat/allwinner/sun50i_h6/include/sunxi_cpucfg.h b/plat/allwinner/sun50i_h6/include/sunxi_cpucfg.h index e061b89ca..556fb97dc 100644 --- a/plat/allwinner/sun50i_h6/include/sunxi_cpucfg.h +++ b/plat/allwinner/sun50i_h6/include/sunxi_cpucfg.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SUNXI_CPUCFG_H__ -#define __SUNXI_CPUCFG_H__ +#ifndef SUNXI_CPUCFG_H +#define SUNXI_CPUCFG_H #include <sunxi_mmap.h> @@ -24,4 +24,4 @@ #define SUNXI_CPU_POWER_CLAMP_REG(c, n) (SUNXI_R_CPUCFG_BASE + 0x0050 + \ (c) * 0x10 + (n) * 4) -#endif /* __SUNXI_CPUCFG_H__ */ +#endif /* SUNXI_CPUCFG_H */ diff --git a/plat/allwinner/sun50i_h6/include/sunxi_mmap.h b/plat/allwinner/sun50i_h6/include/sunxi_mmap.h index ff1eb61e9..f36491a8a 100644 --- a/plat/allwinner/sun50i_h6/include/sunxi_mmap.h +++ b/plat/allwinner/sun50i_h6/include/sunxi_mmap.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SUNXI_MMAP_H__ -#define __SUNXI_MMAP_H__ +#ifndef SUNXI_MMAP_H +#define SUNXI_MMAP_H /* Memory regions */ #define SUNXI_ROM_BASE 0x00000000 @@ -58,4 +58,4 @@ #define SUNXI_R_UART_BASE 0x07080000 #define SUNXI_R_PIO_BASE 0x07022000 -#endif /* __SUNXI_MMAP_H__ */ +#endif /* SUNXI_MMAP_H */ diff --git a/plat/arm/board/fvp/fvp_private.h b/plat/arm/board/fvp/fvp_private.h index 16f10a22f..e7dea9944 100644 --- a/plat/arm/board/fvp/fvp_private.h +++ b/plat/arm/board/fvp/fvp_private.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __FVP_PRIVATE_H__ -#define __FVP_PRIVATE_H__ +#ifndef FVP_PRIVATE_H +#define FVP_PRIVATE_H #include <plat_arm.h> @@ -21,4 +21,4 @@ void fvp_interconnect_disable(void); void tsp_early_platform_setup(void); -#endif /* __FVP_PRIVATE_H__ */ +#endif /* FVP_PRIVATE_H */ diff --git a/plat/arm/board/fvp/include/plat.ld.S b/plat/arm/board/fvp/include/plat.ld.S index f2a3ea6a4..ad2d46c43 100644 --- a/plat/arm/board/fvp/include/plat.ld.S +++ b/plat/arm/board/fvp/include/plat.ld.S @@ -3,10 +3,10 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_LD_S__ -#define __PLAT_LD_S__ +#ifndef PLAT_LD_S +#define PLAT_LD_S #include <arm_tzc_dram.ld.S> #include <arm_reclaim_init.ld.S> -#endif /* __PLAT_LD_S__ */ +#endif /* PLAT_LD_S */ diff --git a/plat/arm/board/fvp/include/plat_macros.S b/plat/arm/board/fvp/include/plat_macros.S index 4dcde2d27..6be8b093f 100644 --- a/plat/arm/board/fvp/include/plat_macros.S +++ b/plat/arm/board/fvp/include/plat_macros.S @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_MACROS_S__ -#define __PLAT_MACROS_S__ +#ifndef PLAT_MACROS_S +#define PLAT_MACROS_S #include <arm_macros.S> #include <v2m_def.h> @@ -40,4 +40,4 @@ print_gic_regs: arm_print_gic_regs .endm -#endif /* __PLAT_MACROS_S__ */ +#endif /* PLAT_MACROS_S */ diff --git a/plat/arm/board/juno/include/plat_macros.S b/plat/arm/board/juno/include/plat_macros.S index 0dd96c453..ec94a4f4a 100644 --- a/plat/arm/board/juno/include/plat_macros.S +++ b/plat/arm/board/juno/include/plat_macros.S @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_MACROS_S__ -#define __PLAT_MACROS_S__ +#ifndef PLAT_MACROS_S +#define PLAT_MACROS_S #include <cci_macros.S> #include <css_macros.S> @@ -21,4 +21,4 @@ print_cci_regs .endm -#endif /* __PLAT_MACROS_S__ */ +#endif /* PLAT_MACROS_S */ diff --git a/plat/arm/board/juno/juno_decl.h b/plat/arm/board/juno/juno_decl.h index 8a3b37392..cd87c3b77 100644 --- a/plat/arm/board/juno/juno_decl.h +++ b/plat/arm/board/juno/juno_decl.h @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __JUNO_DECL_H__ -#define __JUNO_DECL_H__ +#ifndef JUNO_DECL_H +#define JUNO_DECL_H int juno_getentropy(void *buf, size_t len); -#endif /* __JUNO_DECL_H__ */ +#endif /* JUNO_DECL_H */ diff --git a/plat/arm/board/juno/juno_tzmp1_def.h b/plat/arm/board/juno/juno_tzmp1_def.h index 7055f76a0..5d0978c9c 100644 --- a/plat/arm/board/juno/juno_tzmp1_def.h +++ b/plat/arm/board/juno/juno_tzmp1_def.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __JUNO_TZMP1_DEF_H__ -#define __JUNO_TZMP1_DEF_H__ +#ifndef JUNO_TZMP1_DEF_H +#define JUNO_TZMP1_DEF_H #include <plat_arm.h> @@ -82,4 +82,4 @@ /* config to PROTCTRL register */ #define V550_PROTCTRL_CONFIG 0xa8700000 -#endif /* __JUNO_TZMP1_DEF_H__ */ +#endif /* JUNO_TZMP1_DEF_H */ diff --git a/plat/arm/board/n1sdp/include/plat_macros.S b/plat/arm/board/n1sdp/include/plat_macros.S index fe9a66c3d..521bcc32b 100644 --- a/plat/arm/board/n1sdp/include/plat_macros.S +++ b/plat/arm/board/n1sdp/include/plat_macros.S @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_MACROS_S__ -#define __PLAT_MACROS_S__ +#ifndef PLAT_MACROS_S +#define PLAT_MACROS_S #include <css_macros.S> @@ -20,4 +20,5 @@ */ .macro plat_crash_print_regs .endm -#endif /* __PLAT_MACROS_S__ */ + +#endif /* PLAT_MACROS_S */ diff --git a/plat/arm/board/n1sdp/include/platform_def.h b/plat/arm/board/n1sdp/include/platform_def.h index d26f55921..3e4839781 100644 --- a/plat/arm/board/n1sdp/include/platform_def.h +++ b/plat/arm/board/n1sdp/include/platform_def.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLATFORM_DEF_H__ -#define __PLATFORM_DEF_H__ +#ifndef PLATFORM_DEF_H +#define PLATFORM_DEF_H #include <arm_def.h> #include <board_css_def.h> @@ -68,4 +68,5 @@ /* Platform ID address */ #define SSC_VERSION (SSC_REG_BASE + SSC_VERSION_OFFSET) -#endif /* __PLATFORM_DEF_H__ */ + +#endif /* PLATFORM_DEF_H */ diff --git a/plat/arm/board/sgm775/include/platform_def.h b/plat/arm/board/sgm775/include/platform_def.h index babe0930e..8a3431b12 100644 --- a/plat/arm/board/sgm775/include/platform_def.h +++ b/plat/arm/board/sgm775/include/platform_def.h @@ -4,12 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLATFORM_DEF_H__ -#define __PLATFORM_DEF_H__ +#ifndef PLATFORM_DEF_H +#define PLATFORM_DEF_H #include <sgm_base_platform_def.h> #define PLAT_MAX_CPUS_PER_CLUSTER 8 #define PLAT_MAX_PE_PER_CPU 1 -#endif /* __PLATFORM_DEF_H__ */ +#endif /* PLATFORM_DEF_H */ diff --git a/plat/arm/css/drivers/mhu/css_mhu.h b/plat/arm/css/drivers/mhu/css_mhu.h index 0fb00c76e..ff04ae41d 100644 --- a/plat/arm/css/drivers/mhu/css_mhu.h +++ b/plat/arm/css/drivers/mhu/css_mhu.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CSS_MHU_H__ -#define __CSS_MHU_H__ +#ifndef CSS_MHU_H +#define CSS_MHU_H #include <stdint.h> @@ -16,4 +16,4 @@ void mhu_secure_message_end(unsigned int slot_id); void mhu_secure_init(void); -#endif /* __CSS_MHU_H__ */ +#endif /* CSS_MHU_H */ diff --git a/plat/arm/css/drivers/scmi/scmi.h b/plat/arm/css/drivers/scmi/scmi.h index 7f8922910..e1358bfa4 100644 --- a/plat/arm/css/drivers/scmi/scmi.h +++ b/plat/arm/css/drivers/scmi/scmi.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CSS_SCMI_H__ -#define __CSS_SCMI_H__ +#ifndef SCMI_H +#define SCMI_H #include <bakery_lock.h> #include <stddef.h> @@ -162,4 +162,4 @@ int scmi_ap_core_get_reset_addr(void *p, uint64_t *reset_addr, uint32_t *attr); /* API to get the platform specific SCMI channel information. */ scmi_channel_plat_info_t *plat_css_get_scmi_info(); -#endif /* __CSS_SCMI_H__ */ +#endif /* SCMI_H */ diff --git a/plat/arm/css/drivers/scmi/scmi_private.h b/plat/arm/css/drivers/scmi/scmi_private.h index 39bc8ccb3..a4f417976 100644 --- a/plat/arm/css/drivers/scmi/scmi_private.h +++ b/plat/arm/css/drivers/scmi/scmi_private.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CSS_SCMI_PRIVATE_H__ -#define __CSS_SCMI_PRIVATE_H__ +#ifndef SCMI_PRIVATE_H +#define SCMI_PRIVATE_H /* * SCMI power domain management protocol message and response lengths. It is @@ -150,4 +150,4 @@ static inline void validate_scmi_channel(scmi_channel_t *ch) assert(ch->info && ch->info->scmi_mbx_mem); } -#endif /* __CSS_SCMI_PRIVATE_H__ */ +#endif /* SCMI_PRIVATE_H */ diff --git a/plat/arm/css/drivers/scp/css_scp.h b/plat/arm/css/drivers/scp/css_scp.h index 44dfbca05..84c1487d3 100644 --- a/plat/arm/css/drivers/scp/css_scp.h +++ b/plat/arm/css/drivers/scp/css_scp.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CSS_SCP_H__ -#define __CSS_SCP_H__ +#ifndef CSS_SCP_H +#define CSS_SCP_H #include <cassert.h> #include <platform_def.h> @@ -47,4 +47,4 @@ CASSERT(SCP_BL2_BASE >= ARM_TB_FW_CONFIG_LIMIT, assert_scp_bl2_overflow); CASSERT(SCP_BL2U_BASE >= ARM_TB_FW_CONFIG_LIMIT, assert_scp_bl2u_overflow); #endif -#endif /* __CSS_SCP_H__ */ +#endif /* CSS_SCP_H */ diff --git a/plat/arm/css/drivers/scpi/css_scpi.h b/plat/arm/css/drivers/scpi/css_scpi.h index 2a7e624ab..68fc60a6e 100644 --- a/plat/arm/css/drivers/scpi/css_scpi.h +++ b/plat/arm/css/drivers/scpi/css_scpi.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CSS_SCPI_H__ -#define __CSS_SCPI_H__ +#ifndef CSS_SCPI_H +#define CSS_SCPI_H #include <stddef.h> #include <stdint.h> @@ -106,5 +106,4 @@ int scpi_get_css_power_state(unsigned int mpidr, unsigned int *cpu_state_p, unsigned int *cluster_state_p); uint32_t scpi_sys_power_state(scpi_system_state_t system_state); - -#endif /* __CSS_SCPI_H__ */ +#endif /* CSS_SCPI_H */ diff --git a/plat/arm/css/drivers/sds/sds.h b/plat/arm/css/drivers/sds/sds.h index 4aef0df9f..114ae9258 100644 --- a/plat/arm/css/drivers/sds/sds.h +++ b/plat/arm/css/drivers/sds/sds.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SDS_H__ -#define __SDS_H__ +#ifndef SDS_H +#define SDS_H /* SDS Structure Identifier defines */ /* AP CPU INFO defines */ @@ -86,4 +86,5 @@ int sds_struct_read(uint32_t structure_id, unsigned int fld_off, void *data, int sds_struct_write(uint32_t structure_id, unsigned int fld_off, void *data, size_t size, sds_access_mode_t mode); #endif /*__ASSEMBLY__ */ -#endif /* __SDS_H__ */ + +#endif /* SDS_H */ diff --git a/plat/arm/css/drivers/sds/sds_private.h b/plat/arm/css/drivers/sds/sds_private.h index 43b97f681..2101dd049 100644 --- a/plat/arm/css/drivers/sds/sds_private.h +++ b/plat/arm/css/drivers/sds/sds_private.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SDS_PRIVATE_H__ -#define __SDS_PRIVATE_H__ +#ifndef SDS_PRIVATE_H +#define SDS_PRIVATE_H /* SDS Header defines */ #define SDS_HEADER_ID_SHIFT 0 @@ -96,4 +96,5 @@ typedef struct region_descriptor { #define GET_SDS_REGION_SIZE(region) ((((region_desc_t *)(region))->reg[1])) #endif /* __ASSEMBLY__ */ -#endif /* __SDS_PRIVATE_H__ */ + +#endif /* SDS_PRIVATE_H */ diff --git a/plat/arm/css/sgi/include/plat_macros.S b/plat/arm/css/sgi/include/plat_macros.S index fe9a66c3d..521bcc32b 100644 --- a/plat/arm/css/sgi/include/plat_macros.S +++ b/plat/arm/css/sgi/include/plat_macros.S @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_MACROS_S__ -#define __PLAT_MACROS_S__ +#ifndef PLAT_MACROS_S +#define PLAT_MACROS_S #include <css_macros.S> @@ -20,4 +20,5 @@ */ .macro plat_crash_print_regs .endm -#endif /* __PLAT_MACROS_S__ */ + +#endif /* PLAT_MACROS_S */ diff --git a/plat/arm/css/sgi/include/sgi_ras.h b/plat/arm/css/sgi/include/sgi_ras.h index b307b9c94..a449eae26 100644 --- a/plat/arm/css/sgi/include/sgi_ras.h +++ b/plat/arm/css/sgi/include/sgi_ras.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SGI_RAS__ -#define __SGI_RAS__ +#ifndef SGI_RAS_H +#define SGI_RAS_H /* * Mapping the RAS interrupt with SDEI event number and the event @@ -19,4 +19,4 @@ struct sgi_ras_ev_map { int sgi_ras_intr_handler_setup(void); -#endif /* __SGI_RAS__ */ +#endif /* SGI_RAS_H */ diff --git a/plat/arm/css/sgm/include/plat_macros.S b/plat/arm/css/sgm/include/plat_macros.S index d877ef880..715ded273 100644 --- a/plat/arm/css/sgm/include/plat_macros.S +++ b/plat/arm/css/sgm/include/plat_macros.S @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_MACROS_S__ -#define __PLAT_MACROS_S__ +#ifndef PLAT_MACROS_S +#define PLAT_MACROS_S #include <cci_macros.S> #include <css_macros.S> @@ -21,4 +21,4 @@ css_print_gic_regs print_cci_regs .endm -#endif /* __PLAT_MACROS_S__ */ +#endif /* PLAT_MACROS_S */ 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 eaba619af..a9795a484 100644 --- a/plat/arm/css/sgm/include/sgm_base_platform_def.h +++ b/plat/arm/css/sgm/include/sgm_base_platform_def.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SGM_BASE_PLATFORM_DEF_H__ -#define __SGM_BASE_PLATFORM_DEF_H__ +#ifndef SGM_BASE_PLATFORM_DEF_H +#define SGM_BASE_PLATFORM_DEF_H #include <arm_def.h> #include <board_css_def.h> @@ -239,4 +239,4 @@ */ #define PLAT_ARM_MEM_PROT_ADDR (V2M_FLASH0_BASE + \ V2M_FLASH0_SIZE - V2M_FLASH_BLOCK_SIZE) -#endif /* __SGM_BASE_PLATFORM_DEF_H__ */ +#endif /* SGM_BASE_PLATFORM_DEF_H */ diff --git a/plat/arm/css/sgm/include/sgm_plat_config.h b/plat/arm/css/sgm/include/sgm_plat_config.h index 75abeffb2..79e6b5c6a 100644 --- a/plat/arm/css/sgm/include/sgm_plat_config.h +++ b/plat/arm/css/sgm/include/sgm_plat_config.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SGM_PLAT_CONFIG_H__ -#define __SGM_PLAT_CONFIG_H__ +#ifndef SGM_PLAT_CONFIG_H +#define SGM_PLAT_CONFIG_H #include <ccn.h> #include <gicv3.h> @@ -39,4 +39,5 @@ typedef struct css_plat_config { void plat_config_init(void); css_plat_config_t *get_plat_config(void); -#endif /* __SGM_PLAT_CONFIG_H__ */ + +#endif /* SGM_PLAT_CONFIG_H */ diff --git a/plat/arm/css/sgm/include/sgm_variant.h b/plat/arm/css/sgm/include/sgm_variant.h index a0a91b0c5..859ddb59f 100644 --- a/plat/arm/css/sgm/include/sgm_variant.h +++ b/plat/arm/css/sgm/include/sgm_variant.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SGM_VARIANT_H__ -#define __SGM_VARIANT_H__ +#ifndef SGM_VARIANT_H +#define SGM_VARIANT_H /* SSC_VERSION values for sgm */ #define SGM775_SSC_VER_PART_NUM 0x0790 @@ -14,4 +14,4 @@ #define SGM_DMC_SIZE 0x40000 #define SGM775_DMC_COUNT 4 -#endif /* __SGM_VARIANT_H__ */ +#endif /* SGM_VARIANT_H */ diff --git a/plat/hisilicon/hikey/hikey_private.h b/plat/hisilicon/hikey/hikey_private.h index e6d109a65..ca1baa3f5 100644 --- a/plat/hisilicon/hikey/hikey_private.h +++ b/plat/hisilicon/hikey/hikey_private.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __HIKEY_PRIVATE_H__ -#define __HIKEY_PRIVATE_H__ +#ifndef HIKEY_PRIVATE_H +#define HIKEY_PRIVATE_H #include <bl_common.h> @@ -72,4 +72,4 @@ int hikey_write_serialno(struct random_serial_num *serialno); void init_acpu_dvfs(void); -#endif /* __HIKEY_PRIVATE_H__ */ +#endif /* HIKEY_PRIVATE_H */ diff --git a/plat/hisilicon/hikey/include/hi6220.h b/plat/hisilicon/hikey/include/hi6220.h index fe7720a68..f67ee5cb3 100644 --- a/plat/hisilicon/hikey/include/hi6220.h +++ b/plat/hisilicon/hikey/include/hi6220.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __HI6220_H__ -#define __HI6220_H__ +#ifndef HI6220_H +#define HI6220_H #include <hi6220_regs_acpu.h> #include <hi6220_regs_ao.h> @@ -74,4 +74,4 @@ #define GPIO18_BASE 0xF702E000 #define GPIO19_BASE 0xF702F000 -#endif /* __HI6220_H__ */ +#endif /* HI6220_H */ diff --git a/plat/hisilicon/hikey/include/hi6220_regs_acpu.h b/plat/hisilicon/hikey/include/hi6220_regs_acpu.h index dde9e6549..a43db68eb 100644 --- a/plat/hisilicon/hikey/include/hi6220_regs_acpu.h +++ b/plat/hisilicon/hikey/include/hi6220_regs_acpu.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __HI6220_REGS_ACPU_H__ -#define __HI6220_REGS_ACPU_H__ +#ifndef HI6220_REGS_ACPU_H +#define HI6220_REGS_ACPU_H #define ACPU_CTRL_BASE 0xF6504000 @@ -297,4 +297,4 @@ (0x1 << ACPU_SC_VD_CTRL_TUNE_EN_INT_SHIFT) | \ (0x1 << ACPU_SC_VD_CTRL_TUNE_EN_DIF_SHIFT)) -#endif /* __HI6220_REGS_ACPU_H__ */ +#endif /* HI6220_REGS_ACPU_H */ diff --git a/plat/hisilicon/hikey/include/hi6220_regs_ao.h b/plat/hisilicon/hikey/include/hi6220_regs_ao.h index 79a54045a..132f33c61 100644 --- a/plat/hisilicon/hikey/include/hi6220_regs_ao.h +++ b/plat/hisilicon/hikey/include/hi6220_regs_ao.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __HI6220_AO_H__ -#define __HI6220_AO_H__ +#ifndef HI6220_REGS_AO_H +#define HI6220_REGS_AO_H #define AO_CTRL_BASE 0xF7800000 @@ -331,4 +331,4 @@ #define PCLK_TIMER1 (1 << 16) #define PCLK_TIMER0 (1 << 15) -#endif /* __HI6220_AO_H__ */ +#endif /* HI6220_REGS_AO_H */ diff --git a/plat/hisilicon/hikey/include/hi6220_regs_peri.h b/plat/hisilicon/hikey/include/hi6220_regs_peri.h index d2c04605b..8711ae43e 100644 --- a/plat/hisilicon/hikey/include/hi6220_regs_peri.h +++ b/plat/hisilicon/hikey/include/hi6220_regs_peri.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __HI6220_PERI_H__ -#define __HI6220_PERI_H__ +#ifndef HI6220_REGS_PERI_H +#define HI6220_REGS_PERI_H #define PERI_BASE 0xF7030000 @@ -377,4 +377,4 @@ #define PERI_RST8_DDRPACK_APB (1 << 14) #define PERI_RST8_DDRT (1 << 17) -#endif /* __HI6220_PERI_H__ */ +#endif /* HI6220_REGS_PERI_H */ diff --git a/plat/hisilicon/hikey/include/hi6220_regs_pin.h b/plat/hisilicon/hikey/include/hi6220_regs_pin.h index 7de4c3cd3..05620ea77 100644 --- a/plat/hisilicon/hikey/include/hi6220_regs_pin.h +++ b/plat/hisilicon/hikey/include/hi6220_regs_pin.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __HI6220_PIN_H__ -#define __HI6220_PIN_H__ +#ifndef HI6220_REGS_PIN_H +#define HI6220_REGS_PIN_H #define IOMG_BASE 0xF7010000 @@ -40,4 +40,4 @@ #define IOCG_PULLDOWN (1 << 1) #define IOCG_PULLUP (1 << 0) -#endif /* __HI6220_PIN_H__ */ +#endif /* HI6220_REGS_PIN_H */ diff --git a/plat/hisilicon/hikey/include/hi6220_regs_pmctrl.h b/plat/hisilicon/hikey/include/hi6220_regs_pmctrl.h index dc09b2007..404405bff 100644 --- a/plat/hisilicon/hikey/include/hi6220_regs_pmctrl.h +++ b/plat/hisilicon/hikey/include/hi6220_regs_pmctrl.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __HI6220_REGS_PMCTRL_H__ -#define __HI6220_REGS_PMCTRL_H__ +#ifndef HI6220_REGS_PMCTRL_H +#define HI6220_REGS_PMCTRL_H #define PMCTRL_BASE 0xF7032000 @@ -98,4 +98,4 @@ #define SOC_PMCTRL_ACPUSYSPLLCFG_acpu_syspll_clken_stat_START (20) #define SOC_PMCTRL_ACPUSYSPLLCFG_acpu_syspll_clken_stat_END (20) -#endif /* __HI6220_REGS_PMCTRL_H__ */ +#endif /* HI6220_REGS_PMCTRL_H */ diff --git a/plat/hisilicon/hikey/include/hi6553.h b/plat/hisilicon/hikey/include/hi6553.h index a80d36dfb..55ce91caf 100644 --- a/plat/hisilicon/hikey/include/hi6553.h +++ b/plat/hisilicon/hikey/include/hi6553.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __HI6553_H__ -#define __HI6553_H__ +#ifndef HI6553_H +#define HI6553_H #include <hi6220.h> #include <mmio.h> @@ -78,4 +78,4 @@ #define PMU_HI6552_V300 0x30 #define PMU_HI6552_V310 0x31 -#endif /* __HI6553_H__ */ +#endif /* HI6553_H */ diff --git a/plat/hisilicon/hikey/include/hikey_def.h b/plat/hisilicon/hikey/include/hikey_def.h index deb375da9..b9679f576 100644 --- a/plat/hisilicon/hikey/include/hikey_def.h +++ b/plat/hisilicon/hikey/include/hikey_def.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __HIKEY_DEF_H__ -#define __HIKEY_DEF_H__ +#ifndef HIKEY_DEF_H +#define HIKEY_DEF_H /* Always assume DDR is 1GB size. */ #define DDR_BASE 0x0 @@ -104,4 +104,4 @@ #define IRQ_SEC_SGI_7 15 #define IRQ_SEC_SGI_8 16 -#endif /* __HIKEY_DEF_H__ */ +#endif /* HIKEY_DEF_H */ diff --git a/plat/hisilicon/hikey/include/hikey_layout.h b/plat/hisilicon/hikey/include/hikey_layout.h index acc7ad6f0..a87648ed2 100644 --- a/plat/hisilicon/hikey/include/hikey_layout.h +++ b/plat/hisilicon/hikey/include/hikey_layout.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __HIKEY_LAYOUT_H -#define __HIKEY_LAYOUT_H +#ifndef HIKEY_LAYOUT_H +#define HIKEY_LAYOUT_H /* * Platform memory map related constants @@ -119,4 +119,4 @@ #endif /* SPD_none */ #endif -#endif /* !__HIKEY_LAYOUT_H */ +#endif /* HIKEY_LAYOUT_H */ diff --git a/plat/hisilicon/hikey/include/hisi_ipc.h b/plat/hisilicon/hikey/include/hisi_ipc.h index b20742fea..b0c0ae879 100644 --- a/plat/hisilicon/hikey/include/hisi_ipc.h +++ b/plat/hisilicon/hikey/include/hisi_ipc.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __HISI_IPC_H__ -#define __HISI_IPC_H__ +#ifndef HISI_IPC_H +#define HISI_IPC_H #define HISI_IPC_CORE_ACPU 0x0 @@ -43,4 +43,4 @@ void hisi_ipc_cluster_suspend(unsigned int cpu, unsigned int cluster); void hisi_ipc_psci_system_off(void); int hisi_ipc_init(void); -#endif /* __HISI_IPC_H__ */ +#endif /* HISI_IPC_H */ diff --git a/plat/hisilicon/hikey/include/hisi_mcu.h b/plat/hisilicon/hikey/include/hisi_mcu.h index f5c6ed0d9..731c51ae8 100644 --- a/plat/hisilicon/hikey/include/hisi_mcu.h +++ b/plat/hisilicon/hikey/include/hisi_mcu.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __HISI_MCU_H__ -#define __HISI_MCU_H__ +#ifndef HISI_MCU_H +#define HISI_MCU_H #include <stdint.h> @@ -13,4 +13,4 @@ extern void hisi_mcu_enable_sram(void); extern void hisi_mcu_start_run(void); extern int hisi_mcu_load_image(uintptr_t image_base, uint32_t image_size); -#endif /* __HISI_MCU_H__ */ +#endif /* HISI_MCU_H */ diff --git a/plat/hisilicon/hikey/include/hisi_pwrc.h b/plat/hisilicon/hikey/include/hisi_pwrc.h index cffe70e3b..f1cc297dd 100644 --- a/plat/hisilicon/hikey/include/hisi_pwrc.h +++ b/plat/hisilicon/hikey/include/hisi_pwrc.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __HISI_PWRC_H__ -#define __HISI_PWRC_H__ +#ifndef HISI_PWRC_H +#define HISI_PWRC_H #ifndef __ASSEMBLY__ @@ -19,4 +19,4 @@ int hisi_pwrc_setup(void); #endif /*__ASSEMBLY__*/ -#endif /* __HISI_PWRC_H__ */ +#endif /* HISI_PWRC_H */ diff --git a/plat/hisilicon/hikey/include/hisi_sip_svc.h b/plat/hisilicon/hikey/include/hisi_sip_svc.h index 662b6ccc7..a1fad7ae1 100644 --- a/plat/hisilicon/hikey/include/hisi_sip_svc.h +++ b/plat/hisilicon/hikey/include/hisi_sip_svc.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __HISI_SIP_SVC_H__ -#define __HISI_SIP_SVC_H__ +#ifndef HISI_SIP_SVC_H +#define HISI_SIP_SVC_H /* SMC function IDs for SiP Service queries */ @@ -18,4 +18,4 @@ #define HISI_SIP_SVC_VERSION_MAJOR 0x0 #define HISI_SIP_SVC_VERSION_MINOR 0x1 -#endif /* __ARM_SIP_SVC_H__ */ +#endif /* HISI_SIP_SVC_H */ diff --git a/plat/hisilicon/hikey/include/hisi_sram_map.h b/plat/hisilicon/hikey/include/hisi_sram_map.h index ed90c7bfd..f93e418a6 100644 --- a/plat/hisilicon/hikey/include/hisi_sram_map.h +++ b/plat/hisilicon/hikey/include/hisi_sram_map.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __HISI_SRAM_MAP_H__ -#define __HISI_SRAM_MAP_H__ +#ifndef HISI_SRAM_MAP_H +#define HISI_SRAM_MAP_H /* * SRAM Memory Region Layout @@ -324,4 +324,4 @@ #define PWRCTRL_AXI_RESERVED_ADDR (ACPU_MASTER_CORE_STATE_ADDR + ACPU_MASTER_CORE_STATE_SIZE) -#endif /* __HISI_SRAM_MAP_H__ */ +#endif /* HISI_SRAM_MAP_H */ diff --git a/plat/hisilicon/hikey/include/plat_macros.S b/plat/hisilicon/hikey/include/plat_macros.S index fda0e394c..de38bd50b 100644 --- a/plat/hisilicon/hikey/include/plat_macros.S +++ b/plat/hisilicon/hikey/include/plat_macros.S @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_MACROS_S__ -#define __PLAT_MACROS_S__ +#ifndef PLAT_MACROS_S +#define PLAT_MACROS_S #include <cci.h> #include <gicv2.h> @@ -75,4 +75,4 @@ cci_iface_regs: bl str_in_crash_buf_print .endm -#endif /* __PLAT_MACROS_S__ */ +#endif /* PLAT_MACROS_S */ diff --git a/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.h b/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.h index a4d887fbe..c0170ad96 100644 --- a/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.h +++ b/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __HISI_PWRC_H__ -#define __HISI_PWRC_H__ +#ifndef HISI_PWRC_H +#define HISI_PWRC_H #include <hi3660.h> #include <hi3660_crg.h> @@ -54,4 +54,4 @@ void hisi_powerup_cluster(unsigned int cluster, unsigned int core); void hisi_powerdn_cluster(unsigned int cluster, unsigned int core); unsigned int hisi_test_cpu_down(unsigned int cluster, unsigned int core); -#endif /* __HISI_PWRC_H__ */ +#endif /* HISI_PWRC_H */ diff --git a/plat/hisilicon/hikey960/hikey960_def.h b/plat/hisilicon/hikey960/hikey960_def.h index fc46d71a7..91d0af3c0 100644 --- a/plat/hisilicon/hikey960/hikey960_def.h +++ b/plat/hisilicon/hikey960/hikey960_def.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __HIKEY960_DEF_H__ -#define __HIKEY960_DEF_H__ +#ifndef HIKEY960_DEF_H +#define HIKEY960_DEF_H #include <common_def.h> #include <tbbr_img_def.h> @@ -53,4 +53,4 @@ #define HIKEY960_UFS_DATA_BASE 0x10000000 #define HIKEY960_UFS_DATA_SIZE 0x0A000000 /* 160MB */ -#endif /* __HIKEY960_DEF_H__ */ +#endif /* HIKEY960_DEF_H */ diff --git a/plat/hisilicon/hikey960/hikey960_private.h b/plat/hisilicon/hikey960/hikey960_private.h index e2425fcad..31d3a4ae3 100644 --- a/plat/hisilicon/hikey960/hikey960_private.h +++ b/plat/hisilicon/hikey960/hikey960_private.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __HIKEY960_PRIVATE_H__ -#define __HIKEY960_PRIVATE_H__ +#ifndef HIKEY960_PRIVATE_H +#define HIKEY960_PRIVATE_H #include <bl_common.h> @@ -38,4 +38,4 @@ void clr_retention_ticks(unsigned int val); void clr_ex(void); void nop(void); -#endif /* __HIKEY960_PRIVATE_H__ */ +#endif /* HIKEY960_PRIVATE_H */ diff --git a/plat/hisilicon/hikey960/include/hi3660.h b/plat/hisilicon/hikey960/include/hi3660.h index 61b80b056..8ce531ea9 100644 --- a/plat/hisilicon/hikey960/include/hi3660.h +++ b/plat/hisilicon/hikey960/include/hi3660.h @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __HI3660_H__ -#define __HI3660_H__ +#ifndef HI3660_H +#define HI3660_H #include <hi3660_crg.h> #include <hi3660_hkadc.h> @@ -366,4 +366,4 @@ /* GPIO219: PD interrupt. pull up */ #define IOCG_AO_043_REG (IOCG_AO_REG_BASE + 0x030) -#endif /* __HI3660_H__ */ +#endif /* HI3660_H */ diff --git a/plat/hisilicon/hikey960/include/hi3660_crg.h b/plat/hisilicon/hikey960/include/hi3660_crg.h index db1df9edc..ec587aa0d 100644 --- a/plat/hisilicon/hikey960/include/hi3660_crg.h +++ b/plat/hisilicon/hikey960/include/hi3660_crg.h @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __HI3660_CRG_H__ -#define __HI3660_CRG_H__ +#ifndef HI3660_CRG_H +#define HI3660_CRG_H #define CRG_REG_BASE 0xFFF35000 @@ -176,4 +176,4 @@ #define SC_DIV_AO_HISE_MASK 3 #define SC_DIV_AO_HISE(x) ((x) & 0x3) -#endif /* __HI3660_CRG_H__ */ +#endif /* HI3660_CRG_H */ diff --git a/plat/hisilicon/hikey960/include/hi3660_hkadc.h b/plat/hisilicon/hikey960/include/hi3660_hkadc.h index 6e67114e3..4d2de4a5d 100644 --- a/plat/hisilicon/hikey960/include/hi3660_hkadc.h +++ b/plat/hisilicon/hikey960/include/hi3660_hkadc.h @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __HI3660_HKADC_H__ -#define __HI3660_HKADC_H__ +#ifndef HI3660_HKADC_H +#define HI3660_HKADC_H #define HKADC_SSI_REG_BASE 0xE82B8000 @@ -58,4 +58,4 @@ #define START_DELAY_TIMEOUT 2000 #define HKADC_WR_NUM_VALUE 4 -#endif /* __HI3660_HKADC_H__ */ +#endif /* HI3660_HKADC_H */ diff --git a/plat/hisilicon/hikey960/include/hi3660_mem_map.h b/plat/hisilicon/hikey960/include/hi3660_mem_map.h index db3efaf0a..cadc4a4b3 100644 --- a/plat/hisilicon/hikey960/include/hi3660_mem_map.h +++ b/plat/hisilicon/hikey960/include/hi3660_mem_map.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __HI3660_MEM_MAP__ -#define __HI3660_MEM_MAP__ +#ifndef HI3660_MEM_MAP_H +#define HI3660_MEM_MAP_H #define HISI_DATA_HEAD_BASE (0x89C44400) @@ -17,4 +17,4 @@ #define HISI_DATA1_BASE (0x89C93480) #define HISI_DATA1_SIZE (0x00002D00) -#endif /* __HI3660_MEM_MAP__ */ +#endif /* HI3660_MEM_MAP_H */ diff --git a/plat/hisilicon/hikey960/include/hisi_ipc.h b/plat/hisilicon/hikey960/include/hisi_ipc.h index 9dda1a57f..6a979689f 100644 --- a/plat/hisilicon/hikey960/include/hisi_ipc.h +++ b/plat/hisilicon/hikey960/include/hisi_ipc.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __HISI_IPC_H__ -#define __HISI_IPC_H__ +#ifndef HISI_IPC_H +#define HISI_IPC_H enum pm_mode { PM_ON = 0, @@ -21,4 +21,4 @@ void hisi_ipc_psci_system_reset(unsigned int core, unsigned int cluster, unsigned int cmd_id); int hisi_ipc_init(void); -#endif /* __HISI_IPC_H__ */ +#endif /* HISI_IPC_H */ diff --git a/plat/hisilicon/hikey960/include/plat_macros.S b/plat/hisilicon/hikey960/include/plat_macros.S index 4a2b95748..3b126f652 100644 --- a/plat/hisilicon/hikey960/include/plat_macros.S +++ b/plat/hisilicon/hikey960/include/plat_macros.S @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_MACROS_S__ -#define __PLAT_MACROS_S__ +#ifndef PLAT_MACROS_S +#define PLAT_MACROS_S #include <cci.h> #include <gicv2.h> @@ -75,4 +75,4 @@ cci_iface_regs: bl str_in_crash_buf_print .endm -#endif /* __PLAT_MACROS_S__ */ +#endif /* PLAT_MACROS_S */ diff --git a/plat/hisilicon/poplar/include/hi3798cv200.h b/plat/hisilicon/poplar/include/hi3798cv200.h index 254b35715..ddb43964c 100644 --- a/plat/hisilicon/poplar/include/hi3798cv200.h +++ b/plat/hisilicon/poplar/include/hi3798cv200.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __HI3798cv200_H__ -#define __HI3798cv200_H__ +#ifndef HI3798CV200_H +#define HI3798CV200_H #include <utils_def.h> @@ -102,4 +102,4 @@ #define HISI_TZPC_BASE (0xF8A80000) #define HISI_TZPC_SEC_ATTR_CTRL (HISI_TZPC_BASE + 0x10) -#endif /* __HI3798cv200_H__ */ +#endif /* HI3798CV200_H */ diff --git a/plat/hisilicon/poplar/include/plat_private.h b/plat/hisilicon/poplar/include/plat_private.h index 63b7d766f..3aeccc424 100644 --- a/plat/hisilicon/poplar/include/plat_private.h +++ b/plat/hisilicon/poplar/include/plat_private.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_PRIVATE_H__ -#define __PLAT_PRIVATE_H__ +#ifndef PLAT_PRIVATE_H +#define PLAT_PRIVATE_H #include <bl_common.h> #include "hi3798cv200.h" @@ -33,4 +33,4 @@ void poplar_gic_init(void); void poplar_gic_cpuif_enable(void); void poplar_gic_pcpu_init(void); -#endif /* __PLAT_PRIVATE_H__ */ +#endif /* PLAT_PRIVATE_H */ diff --git a/plat/hisilicon/poplar/include/poplar_layout.h b/plat/hisilicon/poplar/include/poplar_layout.h index 9fb5a94cf..03047f911 100644 --- a/plat/hisilicon/poplar/include/poplar_layout.h +++ b/plat/hisilicon/poplar/include/poplar_layout.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __POPLAR_LAYOUT_H -#define __POPLAR_LAYOUT_H +#ifndef POPLAR_LAYOUT_H +#define POPLAR_LAYOUT_H /* * Boot memory layout definitions for the HiSilicon Poplar board @@ -129,4 +129,4 @@ #define BL31_BASE (LLOADER_TEXT_BASE + BL31_OFFSET) #define BL31_LIMIT (BL31_BASE + BL31_SIZE) -#endif /* !__POPLAR_LAYOUT_H */ +#endif /* POPLAR_LAYOUT_H */ diff --git a/plat/imx/common/include/imx8_iomux.h b/plat/imx/common/include/imx8_iomux.h index 7a7f5491c..0e93d9800 100644 --- a/plat/imx/common/include/imx8_iomux.h +++ b/plat/imx/common/include/imx8_iomux.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __IMX8_IOMUX_H__ -#define __IMX8_IOMUX_H__ +#ifndef IMX8_IOMUX_H +#define IMX8_IOMUX_H #define PADRING_IFMUX_EN_SHIFT 31 #define PADRING_IFMUX_EN_MASK (1 << PADRING_IFMUX_EN_SHIFT) @@ -22,4 +22,4 @@ #define PADRING_DSE_SHIFT 0 #define PADRING_DSE_MASK (0x7 << PADRING_DSE_SHIFT) -#endif /* __IMX8_IOMUX_H__ */ +#endif /* IMX8_IOMUX_H */ diff --git a/plat/imx/common/include/imx8_lpuart.h b/plat/imx/common/include/imx8_lpuart.h index 33f955df7..8e1184f95 100644 --- a/plat/imx/common/include/imx8_lpuart.h +++ b/plat/imx/common/include/imx8_lpuart.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __IMX_LPUART_H__ -#define __IMX_LPUART_H__ +#ifndef IMX8_LPUART_H +#define IMX8_LPUART_H #include <console.h> @@ -63,4 +63,4 @@ int console_lpuart_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, console_lpuart_t *console); #endif /*__ASSEMBLY__*/ -#endif /* __IMX_LPUART_H__*/ +#endif /* IMX8_LPUART_H */ diff --git a/plat/imx/common/include/imx8qm_pads.h b/plat/imx/common/include/imx8qm_pads.h index 6107bd926..a5c1d2ceb 100644 --- a/plat/imx/common/include/imx8qm_pads.h +++ b/plat/imx/common/include/imx8qm_pads.h @@ -8,8 +8,8 @@ * Header file used to configure SoC pad list. */ -#ifndef SC_PADS_H -#define SC_PADS_H +#ifndef IMX8QM_PADS_H +#define IMX8QM_PADS_H /* Includes */ @@ -290,4 +290,4 @@ #define SC_P_COMP_CTL_GPIO_1V8_3V3_ENET_ENETA 268 /* */ /*@}*/ -#endif /* SC_PADS_H */ +#endif /* IMX8QM_PADS_H */ diff --git a/plat/imx/common/include/imx8qx_pads.h b/plat/imx/common/include/imx8qx_pads.h index 0e153bb1e..5445aa152 100644 --- a/plat/imx/common/include/imx8qx_pads.h +++ b/plat/imx/common/include/imx8qx_pads.h @@ -8,8 +8,8 @@ * Header file used to configure SoC pad list. */ -#ifndef SC_PADS_H -#define SC_PADS_H +#ifndef IMX8QX_PADS_H +#define IMX8QX_PADS_H /* Includes */ @@ -195,4 +195,4 @@ #define SC_P_COMP_CTL_GPIO_1V8_3V3_QSPI0B 173 /* */ /*@}*/ -#endif /* SC_PADS_H */ +#endif /* IMX8QX_PADS_H */ diff --git a/plat/imx/common/include/imx_aips.h b/plat/imx/common/include/imx_aips.h index 3c33553ba..1d41fe038 100644 --- a/plat/imx/common/include/imx_aips.h +++ b/plat/imx/common/include/imx_aips.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __IMX_AIPS_H__ -#define __IMX_AIPS_H__ +#ifndef IMX_AIPS_H +#define IMX_AIPS_H #include <stdint.h> @@ -19,4 +19,4 @@ struct aipstz_regs { void imx_aips_init(void); -#endif /* __IMX_AIPS_H__ */ +#endif /* IMX_AIPS_H */ diff --git a/plat/imx/common/include/imx_caam.h b/plat/imx/common/include/imx_caam.h index 2e1f41a31..335bd0f8b 100644 --- a/plat/imx/common/include/imx_caam.h +++ b/plat/imx/common/include/imx_caam.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __IMX_CAAM_H__ -#define __IMX_CAAM_H__ +#ifndef IMX_CAAM_H +#define IMX_CAAM_H #include <stdint.h> #include <arch.h> @@ -66,4 +66,4 @@ struct caam_ctrl { /* Declare CAAM API */ void imx_caam_init(void); -#endif /* __IMX_CAAM_H__ */ +#endif /* IMX_CAAM_H */ diff --git a/plat/imx/common/include/imx_clock.h b/plat/imx/common/include/imx_clock.h index 85586380f..ce245ad55 100644 --- a/plat/imx/common/include/imx_clock.h +++ b/plat/imx/common/include/imx_clock.h @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __IMX_CLOCK_H__ -#define __IMX_CLOCK_H__ +#ifndef IMX_CLOCK_H +#define IMX_CLOCK_H #include <stdint.h> #include <stdbool.h> @@ -999,4 +999,4 @@ void imx_clock_enable_usb(unsigned int usb_id); void imx_clock_disable_usb(unsigned int usb_id); void imx_clock_set_usb_clk_root_bits(uint32_t usb_clk_root_en_bits); -#endif /* __IMX_CLOCK_H__ */ +#endif /* IMX_CLOCK_H */ diff --git a/plat/imx/common/include/imx_csu.h b/plat/imx/common/include/imx_csu.h index 9bf937386..879d10b67 100644 --- a/plat/imx/common/include/imx_csu.h +++ b/plat/imx/common/include/imx_csu.h @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __IMX_CSU_H__ -#define __IMX_CSU_H__ +#ifndef IMX_CSU_H +#define IMX_CSU_H #include <arch.h> @@ -41,4 +41,4 @@ CSU_CSL_SUR_S2) void imx_csu_init(void); -#endif /* __IMX_CSU_H__ */ +#endif /* IMX_CSU_H */ diff --git a/plat/imx/common/include/imx_hab.h b/plat/imx/common/include/imx_hab.h index e3d266c66..22c074278 100644 --- a/plat/imx/common/include/imx_hab.h +++ b/plat/imx/common/include/imx_hab.h @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __IMX_HAB_H__ -#define __IMX_HAB_H__ +#ifndef IMX_HAB_H +#define IMX_HAB_H #include <imx_hab_arch.h> #include <imx_regs.h> @@ -30,4 +30,4 @@ #define HAB_ROM_VECTOR_TABLE_REPORT_STATUS (HAB_ROM_VECTOR_BASE + 0x24) #define HAB_ROM_VECTOR_TABLE_FAILSAFE (HAB_ROM_VECTOR_BASE + 0x28) -#endif /* __IMX_HAB_H__ */ +#endif /* IMX_HAB_H */ diff --git a/plat/imx/common/include/imx_io_mux.h b/plat/imx/common/include/imx_io_mux.h index 44284f6fe..9b304217e 100644 --- a/plat/imx/common/include/imx_io_mux.h +++ b/plat/imx/common/include/imx_io_mux.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __IMX_IO_MUX_H__ -#define __IMX_IO_MUX_H__ +#ifndef IMX_IO_MUX_H +#define IMX_IO_MUX_H #include <stdint.h> @@ -606,4 +606,4 @@ void imx_io_muxc_set_pad_alt_function(uint32_t pad_mux_offset, uint32_t alt_function); void imx_io_muxc_set_pad_features(uint32_t pad_feature_offset, uint32_t pad_features); -#endif /* __IMX_IO_MUX_H__ */ +#endif /* IMX_IO_MUX_H */ diff --git a/plat/imx/common/include/imx_snvs.h b/plat/imx/common/include/imx_snvs.h index 081ae8c68..0aed1e142 100644 --- a/plat/imx/common/include/imx_snvs.h +++ b/plat/imx/common/include/imx_snvs.h @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __IMX_SNVS_H__ -#define __IMX_SNVS_H__ +#ifndef IMX_SNVS_H +#define IMX_SNVS_H #include <stdint.h> #include <arch.h> @@ -79,4 +79,4 @@ struct snvs { void imx_snvs_init(void); -#endif /* __IMX_SNVS_H__ */ +#endif /* IMX_SNVS_H */ diff --git a/plat/imx/common/include/imx_wdog.h b/plat/imx/common/include/imx_wdog.h index 8033e6268..7b3037dfe 100644 --- a/plat/imx/common/include/imx_wdog.h +++ b/plat/imx/common/include/imx_wdog.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __IMX_WDOG_H__ -#define __IMX_WDOG_H__ +#ifndef IMX_WDOG_H +#define IMX_WDOG_H #include <arch.h> #include <stdint.h> @@ -58,4 +58,4 @@ static inline int wicr_calc_wict(int sec, int half_sec) /* External facing API */ void imx_wdog_init(void); -#endif /* __IMX_WDOG_H__ */ +#endif /* IMX_WDOG_H */ diff --git a/plat/imx/common/include/plat_imx8.h b/plat/imx/common/include/plat_imx8.h index a333bfbe1..03799c459 100644 --- a/plat/imx/common/include/plat_imx8.h +++ b/plat/imx/common/include/plat_imx8.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_IMX8_H__ -#define __PLAT_IMX8_H__ +#ifndef PLAT_IMX8_H +#define PLAT_IMX8_H #include <gicv3.h> #include <psci.h> @@ -23,4 +23,5 @@ void __dead2 imx_system_reset(void); int imx_validate_power_state(unsigned int power_state, psci_power_state_t *req_state); void imx_get_sys_suspend_power_state(psci_power_state_t *req_state); -#endif /*__PLAT_IMX8_H__ */ + +#endif /* PLAT_IMX8_H */ diff --git a/plat/imx/common/include/sci/sci.h b/plat/imx/common/include/sci/sci.h index 3dd17ce1f..f0a25027c 100644 --- a/plat/imx/common/include/sci/sci.h +++ b/plat/imx/common/include/sci/sci.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef _SC_SCI_H -#define _SC_SCI_H +#ifndef SCI_H +#define SCI_H /* Defines */ @@ -16,4 +16,4 @@ #include <sci/svc/pm/sci_pm_api.h> #include <sci/svc/rm/sci_rm_api.h> -#endif /* _SC_SCI_H */ +#endif /* SCI_H */ diff --git a/plat/imx/common/include/sci/sci_ipc.h b/plat/imx/common/include/sci/sci_ipc.h index c169a7911..1167ea367 100644 --- a/plat/imx/common/include/sci/sci_ipc.h +++ b/plat/imx/common/include/sci/sci_ipc.h @@ -8,8 +8,8 @@ * Header file for the IPC implementation. */ -#ifndef SC_IPC_H -#define SC_IPC_H +#ifndef SCI_IPC_H +#define SCI_IPC_H /* Includes */ @@ -64,4 +64,4 @@ void sc_ipc_write(sc_ipc_t ipc, void *data); sc_ipc_t ipc_handle; -#endif /* SC_IPC_H */ +#endif /* SCI_IPC_H */ diff --git a/plat/imx/common/include/sci/sci_rpc.h b/plat/imx/common/include/sci/sci_rpc.h index 052f3615c..1771baed3 100644 --- a/plat/imx/common/include/sci/sci_rpc.h +++ b/plat/imx/common/include/sci/sci_rpc.h @@ -8,8 +8,8 @@ * Header file for the RPC implementation. */ -#ifndef SC_RPC_H -#define SC_RPC_H +#ifndef SCI_RPC_H +#define SCI_RPC_H /* Includes */ @@ -124,4 +124,4 @@ void sc_rpc_dispatch(sc_rsrc_t mu, sc_rpc_msg_t *msg); */ void sc_rpc_xlate(sc_ipc_t ipc, sc_rpc_msg_t *msg); -#endif /* SC_RPC_H */ +#endif /* SCI_RPC_H */ diff --git a/plat/imx/common/include/sci/sci_scfw.h b/plat/imx/common/include/sci/sci_scfw.h index 781c69e01..a169f88c5 100644 --- a/plat/imx/common/include/sci/sci_scfw.h +++ b/plat/imx/common/include/sci/sci_scfw.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef _SC_SCFW_H -#define _SC_SCFW_H +#ifndef SCI_SCFW_H +#define SCI_SCFW_H /* Includes */ @@ -33,5 +33,4 @@ typedef uint64_t sc_ipc_t; typedef uint64_t sc_ipc_id_t; -#endif /* _SC_SCFW_H */ - +#endif /* SCI_SCFW_H */ diff --git a/plat/imx/common/include/sci/sci_types.h b/plat/imx/common/include/sci/sci_types.h index 3ee527676..6ade01cd1 100644 --- a/plat/imx/common/include/sci/sci_types.h +++ b/plat/imx/common/include/sci/sci_types.h @@ -8,8 +8,8 @@ * Header file containing types used across multiple service APIs. */ -#ifndef SC_TYPES_H -#define SC_TYPES_H +#ifndef SCI_TYPES_H +#define SCI_TYPES_H /* Includes */ @@ -846,4 +846,4 @@ typedef __UINT32_TYPE__ uint32_t; typedef __UINT64_TYPE__ uint64_t; #endif -#endif /* SC_TYPES_H */ +#endif /* SCI_TYPES_H */ diff --git a/plat/imx/common/include/sci/svc/pad/sci_pad_api.h b/plat/imx/common/include/sci/svc/pad/sci_pad_api.h index 0955678ba..dc23eedb3 100644 --- a/plat/imx/common/include/sci/svc/pad/sci_pad_api.h +++ b/plat/imx/common/include/sci/svc/pad/sci_pad_api.h @@ -52,8 +52,8 @@ * @{ */ -#ifndef SC_PAD_API_H -#define SC_PAD_API_H +#ifndef SCI_PAD_API_H +#define SCI_PAD_API_H /* Includes */ @@ -567,6 +567,6 @@ sc_err_t sc_pad_get_gp_28fdsoi_comp(sc_ipc_t ipc, sc_pad_t pad, /* @} */ -#endif /* SC_PAD_API_H */ +#endif /* SCI_PAD_API_H */ /**@}*/ diff --git a/plat/imx/common/include/sci/svc/pm/sci_pm_api.h b/plat/imx/common/include/sci/svc/pm/sci_pm_api.h index 5c3c3821d..76ca5c4ea 100644 --- a/plat/imx/common/include/sci/svc/pm/sci_pm_api.h +++ b/plat/imx/common/include/sci/svc/pm/sci_pm_api.h @@ -16,8 +16,8 @@ * @{ */ -#ifndef SC_PM_API_H -#define SC_PM_API_H +#ifndef SCI_PM_API_H +#define SCI_PM_API_H /* Includes */ @@ -679,6 +679,6 @@ sc_err_t sc_pm_cpu_start(sc_ipc_t ipc, sc_rsrc_t resource, sc_bool_t enable, /* @} */ -#endif /* SC_PM_API_H */ +#endif /* SCI_PM_API_H */ /**@}*/ diff --git a/plat/imx/common/include/sci/svc/rm/sci_rm_api.h b/plat/imx/common/include/sci/svc/rm/sci_rm_api.h index 012d919fd..df1bc401c 100644 --- a/plat/imx/common/include/sci/svc/rm/sci_rm_api.h +++ b/plat/imx/common/include/sci/svc/rm/sci_rm_api.h @@ -18,8 +18,8 @@ * @{ */ -#ifndef SC_RM_API_H -#define SC_RM_API_H +#ifndef SCI_RM_API_H +#define SCI_RM_API_H /* Includes */ @@ -752,6 +752,6 @@ void sc_rm_dump(sc_ipc_t ipc); /* @} */ -#endif /* SC_RM_API_H */ +#endif /* SCI_RM_API_H */ /**@}*/ diff --git a/plat/imx/common/sci/svc/pad/sci_pad_rpc.h b/plat/imx/common/sci/svc/pad/sci_pad_rpc.h index 686e6e997..8e9c4bb33 100644 --- a/plat/imx/common/sci/svc/pad/sci_pad_rpc.h +++ b/plat/imx/common/sci/svc/pad/sci_pad_rpc.h @@ -11,8 +11,8 @@ * @{ */ -#ifndef SC_PAD_RPC_H -#define SC_PAD_RPC_H +#ifndef SCI_PAD_RPC_H +#define SCI_PAD_RPC_H /* Includes */ @@ -61,6 +61,6 @@ void pad_dispatch(sc_rm_pt_t caller_pt, sc_rpc_msg_t *msg); */ void pad_xlate(sc_ipc_t ipc, sc_rpc_msg_t *msg); -#endif /* SC_PAD_RPC_H */ +#endif /* SCI_PAD_RPC_H */ /**@}*/ diff --git a/plat/imx/common/sci/svc/pm/sci_pm_rpc.h b/plat/imx/common/sci/svc/pm/sci_pm_rpc.h index 19ab6e441..8bad3c7b5 100644 --- a/plat/imx/common/sci/svc/pm/sci_pm_rpc.h +++ b/plat/imx/common/sci/svc/pm/sci_pm_rpc.h @@ -11,8 +11,8 @@ * @{ */ -#ifndef SC_PM_RPC_H -#define SC_PM_RPC_H +#ifndef SCI_PM_RPC_H +#define SCI_PM_RPC_H /* Includes */ @@ -66,6 +66,6 @@ void pm_dispatch(sc_rm_pt_t caller_pt, sc_rpc_msg_t *msg); */ void pm_xlate(sc_ipc_t ipc, sc_rpc_msg_t *msg); -#endif /* SC_PM_RPC_H */ +#endif /* SCI_PM_RPC_H */ /**@}*/ diff --git a/plat/imx/common/sci/svc/rm/sci_rm_rpc.h b/plat/imx/common/sci/svc/rm/sci_rm_rpc.h index e3de4505e..45d05f995 100644 --- a/plat/imx/common/sci/svc/rm/sci_rm_rpc.h +++ b/plat/imx/common/sci/svc/rm/sci_rm_rpc.h @@ -11,8 +11,8 @@ * @{ */ -#ifndef SC_RM_RPC_H -#define SC_RM_RPC_H +#ifndef SCI_RM_RPC_H +#define SCI_RM_RPC_H /* Includes */ @@ -76,6 +76,6 @@ void rm_dispatch(sc_rm_pt_t caller_pt, sc_rpc_msg_t *msg); */ void rm_xlate(sc_ipc_t ipc, sc_rpc_msg_t *msg); -#endif /* SC_RM_RPC_H */ +#endif /* SCI_RM_RPC_H */ /**@}*/ diff --git a/plat/imx/imx7/include/imx_hab_arch.h b/plat/imx/imx7/include/imx_hab_arch.h index 338a02745..2a34c6a89 100644 --- a/plat/imx/imx7/include/imx_hab_arch.h +++ b/plat/imx/imx7/include/imx_hab_arch.h @@ -3,10 +3,10 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __IMX_HAB_ARCH_H__ -#define __IMX_HAB_ARCH_H__ +#ifndef IMX_HAB_ARCH_H +#define IMX_HAB_ARCH_H /* Define the offset the High Assurance Boot callback table is at */ #define HAB_CALLBACK_OFFSET 0x100 -#endif /* __IMX_HAB_ARCH_H__ */ +#endif /* IMX_HAB_ARCH_H */ diff --git a/plat/imx/imx7/include/imx_regs.h b/plat/imx/imx7/include/imx_regs.h index aa345cfca..3c7e20f50 100644 --- a/plat/imx/imx7/include/imx_regs.h +++ b/plat/imx/imx7/include/imx_regs.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __IMX_REGS_H__ -#define __IMX_REGS_H__ +#ifndef IMX_REGS_H +#define IMX_REGS_H /* Define the processor memory map */ @@ -105,4 +105,4 @@ /* Define the maximum number of WDOG blocks on this SoC */ #define MXC_MAX_WDOG_NUM 0x04 -#endif /* __IMX_REGS_H__ */ +#endif /* IMX_REGS_H */ diff --git a/plat/imx/imx7/warp7/include/platform_def.h b/plat/imx/imx7/warp7/include/platform_def.h index 27429c7af..d0148f422 100644 --- a/plat/imx/imx7/warp7/include/platform_def.h +++ b/plat/imx/imx7/warp7/include/platform_def.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLATFORM_DEF_H__ -#define __PLATFORM_DEF_H__ +#ifndef PLATFORM_DEF_H +#define PLATFORM_DEF_H #include <arch.h> #include <common_def.h> @@ -214,4 +214,4 @@ */ #define SYS_COUNTER_FREQ_IN_TICKS 8000000 /* 8 MHz */ -#endif /* __PLATFORM_DEF_H__ */ +#endif /* PLATFORM_DEF_H */ diff --git a/plat/imx/imx7/warp7/warp7_private.h b/plat/imx/imx7/warp7/warp7_private.h index c93acacf4..cb6d90015 100644 --- a/plat/imx/imx7/warp7/warp7_private.h +++ b/plat/imx/imx7/warp7/warp7_private.h @@ -4,12 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __WARP7_PRIVATE_H__ -#define __WARP7_PRIVATE_H__ +#ifndef WARP7_PRIVATE_H +#define WARP7_PRIVATE_H /******************************************************************************* * Function and variable prototypes ******************************************************************************/ void plat_warp7_io_setup(void); -#endif /*__WARP7_PRIVATE_H__ */ +#endif /* WARP7_PRIVATE_H */ diff --git a/plat/layerscape/board/ls1043/include/ns_access.h b/plat/layerscape/board/ls1043/include/ns_access.h index 6ed7bc003..833a5df0e 100644 --- a/plat/layerscape/board/ls1043/include/ns_access.h +++ b/plat/layerscape/board/ls1043/include/ns_access.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __FSL_NS_ACCESS_H_ -#define __FSL_NS_ACCESS_H_ +#ifndef NS_ACCESS_H +#define NS_ACCESS_H #include "fsl_csu.h" @@ -171,4 +171,4 @@ static struct csu_ns_dev ns_dev[] = { {CSU_CSLX_DSCR, CSU_ALL_RW}, }; -#endif +#endif /* NS_ACCESS_H */ diff --git a/plat/layerscape/board/ls1043/include/plat_macros.S b/plat/layerscape/board/ls1043/include/plat_macros.S index 8163dc164..1ae43ef33 100644 --- a/plat/layerscape/board/ls1043/include/plat_macros.S +++ b/plat/layerscape/board/ls1043/include/plat_macros.S @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_MACROS_S__ -#define __PLAT_MACROS_S__ +#ifndef PLAT_MACROS_S +#define PLAT_MACROS_S /* --------------------------------------------- * The below required platform porting macro @@ -18,4 +18,4 @@ .macro plat_crash_print_regs .endm -#endif /* __PLAT_MACROS_S__ */ +#endif /* PLAT_MACROS_S */ diff --git a/plat/layerscape/board/ls1043/include/soc_tzasc.h b/plat/layerscape/board/ls1043/include/soc_tzasc.h index 0039f2d30..b2483d981 100644 --- a/plat/layerscape/board/ls1043/include/soc_tzasc.h +++ b/plat/layerscape/board/ls1043/include/soc_tzasc.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef _SOC_TZASC_H_ -#define _SOC_TZASC_H_ +#ifndef SOC_TZASC_H +#define SOC_TZASC_H #include "tzc380.h" @@ -90,4 +90,4 @@ static const struct tzc380_reg tzc380_reg_list[] = { {} }; -#endif /* _SOC_TZASC_H_ */ +#endif /* SOC_TZASC_H */ diff --git a/plat/layerscape/common/include/fsl_csu.h b/plat/layerscape/common/include/fsl_csu.h index 680911ef7..5cc88b13a 100644 --- a/plat/layerscape/common/include/fsl_csu.h +++ b/plat/layerscape/common/include/fsl_csu.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __FSL_CSU_H__ -#define __FSL_CSU_H__ +#ifndef FSL_CSU_H +#define FSL_CSU_H enum csu_cslx_access { CSU_NS_SUP_R = 0x08, @@ -30,4 +30,4 @@ struct csu_ns_dev { void enable_layerscape_ns_access(void); -#endif +#endif /* FSL_CSU_H */ diff --git a/plat/layerscape/common/include/ls_16550.h b/plat/layerscape/common/include/ls_16550.h index 8daafbb48..94694eef7 100644 --- a/plat/layerscape/common/include/ls_16550.h +++ b/plat/layerscape/common/include/ls_16550.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __LS_16550_H__ -#define __LS_16550_H__ +#ifndef LS_16550_H +#define LS_16550_H #include <console.h> @@ -83,4 +83,4 @@ int console_ls_16550_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, #endif /*__ASSEMBLY__*/ -#endif /* __LS_16550_H__ */ +#endif /* LS_16550_H */ diff --git a/plat/layerscape/common/include/plat_ls.h b/plat/layerscape/common/include/plat_ls.h index 05b9c053b..49526ca8b 100644 --- a/plat/layerscape/common/include/plat_ls.h +++ b/plat/layerscape/common/include/plat_ls.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_LS_H__ -#define __PLAT_LS_H__ +#ifndef PLAT_LS_H +#define PLAT_LS_H #include <cpu_data.h> #include <stdint.h> @@ -58,4 +58,4 @@ unsigned int plat_ls_calc_core_pos(u_register_t mpidr); /* others */ unsigned int plat_ls_get_cluster_core_count(u_register_t mpidr); -#endif /* __PLAT_LS_H__ */ +#endif /* PLAT_LS_H */ diff --git a/plat/layerscape/common/include/soc.h b/plat/layerscape/common/include/soc.h index 72c10cf91..76c341893 100644 --- a/plat/layerscape/common/include/soc.h +++ b/plat/layerscape/common/include/soc.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __LAYERSCAPE_SOC_H__ -#define __LAYERSCAPE_SOC_H__ +#ifndef SOC_H +#define SOC_H #include <stdint.h> @@ -15,4 +15,4 @@ void get_gic_offset(uint32_t *gicc_base, uint32_t *gicd_base); -#endif /* __LAYERSCAPE_SOC_H__ */ +#endif /* SOC_H */ diff --git a/plat/layerscape/common/include/tzc380.h b/plat/layerscape/common/include/tzc380.h index 788c0ed15..88063a973 100644 --- a/plat/layerscape/common/include/tzc380.h +++ b/plat/layerscape/common/include/tzc380.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __TZC380_H__ -#define __TZC380_H__ +#ifndef TZC380_H +#define TZC380_H struct tzc380_reg { unsigned int secure; @@ -16,4 +16,4 @@ struct tzc380_reg { unsigned int sub_mask; }; -#endif /* __TZC380_H__ */ +#endif /* TZC380_H */ diff --git a/plat/layerscape/common/tsp/platform_tsp.h b/plat/layerscape/common/tsp/platform_tsp.h index b1c96cbb6..260f66ac4 100644 --- a/plat/layerscape/common/tsp/platform_tsp.h +++ b/plat/layerscape/common/tsp/platform_tsp.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLATFORM_TSP_H__ -#define __PLATFORM_TSP_H__ +#ifndef PLATFORM_TSP_H +#define PLATFORM_TSP_H /******************************************************************************* * Mandatory TSP functions (only if platform contains a TSP) @@ -14,4 +14,4 @@ void tsp_early_platform_setup(void); void tsp_plat_arch_setup(void); void tsp_platform_setup(void); -#endif /* __PLATFORM_TSP_H__ */ +#endif /* PLATFORM_TSP_H */ diff --git a/plat/marvell/a3700/a3700/mvebu_def.h b/plat/marvell/a3700/a3700/mvebu_def.h index c58f06bb5..dad1085f8 100644 --- a/plat/marvell/a3700/a3700/mvebu_def.h +++ b/plat/marvell/a3700/a3700/mvebu_def.h @@ -5,9 +5,9 @@ * https://spdx.org/licenses */ -#ifndef __MVEBU_DEF_H__ -#define __MVEBU_DEF_H__ +#ifndef MVEBU_DEF_H +#define MVEBU_DEF_H #include <a3700_plat_def.h> -#endif /* __MVEBU_DEF_H__ */ +#endif /* MVEBU_DEF_H */ diff --git a/plat/marvell/a3700/common/include/a3700_plat_def.h b/plat/marvell/a3700/common/include/a3700_plat_def.h index 6ae57b3f0..c7f40adc3 100644 --- a/plat/marvell/a3700/common/include/a3700_plat_def.h +++ b/plat/marvell/a3700/common/include/a3700_plat_def.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __A3700_PLAT_DEF_H__ -#define __A3700_PLAT_DEF_H__ +#ifndef A3700_PLAT_DEF_H +#define A3700_PLAT_DEF_H #include <marvell_def.h> @@ -119,4 +119,4 @@ */ #define MVEBU_COMPHY_REG_BASE (MVEBU_REGS_BASE + 0x18300) -#endif /* __A3700_PLAT_DEF_H__ */ +#endif /* A3700_PLAT_DEF_H */ diff --git a/plat/marvell/a3700/common/include/a3700_pm.h b/plat/marvell/a3700/common/include/a3700_pm.h index bd8792a9b..cc6cf436a 100644 --- a/plat/marvell/a3700/common/include/a3700_pm.h +++ b/plat/marvell/a3700/common/include/a3700_pm.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __A3700_PM_H__ -#define __A3700_PM_H__ +#ifndef A3700_PM_H +#define A3700_PM_H #include <stdint.h> @@ -48,5 +48,4 @@ struct pm_wake_up_src_config { struct pm_wake_up_src_config *mv_wake_up_src_config_get(void); - -#endif /* __A3700_PM_H__ */ +#endif /* A3700_PM_H */ diff --git a/plat/marvell/a3700/common/include/ddr_info.h b/plat/marvell/a3700/common/include/ddr_info.h index 1a9230da0..254f78c1b 100644 --- a/plat/marvell/a3700/common/include/ddr_info.h +++ b/plat/marvell/a3700/common/include/ddr_info.h @@ -5,10 +5,10 @@ * https://spdx.org/licenses */ -#ifndef _DDR_INFO_H_ -#define _DDR_INFO_H_ +#ifndef DDR_INFO_H +#define DDR_INFO_H #define DRAM_MAX_IFACE 1 #define DRAM_CH0_MMAP_LOW_OFFSET 0x200 -#endif /* _DDR_INFO_H_ */ +#endif /* DDR_INFO_H */ diff --git a/plat/marvell/a3700/common/include/dram_win.h b/plat/marvell/a3700/common/include/dram_win.h index 7ff20bed7..6f345f945 100644 --- a/plat/marvell/a3700/common/include/dram_win.h +++ b/plat/marvell/a3700/common/include/dram_win.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef _DRAM_WIN_H_ -#define _DRAM_WIN_H_ +#ifndef DRAM_WIN_H +#define DRAM_WIN_H #include <bl_common.h> #include <io_addr_dec.h> @@ -14,5 +14,4 @@ void dram_win_map_build(struct dram_win_map *win_map); void cpu_wins_init(void); -#endif /* _DRAM_WIN_H_ */ - +#endif /* DRAM_WIN_H */ diff --git a/plat/marvell/a3700/common/include/io_addr_dec.h b/plat/marvell/a3700/common/include/io_addr_dec.h index 79f6f2cc5..42ef30bc2 100644 --- a/plat/marvell/a3700/common/include/io_addr_dec.h +++ b/plat/marvell/a3700/common/include/io_addr_dec.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef _IO_ADDR_DEC_H_ -#define _IO_ADDR_DEC_H_ +#ifndef IO_ADDR_DEC_H +#define IO_ADDR_DEC_H #include <stdint.h> @@ -63,5 +63,4 @@ int init_io_addr_dec(struct dram_win_map *dram_wins_map, struct dec_win_config *io_dec_config, uint32_t io_unit_num); -#endif /* _IO_ADDR_DEC_H_ */ - +#endif /* IO_ADDR_DEC_H */ diff --git a/plat/marvell/a3700/common/include/plat_macros.S b/plat/marvell/a3700/common/include/plat_macros.S index b52d1cf1d..f689b4f39 100644 --- a/plat/marvell/a3700/common/include/plat_macros.S +++ b/plat/marvell/a3700/common/include/plat_macros.S @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __PLAT_MACROS_S__ -#define __PLAT_MACROS_S__ +#ifndef PLAT_MACROS_S +#define PLAT_MACROS_S #include <marvell_macros.S> @@ -23,4 +23,4 @@ print_cci_regs .endm -#endif /* __PLAT_MACROS_S__ */ +#endif /* PLAT_MACROS_S */ diff --git a/plat/marvell/a3700/common/include/platform_def.h b/plat/marvell/a3700/common/include/platform_def.h index 7c72cc54a..ca2553c99 100644 --- a/plat/marvell/a3700/common/include/platform_def.h +++ b/plat/marvell/a3700/common/include/platform_def.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __PLATFORM_DEF_H__ -#define __PLATFORM_DEF_H__ +#ifndef PLATFORM_DEF_H +#define PLATFORM_DEF_H #include <board_marvell_def.h> #include <mvebu_def.h> @@ -228,4 +228,4 @@ #define BL32_LIMIT TRUSTED_DRAM_SIZE #endif -#endif /* __PLATFORM_DEF_H__ */ +#endif /* PLATFORM_DEF_H */ diff --git a/plat/marvell/a8k/a70x0/mvebu_def.h b/plat/marvell/a8k/a70x0/mvebu_def.h index a7c5abbb2..72bca12e3 100644 --- a/plat/marvell/a8k/a70x0/mvebu_def.h +++ b/plat/marvell/a8k/a70x0/mvebu_def.h @@ -5,11 +5,11 @@ * https://spdx.org/licenses */ -#ifndef __MVEBU_DEF_H__ -#define __MVEBU_DEF_H__ +#ifndef MVEBU_DEF_H +#define MVEBU_DEF_H #include <a8k_plat_def.h> #define CP_COUNT 1 /* A70x0 has single CP0 */ -#endif /* __MVEBU_DEF_H__ */ +#endif /* MVEBU_DEF_H */ diff --git a/plat/marvell/a8k/a70x0_amc/mvebu_def.h b/plat/marvell/a8k/a70x0_amc/mvebu_def.h index 5c6655283..cedf3239a 100644 --- a/plat/marvell/a8k/a70x0_amc/mvebu_def.h +++ b/plat/marvell/a8k/a70x0_amc/mvebu_def.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __MVEBU_DEF_H__ -#define __MVEBU_DEF_H__ +#ifndef MVEBU_DEF_H +#define MVEBU_DEF_H #include <a8k_plat_def.h> @@ -28,4 +28,4 @@ #endif -#endif /* __MVEBU_DEF_H__ */ +#endif /* MVEBU_DEF_H */ diff --git a/plat/marvell/a8k/a80x0/board/phy-porting-layer.h b/plat/marvell/a8k/a80x0/board/phy-porting-layer.h index da391ebee..38497fb53 100644 --- a/plat/marvell/a8k/a80x0/board/phy-porting-layer.h +++ b/plat/marvell/a8k/a80x0/board/phy-porting-layer.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __PHY_PORTING_LAYER_H -#define __PHY_PORTING_LAYER_H +#ifndef PHY_PORTING_LAYER_H +#define PHY_PORTING_LAYER_H #define MAX_LANE_NR 6 @@ -164,4 +164,4 @@ static const struct sata_params }, }, }; -#endif /* __PHY_PORTING_LAYER_H */ +#endif /* PHY_PORTING_LAYER_H */ diff --git a/plat/marvell/a8k/a80x0/mvebu_def.h b/plat/marvell/a8k/a80x0/mvebu_def.h index 5bff12ce5..3fa119af6 100644 --- a/plat/marvell/a8k/a80x0/mvebu_def.h +++ b/plat/marvell/a8k/a80x0/mvebu_def.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __MVEBU_DEF_H__ -#define __MVEBU_DEF_H__ +#ifndef MVEBU_DEF_H +#define MVEBU_DEF_H #include <a8k_plat_def.h> @@ -14,4 +14,4 @@ #define I2C_SPD_ADDR 0x53 /* Access SPD data */ #define I2C_SPD_P0_ADDR 0x36 /* Select SPD data page 0 */ -#endif /* __MVEBU_DEF_H__ */ +#endif /* MVEBU_DEF_H */ diff --git a/plat/marvell/a8k/a80x0_mcbin/mvebu_def.h b/plat/marvell/a8k/a80x0_mcbin/mvebu_def.h index 5bff12ce5..3fa119af6 100644 --- a/plat/marvell/a8k/a80x0_mcbin/mvebu_def.h +++ b/plat/marvell/a8k/a80x0_mcbin/mvebu_def.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __MVEBU_DEF_H__ -#define __MVEBU_DEF_H__ +#ifndef MVEBU_DEF_H +#define MVEBU_DEF_H #include <a8k_plat_def.h> @@ -14,4 +14,4 @@ #define I2C_SPD_ADDR 0x53 /* Access SPD data */ #define I2C_SPD_P0_ADDR 0x36 /* Select SPD data page 0 */ -#endif /* __MVEBU_DEF_H__ */ +#endif /* MVEBU_DEF_H */ diff --git a/plat/marvell/a8k/common/include/a8k_plat_def.h b/plat/marvell/a8k/common/include/a8k_plat_def.h index 55ad00247..7ed56e042 100644 --- a/plat/marvell/a8k/common/include/a8k_plat_def.h +++ b/plat/marvell/a8k/common/include/a8k_plat_def.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __A8K_PLAT_DEF_H__ -#define __A8K_PLAT_DEF_H__ +#ifndef A8K_PLAT_DEF_H +#define A8K_PLAT_DEF_H #include <marvell_def.h> @@ -191,4 +191,4 @@ enum ccu_target_ids { }; #endif /* __ASSEMBLER__ */ -#endif /* __A8K_PLAT_DEF_H__ */ +#endif /* A8K_PLAT_DEF_H */ diff --git a/plat/marvell/a8k/common/include/mentor_i2c_plat.h b/plat/marvell/a8k/common/include/mentor_i2c_plat.h index 8829a922c..e03c448a6 100644 --- a/plat/marvell/a8k/common/include/mentor_i2c_plat.h +++ b/plat/marvell/a8k/common/include/mentor_i2c_plat.h @@ -6,8 +6,8 @@ */ /* This driver provides I2C support for Marvell A8K and compatible SoCs */ -#ifndef A8K_I2C_H -#define A8K_I2C_H +#ifndef MENTOR_I2C_PLAT_H +#define MENTOR_I2C_PLAT_H #define CONFIG_SYS_TCLK 250000000 #define CONFIG_SYS_I2C_SPEED 100000 @@ -30,4 +30,4 @@ struct mentor_i2c_regs { uint32_t unstuck; }; -#endif +#endif /* MENTOR_I2C_PLAT_H */ diff --git a/plat/marvell/a8k/common/include/plat_macros.S b/plat/marvell/a8k/common/include/plat_macros.S index 2a6ccf27c..8faccf00b 100644 --- a/plat/marvell/a8k/common/include/plat_macros.S +++ b/plat/marvell/a8k/common/include/plat_macros.S @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __PLAT_MACROS_S__ -#define __PLAT_MACROS_S__ +#ifndef PLAT_MACROS_S +#define PLAT_MACROS_S #include <marvell_macros.S> @@ -17,4 +17,4 @@ .macro plat_crash_print_regs .endm -#endif /* __PLAT_MACROS_S__ */ +#endif /* PLAT_MACROS_S */ diff --git a/plat/marvell/a8k/common/include/platform_def.h b/plat/marvell/a8k/common/include/platform_def.h index ed7bb63da..4c3e7a9ea 100644 --- a/plat/marvell/a8k/common/include/platform_def.h +++ b/plat/marvell/a8k/common/include/platform_def.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __PLATFORM_DEF_H__ -#define __PLATFORM_DEF_H__ +#ifndef PLATFORM_DEF_H +#define PLATFORM_DEF_H #include <board_marvell_def.h> #include <gic_common.h> @@ -198,4 +198,4 @@ #define MVEBU_PMU_IRQ_WA -#endif /* __PLATFORM_DEF_H__ */ +#endif /* PLATFORM_DEF_H */ diff --git a/plat/marvell/a8k/common/mss/mss_pm_ipc.h b/plat/marvell/a8k/common/mss/mss_pm_ipc.h index 0f6945707..1dfa9fa03 100644 --- a/plat/marvell/a8k/common/mss/mss_pm_ipc.h +++ b/plat/marvell/a8k/common/mss/mss_pm_ipc.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __MSS_PM_IPC_H -#define __MSS_PM_IPC_H +#ifndef MSS_PM_IPC_H +#define MSS_PM_IPC_H #include <mss_ipc_drv.h> @@ -32,4 +32,4 @@ int mss_pm_ipc_msg_send(unsigned int channel_id, unsigned int msg_id, int mss_pm_ipc_msg_trigger(void); -#endif /* __MSS_PM_IPC_H */ +#endif /* MSS_PM_IPC_H */ diff --git a/plat/marvell/common/mss/mss_ipc_drv.h b/plat/marvell/common/mss/mss_ipc_drv.h index 28eb907ea..7bb15d3f2 100644 --- a/plat/marvell/common/mss/mss_ipc_drv.h +++ b/plat/marvell/common/mss/mss_ipc_drv.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __PM_IPC_DRV_H -#define __PM_IPC_DRV_H +#ifndef MSS_IPC_DRV_H +#define MSS_IPC_DRV_H #include <psci.h> @@ -117,4 +117,4 @@ int mv_pm_ipc_msg_rx(unsigned int channel_id, struct mss_pm_ipc_msg *msg); int mv_pm_ipc_msg_tx(unsigned int channel_id, unsigned int msg_id, unsigned int cluster_power_state); -#endif /* __PM_IPC_DRV_H */ +#endif /* MSS_IPC_DRV_H */ diff --git a/plat/marvell/common/mss/mss_mem.h b/plat/marvell/common/mss/mss_mem.h index efff59e62..5d68ac788 100644 --- a/plat/marvell/common/mss/mss_mem.h +++ b/plat/marvell/common/mss/mss_mem.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __MSS_PM_MEM_H -#define __MSS_PM_MEM_H +#ifndef MSS_MEM_H +#define MSS_MEM_H /* MSS SRAM Memory base */ #define MSS_SRAM_PM_CONTROL_BASE (MVEBU_REGS_BASE + 0x520000) @@ -57,4 +57,4 @@ struct mss_pm_ctrl_block { unsigned int ctrl_blk_size; }; -#endif /* __MSS_PM_MEM_H */ +#endif /* MSS_MEM_H */ diff --git a/plat/marvell/common/mss/mss_scp_bl2_format.h b/plat/marvell/common/mss/mss_scp_bl2_format.h index c04df727a..7cf8d3201 100644 --- a/plat/marvell/common/mss/mss_scp_bl2_format.h +++ b/plat/marvell/common/mss/mss_scp_bl2_format.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __MSS_SCP_BL2_FORMAT_H -#define __MSS_SCP_BL2_FORMAT_H +#ifndef MSS_SCP_BL2_FORMAT_H +#define MSS_SCP_BL2_FORMAT_H #define MAX_NR_OF_FILES 5 #define FILE_MAGIC 0xddd01ff @@ -41,4 +41,4 @@ typedef struct img_header { */ } img_header_t; -#endif /* __MSS_SCP_BL2_FORMAT_H */ +#endif /* MSS_SCP_BL2_FORMAT_H */ diff --git a/plat/marvell/common/mss/mss_scp_bootloader.h b/plat/marvell/common/mss/mss_scp_bootloader.h index 67c387a03..4950d2472 100644 --- a/plat/marvell/common/mss/mss_scp_bootloader.h +++ b/plat/marvell/common/mss/mss_scp_bootloader.h @@ -5,8 +5,8 @@ * https://spdx.org/licenses */ -#ifndef __MSS_SCP_BOOTLOADER_H__ -#define __MSS_SCP_BOOTLOADER_H__ +#ifndef MSS_SCP_BOOTLOADER_H +#define MSS_SCP_BOOTLOADER_H int scp_bootloader_transfer(void *image, unsigned int image_size); uintptr_t bl2_plat_get_cp_mss_regs(int ap_idx, int cp_idx); @@ -16,4 +16,4 @@ uint32_t bl2_plat_get_ap_count(void); void bl2_plat_configure_mss_windows(uintptr_t mss_regs); int bl2_plat_mss_check_image_ready(void); -#endif /* __MSS_SCP_BOOTLOADER_H__ */ +#endif /* MSS_SCP_BOOTLOADER_H */ diff --git a/plat/mediatek/common/custom/oem_svc.h b/plat/mediatek/common/custom/oem_svc.h index 636bb879e..76f7c24e5 100644 --- a/plat/mediatek/common/custom/oem_svc.h +++ b/plat/mediatek/common/custom/oem_svc.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __OEM_SVC_H__ -#define __OEM_SVC_H__ +#ifndef OEM_SVC_H +#define OEM_SVC_H /******************************************************************************* * Defines for runtime services func ids @@ -41,4 +41,4 @@ #define OEM_SVC_E_NOT_SUPPORTED -1 #define OEM_SVC_E_INVALID_PARAMS -2 -#endif /* __OEM_SVC_H__ */ +#endif /* OEM_SVC_H */ diff --git a/plat/mediatek/common/drivers/uart/uart8250.h b/plat/mediatek/common/drivers/uart/uart8250.h index 8204d3fde..da7c7a125 100644 --- a/plat/mediatek/common/drivers/uart/uart8250.h +++ b/plat/mediatek/common/drivers/uart/uart8250.h @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __UART8250_H__ -#define __UART8250_H__ +#ifndef UART8250_H +#define UART8250_H /* UART register */ #define UART_RBR 0x00 /* Receive buffer register */ @@ -35,4 +35,4 @@ #define UART_LSR_DR 0x01 /* Data ready */ #define UART_LSR_THRE 0x20 /* Xmit holding register empty */ -#endif /* __UART8250_H__ */ +#endif /* UART8250_H */ diff --git a/plat/mediatek/common/mtk_plat_common.h b/plat/mediatek/common/mtk_plat_common.h index 923cf6932..ff8e8c037 100644 --- a/plat/mediatek/common/mtk_plat_common.h +++ b/plat/mediatek/common/mtk_plat_common.h @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __MTK_PLAT_COMMON_H__ -#define __MTK_PLAT_COMMON_H__ +#ifndef MTK_PLAT_COMMON_H +#define MTK_PLAT_COMMON_H #include <bl_common.h> #include <param_header.h> @@ -74,4 +74,4 @@ uint64_t get_kernel_info_r1(void); uint64_t get_kernel_info_r2(void); extern struct atf_arg_t gteearg; -#endif +#endif /* MTK_PLAT_COMMON_H */ diff --git a/plat/mediatek/common/mtk_sip_svc.h b/plat/mediatek/common/mtk_sip_svc.h index 1572ba758..cd4096e73 100644 --- a/plat/mediatek/common/mtk_sip_svc.h +++ b/plat/mediatek/common/mtk_sip_svc.h @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_SIP_SVC_H__ -#define __PLAT_SIP_SVC_H__ +#ifndef MTK_SIP_SVC_H +#define MTK_SIP_SVC_H #include <stdint.h> @@ -50,4 +50,4 @@ enum { */ uint64_t mt_sip_set_authorized_sreg(uint32_t sreg, uint32_t val); -#endif /* __PLAT_SIP_SVC_H__ */ +#endif /* MTK_SIP_SVC_H */ diff --git a/plat/mediatek/mt6795/drivers/timer/mt_cpuxgpt.h b/plat/mediatek/mt6795/drivers/timer/mt_cpuxgpt.h index 99b78a778..84df081bd 100644 --- a/plat/mediatek/mt6795/drivers/timer/mt_cpuxgpt.h +++ b/plat/mediatek/mt6795/drivers/timer/mt_cpuxgpt.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __MT_CPUXGPT_H__ -#define __MT_CPUXGPT_H__ +#ifndef MT_CPUXGPT_H +#define MT_CPUXGPT_H /* REG */ #define INDEX_CTL_REG 0x000 @@ -25,4 +25,4 @@ void generic_timer_backup(void); void sched_clock_init(uint64_t normal_base, uint64_t atf_base); uint64_t sched_clock(void); -#endif /* __MT_CPUXGPT_H__ */ +#endif /* MT_CPUXGPT_H */ diff --git a/plat/mediatek/mt6795/include/mcucfg.h b/plat/mediatek/mt6795/include/mcucfg.h index eff8d3440..7f6a78655 100644 --- a/plat/mediatek/mt6795/include/mcucfg.h +++ b/plat/mediatek/mt6795/include/mcucfg.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __MCUCFG_H__ -#define __MCUCFG_H__ +#ifndef MCUCFG_H +#define MCUCFG_H #include <platform_def.h> #include <stdint.h> @@ -151,4 +151,4 @@ enum { MP1_L2RSTDISABLE = 1 << MP1_L2RSTDISABLE_SHIFT }; -#endif /* __MCUCFG_H__ */ +#endif /* MCUCFG_H */ diff --git a/plat/mediatek/mt6795/include/plat_private.h b/plat/mediatek/mt6795/include/plat_private.h index 9c6c1f0f1..10baa23d9 100644 --- a/plat/mediatek/mt6795/include/plat_private.h +++ b/plat/mediatek/mt6795/include/plat_private.h @@ -4,8 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_PRIVATE_H__ -#define __PLAT_PRIVATE_H__ +#ifndef PLAT_PRIVATE_H +#define PLAT_PRIVATE_H + #include <stdint.h> #include <xlat_tables.h> @@ -33,4 +34,4 @@ void plat_mt_gic_cpuif_enable(void); void plat_mt_gic_cpuif_disable(void); void plat_mt_gic_pcpu_init(void); -#endif /* __PLAT_PRIVATE_H__ */ +#endif /* PLAT_PRIVATE_H */ diff --git a/plat/mediatek/mt6795/include/plat_sip_calls.h b/plat/mediatek/mt6795/include/plat_sip_calls.h index b3281950f..b9a13638c 100644 --- a/plat/mediatek/mt6795/include/plat_sip_calls.h +++ b/plat/mediatek/mt6795/include/plat_sip_calls.h @@ -4,12 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_SIP_CALLS_H__ -#define __PLAT_SIP_CALLS_H__ +#ifndef PLAT_SIP_CALLS_H +#define PLAT_SIP_CALLS_H /******************************************************************************* * Plat SiP function constants ******************************************************************************/ #define MTK_PLAT_SIP_NUM_CALLS 0 -#endif /* __PLAT_SIP_CALLS_H__ */ +#endif /* PLAT_SIP_CALLS_H */ diff --git a/plat/mediatek/mt6795/include/power_tracer.h b/plat/mediatek/mt6795/include/power_tracer.h index 5eb77e48f..8c98dbd15 100644 --- a/plat/mediatek/mt6795/include/power_tracer.h +++ b/plat/mediatek/mt6795/include/power_tracer.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __POWER_TRACER_H__ -#define __POWER_TRACER_H__ +#ifndef POWER_TRACER_H +#define POWER_TRACER_H #define CPU_UP 0 #define CPU_DOWN 1 @@ -16,4 +16,4 @@ void trace_power_flow(unsigned long mpidr, unsigned char mode); -#endif +#endif /* POWER_TRACER_H */ diff --git a/plat/mediatek/mt6795/include/scu.h b/plat/mediatek/mt6795/include/scu.h index 3c786921a..625418aa2 100644 --- a/plat/mediatek/mt6795/include/scu.h +++ b/plat/mediatek/mt6795/include/scu.h @@ -4,10 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SCU_H__ -#define __SCU_H__ +#ifndef SCU_H +#define SCU_H void disable_scu(unsigned long mpidr); void enable_scu(unsigned long mpidr); -#endif +#endif /* SCU_H */ diff --git a/plat/mediatek/mt6795/include/spm.h b/plat/mediatek/mt6795/include/spm.h index 5e31276fc..5227e1ddc 100644 --- a/plat/mediatek/mt6795/include/spm.h +++ b/plat/mediatek/mt6795/include/spm.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SPM_H__ -#define __SPM_H__ +#ifndef SPM_H +#define SPM_H #define SPM_POWERON_CONFIG_SET (SPM_BASE + 0x000) #define SPM_POWER_ON_VAL0 (SPM_BASE + 0x010) @@ -195,4 +195,4 @@ #define WAKE_SRC_ALL_MD32 (1 << 28) #define WAKE_SRC_CPU_IRQ (1 << 29) -#endif /* __SPM_H__ */ +#endif /* SPM_H */ diff --git a/plat/mediatek/mt8173/drivers/crypt/crypt.h b/plat/mediatek/mt8173/drivers/crypt/crypt.h index 3bbc1680a..1a691a6ca 100644 --- a/plat/mediatek/mt8173/drivers/crypt/crypt.h +++ b/plat/mediatek/mt8173/drivers/crypt/crypt.h @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CRYPT_H__ -#define __CRYPT_H__ +#ifndef CRYPT_H +#define CRYPT_H #include <stdint.h> @@ -13,4 +13,4 @@ uint64_t crypt_set_hdcp_key_ex(uint64_t x1, uint64_t x2, uint64_t x3); uint64_t crypt_set_hdcp_key_num(uint32_t num); uint64_t crypt_clear_hdcp_key(void); -#endif /* __CRYPT_H__ */ +#endif /* CRYPT_H */ diff --git a/plat/mediatek/mt8173/drivers/mtcmos/mtcmos.h b/plat/mediatek/mt8173/drivers/mtcmos/mtcmos.h index 6e14e3db5..1e580273c 100644 --- a/plat/mediatek/mt8173/drivers/mtcmos/mtcmos.h +++ b/plat/mediatek/mt8173/drivers/mtcmos/mtcmos.h @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __MTCMOS_H__ -#define __MTCMOS_H__ +#ifndef MTCMOS_H +#define MTCMOS_H /* * This function will turn off all the little core's power except cpu 0. The @@ -15,4 +15,4 @@ void mtcmos_little_cpu_off(void); uint32_t mtcmos_non_cpu_ctrl(uint32_t on, uint32_t mtcmos_num); -#endif /* __MTCMOS_H__ */ +#endif /* MTCMOS_H */ diff --git a/plat/mediatek/mt8173/drivers/pmic/pmic_wrap_init.h b/plat/mediatek/mt8173/drivers/pmic/pmic_wrap_init.h index 01f1b25e4..0f0977137 100644 --- a/plat/mediatek/mt8173/drivers/pmic/pmic_wrap_init.h +++ b/plat/mediatek/mt8173/drivers/pmic/pmic_wrap_init.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PMIC_WRAP_INIT_H__ -#define __PMIC_WRAP_INIT_H__ +#ifndef PMIC_WRAP_INIT_H +#define PMIC_WRAP_INIT_H /* external API */ int32_t pwrap_read(uint32_t adr, uint32_t *rdata); @@ -164,4 +164,4 @@ enum { E_PWR_SWITCH_DIO = 32 }; -#endif /* __PMIC_WRAP_INIT_H__ */ +#endif /* PMIC_WRAP_INIT_H */ diff --git a/plat/mediatek/mt8173/drivers/rtc/rtc.h b/plat/mediatek/mt8173/drivers/rtc/rtc.h index d4f8a5643..9c4ca49a9 100644 --- a/plat/mediatek/mt8173/drivers/rtc/rtc.h +++ b/plat/mediatek/mt8173/drivers/rtc/rtc.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_DRIVER_RTC_H__ -#define __PLAT_DRIVER_RTC_H__ +#ifndef RTC_H +#define RTC_H /* RTC registers */ enum { @@ -51,4 +51,4 @@ enum { void rtc_bbpu_power_down(void); -#endif /* __PLAT_DRIVER_RTC_H__ */ +#endif /* RTC_H */ diff --git a/plat/mediatek/mt8173/drivers/spm/spm.h b/plat/mediatek/mt8173/drivers/spm/spm.h index abbee2fb4..403303a0d 100644 --- a/plat/mediatek/mt8173/drivers/spm/spm.h +++ b/plat/mediatek/mt8173/drivers/spm/spm.h @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SPM_H__ -#define __SPM_H__ +#ifndef SPM_H +#define SPM_H #define SPM_POWERON_CONFIG_SET (SPM_BASE + 0x000) #define SPM_POWER_ON_VAL0 (SPM_BASE + 0x010) @@ -333,4 +333,4 @@ void spm_lock_get(void); void spm_lock_release(void); void spm_boot_init(void); -#endif /* __SPM_H__ */ +#endif /* SPM_H */ diff --git a/plat/mediatek/mt8173/drivers/spm/spm_hotplug.h b/plat/mediatek/mt8173/drivers/spm/spm_hotplug.h index 8ebf5c41e..00849a2e6 100644 --- a/plat/mediatek/mt8173/drivers/spm/spm_hotplug.h +++ b/plat/mediatek/mt8173/drivers/spm/spm_hotplug.h @@ -3,11 +3,11 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SPM_HOTPLUG_H__ -#define __SPM_HOTPLUG_H__ +#ifndef SPM_HOTPLUG_H +#define SPM_HOTPLUG_H void spm_clear_hotplug(void); void spm_hotplug_off(unsigned long mpidr); void spm_hotplug_on(unsigned long mpidr); -#endif /* __SPM_HOTPLUG_H__ */ +#endif /* SPM_HOTPLUG_H */ diff --git a/plat/mediatek/mt8173/drivers/spm/spm_mcdi.h b/plat/mediatek/mt8173/drivers/spm/spm_mcdi.h index e29f565c7..7f3f96ec3 100644 --- a/plat/mediatek/mt8173/drivers/spm/spm_mcdi.h +++ b/plat/mediatek/mt8173/drivers/spm/spm_mcdi.h @@ -3,12 +3,12 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SPM_MCDI_H__ -#define __SPM_MCDI_H__ +#ifndef SPM_MCDI_H +#define SPM_MCDI_H void spm_mcdi_wakeup_all_cores(void); void spm_mcdi_prepare_for_mtcmos(void); void spm_mcdi_prepare_for_off_state(unsigned long mpidr, unsigned int afflvl); void spm_mcdi_finish_for_on_state(unsigned long mpidr, unsigned int afflvl); -#endif /* __SPM_MCDI_H__ */ +#endif /* SPM_MCDI_H */ diff --git a/plat/mediatek/mt8173/drivers/spm/spm_suspend.h b/plat/mediatek/mt8173/drivers/spm/spm_suspend.h index 4041cfe75..b00faa916 100644 --- a/plat/mediatek/mt8173/drivers/spm/spm_suspend.h +++ b/plat/mediatek/mt8173/drivers/spm/spm_suspend.h @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SPM_SUSPEND_H__ -#define __SPM_SUSPEND_H__ +#ifndef SPM_SUSPEND_H +#define SPM_SUSPEND_H /* cpu dormant return code */ #define CPU_DORMANT_RESET 0 @@ -13,4 +13,4 @@ void spm_system_suspend(void); void spm_system_suspend_finish(void); -#endif /* __SPM_SUSPEND_H__*/ +#endif /* SPM_SUSPEND_H*/ diff --git a/plat/mediatek/mt8173/drivers/timer/mt_cpuxgpt.h b/plat/mediatek/mt8173/drivers/timer/mt_cpuxgpt.h index 0364bba09..8c0fe83ad 100644 --- a/plat/mediatek/mt8173/drivers/timer/mt_cpuxgpt.h +++ b/plat/mediatek/mt8173/drivers/timer/mt_cpuxgpt.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __MT_CPUXGPT_H__ -#define __MT_CPUXGPT_H__ +#ifndef MT_CPUXGPT_H +#define MT_CPUXGPT_H /* REG */ #define INDEX_CNT_L_INIT 0x008 @@ -13,4 +13,4 @@ void generic_timer_backup(void); -#endif /* __MT_CPUXGPT_H__ */ +#endif /* MT_CPUXGPT_H */ diff --git a/plat/mediatek/mt8173/include/mcucfg.h b/plat/mediatek/mt8173/include/mcucfg.h index 355c276e5..49d7c3e18 100644 --- a/plat/mediatek/mt8173/include/mcucfg.h +++ b/plat/mediatek/mt8173/include/mcucfg.h @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __MCUCFG_H__ -#define __MCUCFG_H__ +#ifndef MCUCFG_H +#define MCUCFG_H #include <mt8173_def.h> #include <stdint.h> @@ -216,4 +216,4 @@ enum { ACLK_EMI_DYNAMIC_CG_EN | ACLK_INFRA_DYNAMIC_CG_EN, }; -#endif /* __MCUCFG_H__ */ +#endif /* MCUCFG_H */ diff --git a/plat/mediatek/mt8173/include/mt8173_def.h b/plat/mediatek/mt8173/include/mt8173_def.h index 3289de40f..58962f03d 100644 --- a/plat/mediatek/mt8173/include/mt8173_def.h +++ b/plat/mediatek/mt8173/include/mt8173_def.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __MT8173_DEF_H__ -#define __MT8173_DEF_H__ +#ifndef MT8173_DEF_H +#define MT8173_DEF_H #if RESET_TO_BL31 #error "MT8173 is incompatible with RESET_TO_BL31!" @@ -149,4 +149,4 @@ mtk_make_pwrstate_lvl1(lvl1_state, lvl0_state, pwr_lvl, type)) -#endif /* __MT8173_DEF_H__ */ +#endif /* MT8173_DEF_H */ diff --git a/plat/mediatek/mt8173/include/plat_private.h b/plat/mediatek/mt8173/include/plat_private.h index 87ffbfc07..cd92d34fa 100644 --- a/plat/mediatek/mt8173/include/plat_private.h +++ b/plat/mediatek/mt8173/include/plat_private.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_PRIVATE_H__ -#define __PLAT_PRIVATE_H__ +#ifndef PLAT_PRIVATE_H +#define PLAT_PRIVATE_H /******************************************************************************* * Function and variable prototypes @@ -24,4 +24,4 @@ void plat_cci_disable(void); /* Declarations for plat_topology.c */ int mt_setup_topology(void); -#endif /* __PLAT_PRIVATE_H__ */ +#endif /* PLAT_PRIVATE_H */ diff --git a/plat/mediatek/mt8173/include/plat_sip_calls.h b/plat/mediatek/mt8173/include/plat_sip_calls.h index 25937095b..88202cc55 100644 --- a/plat/mediatek/mt8173/include/plat_sip_calls.h +++ b/plat/mediatek/mt8173/include/plat_sip_calls.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_SIP_CALLS_H__ -#define __PLAT_SIP_CALLS_H__ +#ifndef PLAT_SIP_CALLS_H +#define PLAT_SIP_CALLS_H /******************************************************************************* * Plat SiP function constants @@ -19,4 +19,4 @@ #define MTK_SIP_CLR_HDCP_KEY 0x82000406 #define MTK_SIP_SET_HDCP_KEY_EX 0x82000407 -#endif /* __PLAT_SIP_CALLS_H__ */ +#endif /* PLAT_SIP_CALLS_H */ diff --git a/plat/mediatek/mt8173/include/power_tracer.h b/plat/mediatek/mt8173/include/power_tracer.h index e8c055280..195366d4d 100644 --- a/plat/mediatek/mt8173/include/power_tracer.h +++ b/plat/mediatek/mt8173/include/power_tracer.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __POWER_TRACER_H__ -#define __POWER_TRACER_H__ +#ifndef POWER_TRACER_H +#define POWER_TRACER_H #define CPU_UP 0 #define CPU_DOWN 1 @@ -16,4 +16,4 @@ void trace_power_flow(unsigned long mpidr, unsigned char mode); -#endif +#endif /* POWER_TRACER_H */ diff --git a/plat/mediatek/mt8173/include/scu.h b/plat/mediatek/mt8173/include/scu.h index 2ce4b23f4..b1e94246e 100644 --- a/plat/mediatek/mt8173/include/scu.h +++ b/plat/mediatek/mt8173/include/scu.h @@ -4,10 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SCU_H__ -#define __SCU_H__ +#ifndef SCU_H +#define SCU_H void disable_scu(unsigned long mpidr); void enable_scu(unsigned long mpidr); -#endif +#endif /* SCU_H */ diff --git a/plat/nvidia/tegra/include/drivers/flowctrl.h b/plat/nvidia/tegra/include/drivers/flowctrl.h index 2e3bcf049..d604c970d 100644 --- a/plat/nvidia/tegra/include/drivers/flowctrl.h +++ b/plat/nvidia/tegra/include/drivers/flowctrl.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __FLOWCTRL_H__ -#define __FLOWCTRL_H__ +#ifndef FLOWCTRL_H +#define FLOWCTRL_H #include <mmio.h> #include <tegra_def.h> @@ -58,4 +58,4 @@ void tegra_fc_cpu_off(int cpu); void tegra_fc_lock_active_cluster(void); void tegra_fc_reset_bpmp(void); -#endif /* __FLOWCTRL_H__ */ +#endif /* FLOWCTRL_H */ diff --git a/plat/nvidia/tegra/include/drivers/mce.h b/plat/nvidia/tegra/include/drivers/mce.h index c7867a509..81408702f 100644 --- a/plat/nvidia/tegra/include/drivers/mce.h +++ b/plat/nvidia/tegra/include/drivers/mce.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __MCE_H__ -#define __MCE_H__ +#ifndef MCE_H +#define MCE_H #include <mmio.h> #include <tegra_def.h> @@ -73,4 +73,4 @@ __dead2 void mce_enter_ccplex_state(uint32_t state_idx); void mce_update_cstate_info(const mce_cstate_info_t *cstate); void mce_verify_firmware_version(void); -#endif /* __MCE_H__ */ +#endif /* MCE_H */ diff --git a/plat/nvidia/tegra/include/drivers/memctrl.h b/plat/nvidia/tegra/include/drivers/memctrl.h index 8413299d8..17427cbec 100644 --- a/plat/nvidia/tegra/include/drivers/memctrl.h +++ b/plat/nvidia/tegra/include/drivers/memctrl.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __MEMCTRL_H__ -#define __MEMCTRL_H__ +#ifndef MEMCTRL_H +#define MEMCTRL_H void tegra_memctrl_setup(void); void tegra_memctrl_restore_settings(void); @@ -14,4 +14,4 @@ void tegra_memctrl_tzram_setup(uint64_t phys_base, uint32_t size_in_bytes); void tegra_memctrl_videomem_setup(uint64_t phys_base, uint32_t size_in_bytes); void tegra_memctrl_disable_ahb_redirection(void); -#endif /* __MEMCTRL_H__ */ +#endif /* MEMCTRL_H */ diff --git a/plat/nvidia/tegra/include/drivers/memctrl_v1.h b/plat/nvidia/tegra/include/drivers/memctrl_v1.h index 78ee2e766..2553a1fd5 100644 --- a/plat/nvidia/tegra/include/drivers/memctrl_v1.h +++ b/plat/nvidia/tegra/include/drivers/memctrl_v1.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __MEMCTRLV1_H__ -#define __MEMCTRLV1_H__ +#ifndef MEMCTRL_V1_H +#define MEMCTRL_V1_H #include <mmio.h> #include <tegra_def.h> @@ -53,4 +53,4 @@ static inline void tegra_mc_write_32(uint32_t off, uint32_t val) mmio_write_32(TEGRA_MC_BASE + off, val); } -#endif /* __MEMCTRLV1_H__ */ +#endif /* MEMCTRL_V1_H */ diff --git a/plat/nvidia/tegra/include/drivers/memctrl_v2.h b/plat/nvidia/tegra/include/drivers/memctrl_v2.h index b72653e49..9ae430232 100644 --- a/plat/nvidia/tegra/include/drivers/memctrl_v2.h +++ b/plat/nvidia/tegra/include/drivers/memctrl_v2.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __MEMCTRLV2_H__ -#define __MEMCTRLV2_H__ +#ifndef MEMCTRL_V2_H +#define MEMCTRL_V2_H #include <tegra_def.h> @@ -475,4 +475,4 @@ tegra_mc_settings_t *tegra_get_mc_settings(void); #endif /* __ASSMEBLY__ */ -#endif /* __MEMCTRLV2_H__ */ +#endif /* MEMCTRL_V2_H */ diff --git a/plat/nvidia/tegra/include/drivers/pmc.h b/plat/nvidia/tegra/include/drivers/pmc.h index ea9392b6d..14c922544 100644 --- a/plat/nvidia/tegra/include/drivers/pmc.h +++ b/plat/nvidia/tegra/include/drivers/pmc.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PMC_H__ -#define __PMC_H__ +#ifndef PMC_H +#define PMC_H #include <mmio.h> #include <tegra_def.h> @@ -40,4 +40,4 @@ void tegra_pmc_lock_cpu_vectors(void); void tegra_pmc_cpu_on(int32_t cpu); __dead2 void tegra_pmc_system_reset(void); -#endif /* __PMC_H__ */ +#endif /* PMC_H */ diff --git a/plat/nvidia/tegra/include/drivers/smmu.h b/plat/nvidia/tegra/include/drivers/smmu.h index 86e911a24..974aa3500 100644 --- a/plat/nvidia/tegra/include/drivers/smmu.h +++ b/plat/nvidia/tegra/include/drivers/smmu.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SMMU_H -#define __SMMU_H +#ifndef SMMU_H +#define SMMU_H #include <memctrl_v2.h> #include <mmio.h> @@ -705,4 +705,4 @@ void tegra_smmu_init(void); void tegra_smmu_save_context(uint64_t smmu_ctx_addr); smmu_regs_t *plat_get_smmu_ctx(void); -#endif /*__SMMU_H */ +#endif /* SMMU_H */ diff --git a/plat/nvidia/tegra/include/plat_macros.S b/plat/nvidia/tegra/include/plat_macros.S index caf114852..14e7d8a38 100644 --- a/plat/nvidia/tegra/include/plat_macros.S +++ b/plat/nvidia/tegra/include/plat_macros.S @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_MACROS_S__ -#define __PLAT_MACROS_S__ +#ifndef PLAT_MACROS_S +#define PLAT_MACROS_S #include <tegra_def.h> @@ -57,4 +57,4 @@ spacer: 1: .endm -#endif /* __PLAT_MACROS_S__ */ +#endif /* PLAT_MACROS_S */ diff --git a/plat/nvidia/tegra/include/platform_def.h b/plat/nvidia/tegra/include/platform_def.h index 4894442a8..6a507d481 100644 --- a/plat/nvidia/tegra/include/platform_def.h +++ b/plat/nvidia/tegra/include/platform_def.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLATFORM_DEF_H__ -#define __PLATFORM_DEF_H__ +#ifndef PLATFORM_DEF_H +#define PLATFORM_DEF_H #include <arch.h> #include <common_def.h> @@ -65,4 +65,4 @@ #define CACHE_WRITEBACK_SHIFT 6 #define CACHE_WRITEBACK_GRANULE (U(1) << CACHE_WRITEBACK_SHIFT) -#endif /* __PLATFORM_DEF_H__ */ +#endif /* PLATFORM_DEF_H */ diff --git a/plat/nvidia/tegra/include/t132/tegra_def.h b/plat/nvidia/tegra/include/t132/tegra_def.h index ae00fb5c6..277f91b63 100644 --- a/plat/nvidia/tegra/include/t132/tegra_def.h +++ b/plat/nvidia/tegra/include/t132/tegra_def.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __TEGRA_DEF_H__ -#define __TEGRA_DEF_H__ +#ifndef TEGRA_DEF_H +#define TEGRA_DEF_H #include <utils_def.h> @@ -99,4 +99,4 @@ #define TEGRA_TZRAM_BASE U(0x7C010000) #define TEGRA_TZRAM_SIZE U(0x10000) -#endif /* __TEGRA_DEF_H__ */ +#endif /* TEGRA_DEF_H */ diff --git a/plat/nvidia/tegra/include/t186/tegra_def.h b/plat/nvidia/tegra/include/t186/tegra_def.h index d0331472b..79aff5970 100644 --- a/plat/nvidia/tegra/include/t186/tegra_def.h +++ b/plat/nvidia/tegra/include/t186/tegra_def.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __TEGRA_DEF_H__ -#define __TEGRA_DEF_H__ +#ifndef TEGRA_DEF_H +#define TEGRA_DEF_H #include <utils_def.h> @@ -247,4 +247,4 @@ #define TEGRA_TZRAM_BASE U(0x30000000) #define TEGRA_TZRAM_SIZE U(0x40000) -#endif /* __TEGRA_DEF_H__ */ +#endif /* TEGRA_DEF_H */ diff --git a/plat/nvidia/tegra/include/t210/tegra_def.h b/plat/nvidia/tegra/include/t210/tegra_def.h index 454c666d8..5d86224f9 100644 --- a/plat/nvidia/tegra/include/t210/tegra_def.h +++ b/plat/nvidia/tegra/include/t210/tegra_def.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __TEGRA_DEF_H__ -#define __TEGRA_DEF_H__ +#ifndef TEGRA_DEF_H +#define TEGRA_DEF_H #include <utils_def.h> @@ -124,4 +124,4 @@ #define TEGRA_TZRAM_BASE U(0x7C010000) #define TEGRA_TZRAM_SIZE U(0x10000) -#endif /* __TEGRA_DEF_H__ */ +#endif /* TEGRA_DEF_H */ diff --git a/plat/nvidia/tegra/include/tegra_platform.h b/plat/nvidia/tegra/include/tegra_platform.h index db79fbe21..63a0e01e3 100644 --- a/plat/nvidia/tegra/include/tegra_platform.h +++ b/plat/nvidia/tegra/include/tegra_platform.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __TEGRA_PLATFORM_H__ -#define __TEGRA_PLATFORM_H__ +#ifndef TEGRA_PLATFORM_H +#define TEGRA_PLATFORM_H #include <cdefs.h> @@ -31,4 +31,4 @@ uint8_t tegra_platform_is_qt(void); uint8_t tegra_platform_is_emulation(void); uint8_t tegra_platform_is_fpga(void); -#endif /* __TEGRA_PLATFORM_H__ */ +#endif /* TEGRA_PLATFORM_H */ diff --git a/plat/nvidia/tegra/include/tegra_private.h b/plat/nvidia/tegra/include/tegra_private.h index b6f2df759..c4c277ebe 100644 --- a/plat/nvidia/tegra/include/tegra_private.h +++ b/plat/nvidia/tegra/include/tegra_private.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __TEGRA_PRIVATE_H__ -#define __TEGRA_PRIVATE_H__ +#ifndef TEGRA_PRIVATE_H +#define TEGRA_PRIVATE_H #include <arch.h> #include <platform_def.h> @@ -112,4 +112,4 @@ void tegra_delay_timer_init(void); void tegra_secure_entrypoint(void); void tegra186_cpu_reset_handler(void); -#endif /* __TEGRA_PRIVATE_H__ */ +#endif /* TEGRA_PRIVATE_H */ diff --git a/plat/nvidia/tegra/soc/t186/drivers/include/mce_private.h b/plat/nvidia/tegra/soc/t186/drivers/include/mce_private.h index 26197e972..27baab6d6 100644 --- a/plat/nvidia/tegra/soc/t186/drivers/include/mce_private.h +++ b/plat/nvidia/tegra/soc/t186/drivers/include/mce_private.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __MCE_PRIVATE_H__ -#define __MCE_PRIVATE_H__ +#ifndef MCE_PRIVATE_H +#define MCE_PRIVATE_H #include <mmio.h> #include <tegra_def.h> @@ -258,4 +258,4 @@ int32_t nvg_cc3_ctrl(uint32_t ari_base, uint32_t freq, uint32_t volt, uint8_t en extern void nvg_set_request_data(uint64_t req, uint64_t data); extern void nvg_set_request(uint64_t req); extern uint64_t nvg_get_result(void); -#endif /* __MCE_PRIVATE_H__ */ +#endif /* MCE_PRIVATE_H */ diff --git a/plat/nvidia/tegra/soc/t186/drivers/include/t18x_ari.h b/plat/nvidia/tegra/soc/t186/drivers/include/t18x_ari.h index 8c6f30c8a..ecfb3f4b3 100644 --- a/plat/nvidia/tegra/soc/t186/drivers/include/t18x_ari.h +++ b/plat/nvidia/tegra/soc/t186/drivers/include/t18x_ari.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef T18X_TEGRA_ARI_H -#define T18X_TEGRA_ARI_H +#ifndef T18X_ARI_H +#define T18X_ARI_H /* * ---------------------------------------------------------------------------- @@ -434,4 +434,4 @@ typedef enum { TEGRA_NVG_CHANNEL_LAST_INDEX, } tegra_nvg_channel_id_t; -#endif /* T18X_TEGRA_ARI_H */ +#endif /* T18X_ARI_H */ diff --git a/plat/qemu/include/plat_macros.S b/plat/qemu/include/plat_macros.S index 93cded2b8..b6cdb0714 100644 --- a/plat/qemu/include/plat_macros.S +++ b/plat/qemu/include/plat_macros.S @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_MACROS_S__ -#define __PLAT_MACROS_S__ +#ifndef PLAT_MACROS_S +#define PLAT_MACROS_S #include <arm_macros.S> #include <platform_def.h> @@ -23,4 +23,4 @@ arm_print_gic_regs .endm -#endif /* __PLAT_MACROS_S__ */ +#endif /* PLAT_MACROS_S */ diff --git a/plat/qemu/qemu_private.h b/plat/qemu/qemu_private.h index 88b93da82..ab2bf1ba3 100644 --- a/plat/qemu/qemu_private.h +++ b/plat/qemu/qemu_private.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __QEMU_PRIVATE_H -#define __QEMU_PRIVATE_H +#ifndef QEMU_PRIVATE_H +#define QEMU_PRIVATE_H #include <stdint.h> @@ -35,4 +35,4 @@ int dt_add_psci_cpu_enable_methods(void *fdt); void qemu_console_init(void); -#endif /*__QEMU_PRIVATE_H*/ +#endif /* QEMU_PRIVATE_H */ diff --git a/plat/renesas/rcar/include/plat.ld.S b/plat/renesas/rcar/include/plat.ld.S index 90c132db1..0461141fd 100644 --- a/plat/renesas/rcar/include/plat.ld.S +++ b/plat/renesas/rcar/include/plat.ld.S @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __RCAR_PLAT_LD_S__ -#define __RCAR_PLAT_LD_S__ +#ifndef RCAR_PLAT_LD_S +#define RCAR_PLAT_LD_S #include <platform_def.h> #include <xlat_tables_defs.h> @@ -33,4 +33,4 @@ SECTIONS } -#endif /* __RCAR_PLAT_LD_S__ */ +#endif /* RCAR_PLAT_LD_S */ diff --git a/plat/renesas/rcar/include/platform_def.h b/plat/renesas/rcar/include/platform_def.h index d38eebc57..fa6e474c4 100644 --- a/plat/renesas/rcar/include/platform_def.h +++ b/plat/renesas/rcar/include/platform_def.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef PLATFORM_DEF_H__ -#define PLATFORM_DEF_H__ +#ifndef PLATFORM_DEF_H +#define PLATFORM_DEF_H #include <arch.h> #ifndef __ASSEMBLY__ @@ -186,4 +186,4 @@ #define PLAT_PCPU_DATA_SIZE (2) #endif -#endif +#endif /* PLATFORM_DEF_H */ diff --git a/plat/renesas/rcar/include/rcar_def.h b/plat/renesas/rcar/include/rcar_def.h index eb195b448..61b95a436 100644 --- a/plat/renesas/rcar/include/rcar_def.h +++ b/plat/renesas/rcar/include/rcar_def.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef RCAR_DEF_H__ -#define RCAR_DEF_H__ +#ifndef RCAR_DEF_H +#define RCAR_DEF_H #include <tbbr_img_def.h> #include <utils_def.h> @@ -290,4 +290,4 @@ #define LOSSY_FMT2 LOSSY_FMT_YUV422INTLV #define LOSSY_ENA_DIS2 LOSSY_DISABLE -#endif +#endif /* RCAR_DEF_H */ diff --git a/plat/renesas/rcar/include/rcar_private.h b/plat/renesas/rcar/include/rcar_private.h index dd3582601..e90fa08ad 100644 --- a/plat/renesas/rcar/include/rcar_private.h +++ b/plat/renesas/rcar/include/rcar_private.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef RCAR_PRIVATE_H__ -#define RCAR_PRIVATE_H__ +#ifndef RCAR_PRIVATE_H +#define RCAR_PRIVATE_H #include <bakery_lock.h> #include <bl_common.h> @@ -98,4 +98,4 @@ void plat_cci_init(void); void mstpcr_write(uint32_t mstpcr, uint32_t mstpsr, uint32_t target_bit); void cpg_write(uintptr_t regadr, uint32_t regval); -#endif +#endif /* RCAR_PRIVATE_H */ diff --git a/plat/renesas/rcar/include/rcar_version.h b/plat/renesas/rcar/include/rcar_version.h index 9a9ad9cdd..5ab8efc7e 100644 --- a/plat/renesas/rcar/include/rcar_version.h +++ b/plat/renesas/rcar/include/rcar_version.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef RCAR_VERSION_H__ -#define RCAR_VERSION_H__ +#ifndef RCAR_VERSION_H +#define RCAR_VERSION_H #include <arch_helpers.h> @@ -14,4 +14,4 @@ extern const uint8_t version_of_renesas[VERSION_OF_RENESAS_MAXLEN]; -#endif +#endif /* RCAR_VERSION_H */ diff --git a/plat/renesas/rcar/include/registers/axi_registers.h b/plat/renesas/rcar/include/registers/axi_registers.h index 1d8f41db7..36cd58bd9 100644 --- a/plat/renesas/rcar/include/registers/axi_registers.h +++ b/plat/renesas/rcar/include/registers/axi_registers.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef AXI_REGISTER_H__ -#define AXI_REGISTER_H__ +#ifndef AXI_REGISTERS_H +#define AXI_REGISTERS_H /* AXI registers */ @@ -243,4 +243,4 @@ /* EDC edc interrupt enable 1 */ #define EDC_EDCINTEN1 (EDC_BASE + 0x0044U) -#endif +#endif /* AXI_REGISTERS_H */ diff --git a/plat/renesas/rcar/include/registers/cpg_registers.h b/plat/renesas/rcar/include/registers/cpg_registers.h index bd6e5572b..0d698d9c1 100644 --- a/plat/renesas/rcar/include/registers/cpg_registers.h +++ b/plat/renesas/rcar/include/registers/cpg_registers.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef CPG_REGISTER_H__ -#define CPG_REGISTER_H__ +#ifndef CPG_REGISTERS_H +#define CPG_REGISTERS_H /* CPG base address */ #define CPG_BASE (0xE6150000U) @@ -133,4 +133,4 @@ /* System Module Stop Control Register 11 */ #define SMSTPCR11 (CPG_BASE + 0x099CU) -#endif +#endif /* CPG_REGISTERS_H */ diff --git a/plat/renesas/rcar/include/registers/lifec_registers.h b/plat/renesas/rcar/include/registers/lifec_registers.h index b331be3b5..de78760ae 100644 --- a/plat/renesas/rcar/include/registers/lifec_registers.h +++ b/plat/renesas/rcar/include/registers/lifec_registers.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef LIFEC_REGISTER_H__ -#define LIFEC_REGISTER_H__ +#ifndef LIFEC_REGISTERS_H +#define LIFEC_REGISTERS_H #define LIFEC_SEC_BASE (0xE6110000U) @@ -141,4 +141,4 @@ #define SAFE_READONLY14 (LIFEC_SAFE_BASE + 0x0210U) #define SAFE_READONLY15 (LIFEC_SAFE_BASE + 0x0214U) -#endif +#endif /* LIFEC_REGISTERS_H */ diff --git a/plat/rockchip/common/drivers/parameter/ddr_parameter.h b/plat/rockchip/common/drivers/parameter/ddr_parameter.h index f8e3be93b..69c4e18bd 100644 --- a/plat/rockchip/common/drivers/parameter/ddr_parameter.h +++ b/plat/rockchip/common/drivers/parameter/ddr_parameter.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PARAMETER_H__ -#define __PARAMETER_H__ +#ifndef DDR_PARAMETER_H +#define DDR_PARAMETER_H #include <arch_helpers.h> #include <console.h> @@ -38,4 +38,4 @@ struct param_ddr_usage { struct param_ddr_usage ddr_region_usage_parse(uint64_t addr, uint64_t max_mb); -#endif /* __PARAMETER_H__ */ +#endif /* DDR_PARAMETER_H */ diff --git a/plat/rockchip/common/drivers/pmu/pmu_com.h b/plat/rockchip/common/drivers/pmu/pmu_com.h index 75e924dcd..4b4b00fde 100644 --- a/plat/rockchip/common/drivers/pmu/pmu_com.h +++ b/plat/rockchip/common/drivers/pmu/pmu_com.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PMU_COM_H__ -#define __PMU_COM_H__ +#ifndef PMU_COM_H +#define PMU_COM_H #ifndef CHECK_CPU_WFIE_BASE #define CHECK_CPU_WFIE_BASE (PMU_BASE + PMU_CORE_PWR_ST) @@ -108,4 +108,4 @@ static int check_cpu_wfie(uint32_t cpu_id, uint32_t wfie_msk) return 0; } -#endif /* __PMU_COM_H__ */ +#endif /* PMU_COM_H */ diff --git a/plat/rockchip/common/include/plat_macros.S b/plat/rockchip/common/include/plat_macros.S index 6b3cb6a72..9ee4e83e1 100644 --- a/plat/rockchip/common/include/plat_macros.S +++ b/plat/rockchip/common/include/plat_macros.S @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __ROCKCHIP_PLAT_MACROS_S__ -#define __ROCKCHIP_PLAT_MACROS_S__ +#ifndef ROCKCHIP_PLAT_MACROS_S +#define ROCKCHIP_PLAT_MACROS_S #include <cci.h> #include <gic_common.h> @@ -115,4 +115,4 @@ exit_print_gic_regs: #endif .endm -#endif /* __ROCKCHIP_PLAT_MACROS_S__ */ +#endif /* ROCKCHIP_PLAT_MACROS_S */ diff --git a/plat/rockchip/common/include/plat_params.h b/plat/rockchip/common/include/plat_params.h index 710990760..1ec02f55e 100644 --- a/plat/rockchip/common/include/plat_params.h +++ b/plat/rockchip/common/include/plat_params.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_PARAMS_H__ -#define __PLAT_PARAMS_H__ +#ifndef PLAT_PARAMS_H +#define PLAT_PARAMS_H #include <stdint.h> @@ -95,4 +95,4 @@ struct bl31_u64_param { uint64_t value; }; -#endif /* __PLAT_PARAMS_H__ */ +#endif /* PLAT_PARAMS_H */ diff --git a/plat/rockchip/common/include/plat_private.h b/plat/rockchip/common/include/plat_private.h index e1e4f33c5..955ca647c 100644 --- a/plat/rockchip/common/include/plat_private.h +++ b/plat/rockchip/common/include/plat_private.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_PRIVATE_H__ -#define __PLAT_PRIVATE_H__ +#ifndef PLAT_PRIVATE_H +#define PLAT_PRIVATE_H #ifndef __ASSEMBLY__ #include <mmio.h> @@ -143,4 +143,4 @@ void rockchip_plat_mmu_el3(void); #define PMU_CPU_AUTO_PWRDN 0xf0 #define PMU_CLST_RET 0xa5 -#endif /* __PLAT_PRIVATE_H__ */ +#endif /* PLAT_PRIVATE_H */ diff --git a/plat/rockchip/common/include/rockchip_sip_svc.h b/plat/rockchip/common/include/rockchip_sip_svc.h index 8125ab07d..340d65388 100644 --- a/plat/rockchip/common/include/rockchip_sip_svc.h +++ b/plat/rockchip/common/include/rockchip_sip_svc.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __ROCKCHIP_SIP_SVC_H__ -#define __ROCKCHIP_SIP_SVC_H__ +#ifndef ROCKCHIP_SIP_SVC_H +#define ROCKCHIP_SIP_SVC_H /* SMC function IDs for SiP Service queries */ #define SIP_SVC_CALL_COUNT 0x8200ff00 @@ -24,4 +24,4 @@ enum { RK_SIP_E_INVALID_PARAM = -1 }; -#endif +#endif /* ROCKCHIP_SIP_SVC_H */ diff --git a/plat/rockchip/rk3328/drivers/pmu/pmu.h b/plat/rockchip/rk3328/drivers/pmu/pmu.h index 9d2819a6a..d98f53cb1 100644 --- a/plat/rockchip/rk3328/drivers/pmu/pmu.h +++ b/plat/rockchip/rk3328/drivers/pmu/pmu.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PMU_H__ -#define __PMU_H__ +#ifndef PMU_H +#define PMU_H #include <soc.h> @@ -128,4 +128,4 @@ enum pmu_sft_con { #define UART_INT_DISABLE 0x00 #define UART_FIFO_RESET 0x07 -#endif /* __PMU_H__ */ +#endif /* PMU_H */ diff --git a/plat/rockchip/rk3328/drivers/soc/soc.h b/plat/rockchip/rk3328/drivers/soc/soc.h index 2c04ae220..a1f35b282 100644 --- a/plat/rockchip/rk3328/drivers/soc/soc.h +++ b/plat/rockchip/rk3328/drivers/soc/soc.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SOC_H__ -#define __SOC_H__ +#ifndef SOC_H +#define SOC_H /******************************* stimer ***************************************/ #define TIMER_LOADE_COUNT0 0x00 @@ -110,4 +110,4 @@ enum plls_id { #define GPIO2_D2_GPIO_MODE 0x30 #define GRF_GPIO2D_IOMUX 0x34 -#endif /* __SOC_H__ */ +#endif /* SOC_H */ diff --git a/plat/rockchip/rk3328/include/plat.ld.S b/plat/rockchip/rk3328/include/plat.ld.S index b3559b20f..e9bb3a28d 100644 --- a/plat/rockchip/rk3328/include/plat.ld.S +++ b/plat/rockchip/rk3328/include/plat.ld.S @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __ROCKCHIP_PLAT_LD_S__ -#define __ROCKCHIP_PLAT_LD_S__ +#ifndef ROCKCHIP_PLAT_LD_S +#define ROCKCHIP_PLAT_LD_S MEMORY { PMUSRAM (rwx): ORIGIN = PMUSRAM_BASE, LENGTH = PMUSRAM_RSIZE @@ -34,4 +34,4 @@ SECTIONS } >PMUSRAM } -#endif /* __ROCKCHIP_PLAT_LD_S__ */ +#endif /* ROCKCHIP_PLAT_LD_S */ diff --git a/plat/rockchip/rk3328/rk3328_def.h b/plat/rockchip/rk3328/rk3328_def.h index 035fcb64f..4704a72ed 100644 --- a/plat/rockchip/rk3328/rk3328_def.h +++ b/plat/rockchip/rk3328/rk3328_def.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_DEF_H__ -#define __PLAT_DEF_H__ +#ifndef RK3328_DEF_H +#define RK3328_DEF_H #define MAJOR_VERSION (1) #define MINOR_VERSION (2) @@ -145,4 +145,4 @@ #define SHARE_MEM_PAGE_NUM 15 #define SHARE_MEM_SIZE SIZE_K(SHARE_MEM_PAGE_NUM * 4) -#endif /* __PLAT_DEF_H__ */ +#endif /* RK3328_DEF_H */ diff --git a/plat/rockchip/rk3368/drivers/ddr/ddr_rk3368.h b/plat/rockchip/rk3368/drivers/ddr/ddr_rk3368.h index 057d96189..15912b5d3 100644 --- a/plat/rockchip/rk3368/drivers/ddr/ddr_rk3368.h +++ b/plat/rockchip/rk3368/drivers/ddr/ddr_rk3368.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __DDR_RK3368_H__ -#define __DDR_RK3368_H__ +#ifndef DDR_RK3368_H +#define DDR_RK3368_H #define DDR_PCTL_SCFG 0x0 #define DDR_PCTL_SCTL 0x4 @@ -244,4 +244,4 @@ uint32_t ddr_get_resume_data_size(void); uint32_t *ddr_get_resume_code_base(void); void ddr_reg_save(uint32_t pllpdstat, uint64_t base_addr); -#endif +#endif /* DDR_RK3368_H */ diff --git a/plat/rockchip/rk3368/drivers/pmu/pmu.h b/plat/rockchip/rk3368/drivers/pmu/pmu.h index 4c021074a..b4d4807c1 100644 --- a/plat/rockchip/rk3368/drivers/pmu/pmu.h +++ b/plat/rockchip/rk3368/drivers/pmu/pmu.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PMU_H__ -#define __PMU_H__ +#ifndef PMU_H +#define PMU_H /* Allocate sp reginon in pmusram */ #define PSRAM_SP_SIZE 0x80 @@ -204,4 +204,4 @@ enum pmu_bus_idle_st { #define MAX_WAIT_CONUT 1000 -#endif /* __PMU_H__ */ +#endif /* PMU_H */ diff --git a/plat/rockchip/rk3368/drivers/soc/soc.h b/plat/rockchip/rk3368/drivers/soc/soc.h index 38d7332ef..5f24e9356 100644 --- a/plat/rockchip/rk3368/drivers/soc/soc.h +++ b/plat/rockchip/rk3368/drivers/soc/soc.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SOC_H__ -#define __SOC_H__ +#ifndef SOC_H +#define SOC_H enum plls_id { ABPLL_ID = 0, @@ -138,4 +138,4 @@ void regs_updata_bits(uintptr_t addr, uint32_t val, void soc_sleep_config(void); void pm_plls_resume(void); -#endif /* __SOC_H__ */ +#endif /* SOC_H */ diff --git a/plat/rockchip/rk3368/include/plat.ld.S b/plat/rockchip/rk3368/include/plat.ld.S index b3559b20f..e9bb3a28d 100644 --- a/plat/rockchip/rk3368/include/plat.ld.S +++ b/plat/rockchip/rk3368/include/plat.ld.S @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __ROCKCHIP_PLAT_LD_S__ -#define __ROCKCHIP_PLAT_LD_S__ +#ifndef ROCKCHIP_PLAT_LD_S +#define ROCKCHIP_PLAT_LD_S MEMORY { PMUSRAM (rwx): ORIGIN = PMUSRAM_BASE, LENGTH = PMUSRAM_RSIZE @@ -34,4 +34,4 @@ SECTIONS } >PMUSRAM } -#endif /* __ROCKCHIP_PLAT_LD_S__ */ +#endif /* ROCKCHIP_PLAT_LD_S */ diff --git a/plat/rockchip/rk3368/include/plat_sip_calls.h b/plat/rockchip/rk3368/include/plat_sip_calls.h index ead187e4c..66c4868cb 100644 --- a/plat/rockchip/rk3368/include/plat_sip_calls.h +++ b/plat/rockchip/rk3368/include/plat_sip_calls.h @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_SIP_CALLS_H__ -#define __PLAT_SIP_CALLS_H__ +#ifndef PLAT_SIP_CALLS_H +#define PLAT_SIP_CALLS_H #define RK_PLAT_SIP_NUM_CALLS 0 -#endif /* __PLAT_SIP_CALLS_H__ */ +#endif /* PLAT_SIP_CALLS_H */ diff --git a/plat/rockchip/rk3368/rk3368_def.h b/plat/rockchip/rk3368/rk3368_def.h index 9ebe3be06..a7be7c367 100644 --- a/plat/rockchip/rk3368/rk3368_def.h +++ b/plat/rockchip/rk3368/rk3368_def.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_DEF_H__ -#define __PLAT_DEF_H__ +#ifndef RK3368_DEF_H +#define RK3368_DEF_H /* Special value used to verify platform parameters from BL2 to BL3-1 */ #define RK_BL31_PLAT_PARAM_VAL 0x0f1e2d3c4b5a6978ULL @@ -104,4 +104,4 @@ INTR_PROP_DESC(RK_IRQ_SEC_PHY_TIMER, GIC_HIGHEST_SEC_PRIORITY, \ GICV2_INTR_GROUP1, GIC_INTR_CFG_LEVEL) -#endif /* __PLAT_DEF_H__ */ +#endif /* RK3368_DEF_H */ diff --git a/plat/rockchip/rk3399/drivers/dp/cdn_dp.h b/plat/rockchip/rk3399/drivers/dp/cdn_dp.h index 3b9a10843..c5cbae2ef 100644 --- a/plat/rockchip/rk3399/drivers/dp/cdn_dp.h +++ b/plat/rockchip/rk3399/drivers/dp/cdn_dp.h @@ -4,8 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SOC_ROCKCHIP_RK3399_DP_H__ -#define __SOC_ROCKCHIP_RK3399_DP_H__ +#ifndef CDN_DP_H +#define CDN_DP_H + #include <plat_private.h> enum { @@ -44,4 +45,5 @@ uint64_t dp_hdcp_store_key(uint64_t x1, uint64_t x4, uint64_t x5, uint64_t x6); -#endif + +#endif /* CDN_DP_H */ diff --git a/plat/rockchip/rk3399/drivers/dram/dfs.h b/plat/rockchip/rk3399/drivers/dram/dfs.h index e847b2e0e..172b2a749 100644 --- a/plat/rockchip/rk3399/drivers/dram/dfs.h +++ b/plat/rockchip/rk3399/drivers/dram/dfs.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SOC_ROCKCHIP_RK3399_DFS_H__ -#define __SOC_ROCKCHIP_RK3399_DFS_H__ +#ifndef DFS_H +#define DFS_H #include <stdint.h> @@ -47,4 +47,4 @@ void dram_dfs_init(void); void ddr_prepare_for_sys_suspend(void); void ddr_prepare_for_sys_resume(void); -#endif +#endif /* DFS_H */ diff --git a/plat/rockchip/rk3399/drivers/dram/dram.h b/plat/rockchip/rk3399/drivers/dram/dram.h index 0780fc3a2..ded511e02 100644 --- a/plat/rockchip/rk3399/drivers/dram/dram.h +++ b/plat/rockchip/rk3399/drivers/dram/dram.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SOC_ROCKCHIP_RK3399_DRAM_H__ -#define __SOC_ROCKCHIP_RK3399_DRAM_H__ +#ifndef DRAM_H +#define DRAM_H #include <dram_regs.h> #include <plat_private.h> @@ -152,4 +152,4 @@ extern __sramdata struct rk3399_sdram_params sdram_config; void dram_init(void); -#endif +#endif /* DRAM_H */ diff --git a/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.h b/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.h index 30d3aeabd..9cda22ca9 100644 --- a/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.h +++ b/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.h @@ -4,8 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef _DRAM_SPEC_TIMING_HEAD_ -#define _DRAM_SPEC_TIMING_HEAD_ +#ifndef DRAM_SPEC_TIMING_H +#define DRAM_SPEC_TIMING_H + #include <stdint.h> enum ddr3_speed_rate { @@ -503,4 +504,4 @@ struct timing_related_config { void dram_get_parameter(struct timing_related_config *timing_config, struct dram_timing_t *pdram_timing); -#endif /* _DRAM_SPEC_TIMING_HEAD_ */ +#endif /* DRAM_SPEC_TIMING_H */ diff --git a/plat/rockchip/rk3399/drivers/dram/suspend.h b/plat/rockchip/rk3399/drivers/dram/suspend.h index a8a864108..b99a9262f 100644 --- a/plat/rockchip/rk3399/drivers/dram/suspend.h +++ b/plat/rockchip/rk3399/drivers/dram/suspend.h @@ -4,8 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SOC_ROCKCHIP_RK3399_SUSPEND_H__ -#define __SOC_ROCKCHIP_RK3399_SUSPEND_H__ +#ifndef SUSPEND_H +#define SUSPEND_H + #include <dram.h> #define KHz (1000) @@ -22,4 +23,4 @@ void dmc_suspend(void); __pmusramfunc void dmc_resume(void); -#endif /* __DRAM_H__ */ +#endif /* SUSPEND_H */ diff --git a/plat/rockchip/rk3399/drivers/m0/include/addressmap.h b/plat/rockchip/rk3399/drivers/m0/include/addressmap.h index 5635e79f7..d43143728 100644 --- a/plat/rockchip/rk3399/drivers/m0/include/addressmap.h +++ b/plat/rockchip/rk3399/drivers/m0/include/addressmap.h @@ -4,12 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __ROCKCHIP_RK3399_M0_INCLUDE_SHARED_ADDRESSMAP_H__ -#define __ROCKCHIP_RK3399_M0_INCLUDE_SHARED_ADDRESSMAP_H__ +#ifndef ADDRESSMAP_H +#define ADDRESSMAP_H #include <addressmap_shared.h> /* Registers base address for M0 */ #define MMIO_BASE 0x40000000 -#endif /* __ROCKCHIP_RK3399_M0_INCLUDE_SHARED_ADDRESSMAP_H__ */ +#endif /* ADDRESSMAP_H */ diff --git a/plat/rockchip/rk3399/drivers/m0/include/rk3399_mcu.h b/plat/rockchip/rk3399/drivers/m0/include/rk3399_mcu.h index 176af3ae9..2e90694a5 100644 --- a/plat/rockchip/rk3399/drivers/m0/include/rk3399_mcu.h +++ b/plat/rockchip/rk3399/drivers/m0/include/rk3399_mcu.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __RK3399_MCU_H__ -#define __RK3399_MCU_H__ +#ifndef RK3399_MCU_H +#define RK3399_MCU_H #include <addressmap.h> @@ -29,4 +29,4 @@ void stopwatch_init_usecs_expire(unsigned int usecs); int stopwatch_expired(void); void stopwatch_reset(void); -#endif /* __RK3399_MCU_H__ */ +#endif /* RK3399_MCU_H */ diff --git a/plat/rockchip/rk3399/drivers/pmu/m0_ctl.h b/plat/rockchip/rk3399/drivers/pmu/m0_ctl.h index cb323c482..7542e22aa 100644 --- a/plat/rockchip/rk3399/drivers/pmu/m0_ctl.h +++ b/plat/rockchip/rk3399/drivers/pmu/m0_ctl.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __M0_CTL_H__ -#define __M0_CTL_H__ +#ifndef M0_CTL_H +#define M0_CTL_H #include <m0_param.h> @@ -25,4 +25,5 @@ extern void m0_start(void); extern void m0_stop(void); extern void m0_wait_done(void); extern void m0_configure_execute_addr(uintptr_t addr); -#endif /* __M0_CTL_H__ */ + +#endif /* M0_CTL_H */ diff --git a/plat/rockchip/rk3399/drivers/pmu/pmu.h b/plat/rockchip/rk3399/drivers/pmu/pmu.h index 0265dde4a..e1ba41041 100644 --- a/plat/rockchip/rk3399/drivers/pmu/pmu.h +++ b/plat/rockchip/rk3399/drivers/pmu/pmu.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PMU_H__ -#define __PMU_H__ +#ifndef PMU_H +#define PMU_H #include <pmu_bits.h> #include <pmu_regs.h> @@ -137,4 +137,4 @@ extern uint32_t clst_warmboot_data[PLATFORM_CLUSTER_COUNT]; extern void sram_func_set_ddrctl_pll(uint32_t pll_src); -#endif /* __PMU_H__ */ +#endif /* PMU_H */ diff --git a/plat/rockchip/rk3399/drivers/pwm/pwm.h b/plat/rockchip/rk3399/drivers/pwm/pwm.h index 57cfd1b28..d6653921d 100644 --- a/plat/rockchip/rk3399/drivers/pwm/pwm.h +++ b/plat/rockchip/rk3399/drivers/pwm/pwm.h @@ -4,10 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PWM_H__ -#define __PWM_H__ +#ifndef PWM_H +#define PWM_H void disable_pwms(void); void enable_pwms(void); -#endif +#endif /* PWM_H */ diff --git a/plat/rockchip/rk3399/drivers/secure/secure.h b/plat/rockchip/rk3399/drivers/secure/secure.h index 8e80f2b92..e31c999b7 100644 --- a/plat/rockchip/rk3399/drivers/secure/secure.h +++ b/plat/rockchip/rk3399/drivers/secure/secure.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_ROCKCHIP_RK3399_DRIVER_SECURE_H__ -#define __PLAT_ROCKCHIP_RK3399_DRIVER_SECURE_H__ +#ifndef SECURE_H +#define SECURE_H /************************************************** * sgrf reg, offset @@ -102,4 +102,4 @@ void secure_sgrf_init(void); void secure_sgrf_ddr_rgn_init(void); __pmusramfunc void sram_secure_timer_init(void); -#endif /* __PLAT_ROCKCHIP_RK3399_DRIVER_SECURE_H__ */ +#endif /* SECURE_H */ diff --git a/plat/rockchip/rk3399/drivers/soc/soc.h b/plat/rockchip/rk3399/drivers/soc/soc.h index bc4193392..1f7ec07f0 100644 --- a/plat/rockchip/rk3399/drivers/soc/soc.h +++ b/plat/rockchip/rk3399/drivers/soc/soc.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SOC_H__ -#define __SOC_H__ +#ifndef SOC_H +#define SOC_H #include <utils.h> @@ -281,4 +281,4 @@ void set_pmu_rsthold(void); void pmu_sgrf_rst_hld(void); __pmusramfunc void pmu_sgrf_rst_hld_release(void); __pmusramfunc void restore_pmu_rsthold(void); -#endif /* __SOC_H__ */ +#endif /* SOC_H */ diff --git a/plat/rockchip/rk3399/include/addressmap.h b/plat/rockchip/rk3399/include/addressmap.h index 023050c3f..dc1c703c2 100644 --- a/plat/rockchip/rk3399/include/addressmap.h +++ b/plat/rockchip/rk3399/include/addressmap.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __ROCKCHIP_RK3399_INCLUDE_ADDRESSMAP_H__ -#define __ROCKCHIP_RK3399_INCLUDE_ADDRESSMAP_H__ +#ifndef ADDRESSMAP_H +#define ADDRESSMAP_H #include <addressmap_shared.h> @@ -16,4 +16,4 @@ #define DEV_RNG0_BASE MMIO_BASE #define DEV_RNG0_SIZE SIZE_M(125) -#endif /* __ROCKCHIP_RK3399_INCLUDE_ADDRESSMAP_H__ */ +#endif /* ADDRESSMAP_H */ diff --git a/plat/rockchip/rk3399/include/plat.ld.S b/plat/rockchip/rk3399/include/plat.ld.S index 528c15002..5045ba8c2 100644 --- a/plat/rockchip/rk3399/include/plat.ld.S +++ b/plat/rockchip/rk3399/include/plat.ld.S @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __ROCKCHIP_PLAT_LD_S__ -#define __ROCKCHIP_PLAT_LD_S__ +#ifndef ROCKCHIP_PLAT_LD_S +#define ROCKCHIP_PLAT_LD_S #include <xlat_tables_defs.h> @@ -95,4 +95,4 @@ SECTIONS } >PMUSRAM } -#endif /* __ROCKCHIP_PLAT_LD_S__ */ +#endif /* ROCKCHIP_PLAT_LD_S */ diff --git a/plat/rockchip/rk3399/include/plat_sip_calls.h b/plat/rockchip/rk3399/include/plat_sip_calls.h index ead187e4c..66c4868cb 100644 --- a/plat/rockchip/rk3399/include/plat_sip_calls.h +++ b/plat/rockchip/rk3399/include/plat_sip_calls.h @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_SIP_CALLS_H__ -#define __PLAT_SIP_CALLS_H__ +#ifndef PLAT_SIP_CALLS_H +#define PLAT_SIP_CALLS_H #define RK_PLAT_SIP_NUM_CALLS 0 -#endif /* __PLAT_SIP_CALLS_H__ */ +#endif /* PLAT_SIP_CALLS_H */ diff --git a/plat/rockchip/rk3399/include/shared/addressmap_shared.h b/plat/rockchip/rk3399/include/shared/addressmap_shared.h index dc5c8d568..84a31b20c 100644 --- a/plat/rockchip/rk3399/include/shared/addressmap_shared.h +++ b/plat/rockchip/rk3399/include/shared/addressmap_shared.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __ROCKCHIP_RK3399_INCLUDE_SHARED_ADDRESSMAP_SHARED_H__ -#define __ROCKCHIP_RK3399_INCLUDE_SHARED_ADDRESSMAP_SHARED_H__ +#ifndef ADDRESSMAP_SHARED_H +#define ADDRESSMAP_SHARED_H #define SIZE_K(n) ((n) * 1024) #define SIZE_M(n) ((n) * 1024 * 1024) @@ -101,4 +101,4 @@ #define MSCH_BASE(ch) (SERVICE_NOC_1_BASE + (ch) * 0x8000) -#endif /* __ROCKCHIP_RK3399_INCLUDE_SHARED_ADDRESSMAP_SHARED_H__ */ +#endif /* ADDRESSMAP_SHARED_H */ diff --git a/plat/rockchip/rk3399/include/shared/bl31_param.h b/plat/rockchip/rk3399/include/shared/bl31_param.h index 85a0f4a92..e7f2226cd 100644 --- a/plat/rockchip/rk3399/include/shared/bl31_param.h +++ b/plat/rockchip/rk3399/include/shared/bl31_param.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_ROCKCHIP_RK3399_INCLUDE_SHARED_BL31_PARAM_H__ -#define __PLAT_ROCKCHIP_RK3399_INCLUDE_SHARED_BL31_PARAM_H__ +#ifndef BL31_PARAM_H +#define BL31_PARAM_H /******************************************************************************* * Platform memory map related constants @@ -18,9 +18,9 @@ * BL31 specific defines. ******************************************************************************/ /* - * Put BL3-1 at the top of the Trusted RAM + * Put BL31 at the top of the Trusted RAM */ #define BL31_BASE (TZRAM_BASE + 0x1000) #define BL31_LIMIT (TZRAM_BASE + TZRAM_SIZE) -#endif /*__PLAT_ROCKCHIP_RK3399_INCLUDE_SHARED_BL31_PARAM_H__*/ +#endif /* BL31_PARAM_H */ diff --git a/plat/rockchip/rk3399/include/shared/dram_regs.h b/plat/rockchip/rk3399/include/shared/dram_regs.h index afe16bb6f..4d4ebf6be 100644 --- a/plat/rockchip/rk3399/include/shared/dram_regs.h +++ b/plat/rockchip/rk3399/include/shared/dram_regs.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __DRAM_REGS_H__ -#define __DRAM_REGS_H__ +#ifndef DRAM_REGS_H +#define DRAM_REGS_H #define CTL_REG_NUM 332 #define PHY_REG_NUM 959 @@ -97,4 +97,4 @@ #define DDR_STRIDE(n) mmio_write_32(SGRF_BASE + SGRF_SOC_CON3_7(4), \ (0x1f<<(10+16))|((n)<<10)) -#endif /* __DRAM_REGS_H__ */ +#endif /* DRAM_REGS_H */ diff --git a/plat/rockchip/rk3399/include/shared/m0_param.h b/plat/rockchip/rk3399/include/shared/m0_param.h index 044e797af..a5311c9bb 100644 --- a/plat/rockchip/rk3399/include/shared/m0_param.h +++ b/plat/rockchip/rk3399/include/shared/m0_param.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __M0_PARAM_H__ -#define __M0_PARAM_H__ +#ifndef M0_PARAM_H +#define M0_PARAM_H #define PARAM_ADDR 0xc0 @@ -22,4 +22,4 @@ #define PARAM_M0_SIZE 0x28 #define M0_DONE_FLAG 0xf59ec39a -#endif /*__M0_PARAM_H__*/ +#endif /* M0_PARAM_H */ diff --git a/plat/rockchip/rk3399/include/shared/misc_regs.h b/plat/rockchip/rk3399/include/shared/misc_regs.h index 02e001b55..0160453b4 100644 --- a/plat/rockchip/rk3399/include/shared/misc_regs.h +++ b/plat/rockchip/rk3399/include/shared/misc_regs.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __ROCKCHIP_RK3399_INCLUDE_SHARED_MISC_REGS_H__ -#define __ROCKCHIP_RK3399_INCLUDE_SHARED_MISC_REGS_H__ +#ifndef MISC_REGS_H +#define MISC_REGS_H /* CRU */ #define CRU_DPLL_CON0 0x40 @@ -24,4 +24,4 @@ /* PMU CRU */ #define PMU_CRU_GATEDIS_CON0 0x130 -#endif /* __ROCKCHIP_RK3399_INCLUDE_SHARED_MISC_REGS_H__ */ +#endif /* MISC_REGS_H */ diff --git a/plat/rockchip/rk3399/include/shared/pmu_bits.h b/plat/rockchip/rk3399/include/shared/pmu_bits.h index 7c257613b..2968d5b96 100644 --- a/plat/rockchip/rk3399/include/shared/pmu_bits.h +++ b/plat/rockchip/rk3399/include/shared/pmu_bits.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PMU_BITS_H__ -#define __PMU_BITS_H__ +#ifndef PMU_BITS_H +#define PMU_BITS_H enum pmu_powerdomain_id { PD_CPUL0 = 0, @@ -694,4 +694,4 @@ enum pmu_core_pwr_st { STANDBY_BY_WFIL2_CLUSTER_B, }; -#endif /* __PMU_BITS_H__ */ +#endif /* PMU_BITS_H */ diff --git a/plat/rockchip/rk3399/include/shared/pmu_regs.h b/plat/rockchip/rk3399/include/shared/pmu_regs.h index 41c6a2443..43e785e93 100644 --- a/plat/rockchip/rk3399/include/shared/pmu_regs.h +++ b/plat/rockchip/rk3399/include/shared/pmu_regs.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PMU_REGS_H__ -#define __PMU_REGS_H__ +#ifndef PMU_REGS_H +#define PMU_REGS_H #define PMU_WKUP_CFG0 0x00 #define PMU_WKUP_CFG1 0x04 @@ -145,4 +145,4 @@ #define GRF_GPIO4C_P 0xe068 #define GRF_GPIO4D_P 0xe06C -#endif /* __PMU_REGS_H__ */ +#endif /* PMU_REGS_H */ diff --git a/plat/rockchip/rk3399/rk3399_def.h b/plat/rockchip/rk3399/rk3399_def.h index 32e439eb9..ba83242eb 100644 --- a/plat/rockchip/rk3399/rk3399_def.h +++ b/plat/rockchip/rk3399/rk3399_def.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_DEF_H__ -#define __PLAT_DEF_H__ +#ifndef RK3399_DEF_H +#define RK3399_DEF_H #include <addressmap.h> @@ -62,4 +62,4 @@ INTR_PROP_DESC(ARM_IRQ_SEC_SGI_6, GIC_HIGHEST_SEC_PRIORITY, \ INTR_GROUP0, GIC_INTR_CFG_LEVEL) -#endif /* __PLAT_DEF_H__ */ +#endif /* RK3399_DEF_H */ diff --git a/plat/rpi3/include/platform_def.h b/plat/rpi3/include/platform_def.h index 76a5ff440..712240138 100644 --- a/plat/rpi3/include/platform_def.h +++ b/plat/rpi3/include/platform_def.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLATFORM_DEF_H__ -#define __PLATFORM_DEF_H__ +#ifndef PLATFORM_DEF_H +#define PLATFORM_DEF_H #include <arch.h> #include <common_def.h> @@ -236,4 +236,4 @@ */ #define SYS_COUNTER_FREQ_IN_TICKS ULL(19200000) -#endif /* __PLATFORM_DEF_H__ */ +#endif /* PLATFORM_DEF_H */ diff --git a/plat/rpi3/rpi3_hw.h b/plat/rpi3/rpi3_hw.h index 1a26053b9..822644cd3 100644 --- a/plat/rpi3/rpi3_hw.h +++ b/plat/rpi3/rpi3_hw.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __RPI3_HW__ -#define __RPI3_HW__ +#ifndef RPI3_HW_H +#define RPI3_HW_H #include <utils_def.h> @@ -95,4 +95,4 @@ #define RPI3_INTC_PENDING_FIQ_OFFSET ULL(0x00000070) #define RPI3_INTC_PENDING_FIQ_MBOX3 ULL(0x00000080) -#endif /* __RPI3_HW__ */ +#endif /* RPI3_HW_H */ diff --git a/plat/rpi3/rpi3_private.h b/plat/rpi3/rpi3_private.h index 368d09b2b..53078f8e9 100644 --- a/plat/rpi3/rpi3_private.h +++ b/plat/rpi3/rpi3_private.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __RPI3_PRIVATE_H__ -#define __RPI3_PRIVATE_H__ +#ifndef RPI3_PRIVATE_H +#define RPI3_PRIVATE_H #include <stdint.h> @@ -39,4 +39,4 @@ void rpi3_rng_read(void *buf, size_t len); /* VideoCore firmware commands */ int rpi3_vc_hardware_get_board_revision(uint32_t *revision); -#endif /*__RPI3_PRIVATE_H__ */ +#endif /* RPI3_PRIVATE_H */ diff --git a/plat/socionext/synquacer/drivers/mhu/sq_mhu.h b/plat/socionext/synquacer/drivers/mhu/sq_mhu.h index bef117d7f..f6b5cc37d 100644 --- a/plat/socionext/synquacer/drivers/mhu/sq_mhu.h +++ b/plat/socionext/synquacer/drivers/mhu/sq_mhu.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SQ_MHU_H__ -#define __SQ_MHU_H__ +#ifndef SQ_MHU_H +#define SQ_MHU_H #include <stdint.h> @@ -16,4 +16,4 @@ void mhu_secure_message_end(unsigned int slot_id); void mhu_secure_init(void); -#endif /* __SQ_MHU_H__ */ +#endif /* SQ_MHU_H */ diff --git a/plat/socionext/synquacer/drivers/scpi/sq_scpi.h b/plat/socionext/synquacer/drivers/scpi/sq_scpi.h index 30fa5c72d..38cc19e5c 100644 --- a/plat/socionext/synquacer/drivers/scpi/sq_scpi.h +++ b/plat/socionext/synquacer/drivers/scpi/sq_scpi.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SQ_SCPI_H__ -#define __SQ_SCPI_H__ +#ifndef SQ_SCPI_H +#define SQ_SCPI_H #include <stddef.h> #include <stdint.h> @@ -79,4 +79,4 @@ extern void scpi_set_sq_power_state(unsigned int mpidr, scpi_power_state_t css_state); uint32_t scpi_sys_power_state(scpi_system_state_t system_state); -#endif /* __SQ_SCPI_H__ */ +#endif /* SQ_SCPI_H */ diff --git a/plat/socionext/synquacer/include/plat_macros.S b/plat/socionext/synquacer/include/plat_macros.S index 3dc06aa98..932b21dd4 100644 --- a/plat/socionext/synquacer/include/plat_macros.S +++ b/plat/socionext/synquacer/include/plat_macros.S @@ -4,12 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_MACROS_S__ -#define __PLAT_MACROS_S__ +#ifndef PLAT_MACROS_S +#define PLAT_MACROS_S /* * Print CCN registers */ .macro plat_crash_print_regs .endm -#endif /* __PLAT_MACROS_S__ */ + +#endif /* PLAT_MACROS_S */ diff --git a/plat/socionext/synquacer/include/sq_common.h b/plat/socionext/synquacer/include/sq_common.h index 7f0633a5c..c39564034 100644 --- a/plat/socionext/synquacer/include/sq_common.h +++ b/plat/socionext/synquacer/include/sq_common.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SQ_COMMON_H__ -#define __SQ_COMMON_H__ +#ifndef SQ_COMMON_H +#define SQ_COMMON_H #include <stdint.h> #include <xlat_tables_v2.h> @@ -40,4 +40,4 @@ void sq_gic_pcpu_init(void); void sq_mmap_setup(uintptr_t total_base, size_t total_size, const struct mmap_region *mmap); -#endif /* __SQ_COMMON_H__ */ +#endif /* SQ_COMMON_H */ diff --git a/plat/socionext/uniphier/include/plat_macros.S b/plat/socionext/uniphier/include/plat_macros.S index 6de4dde17..d6d2579d3 100644 --- a/plat/socionext/uniphier/include/plat_macros.S +++ b/plat/socionext/uniphier/include/plat_macros.S @@ -4,10 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_MACROS_S__ -#define __PLAT_MACROS_S__ +#ifndef PLAT_MACROS_S +#define PLAT_MACROS_S .macro plat_crash_print_regs .endm -#endif /* __PLAT_MACROS_S__ */ +#endif /* PLAT_MACROS_S */ diff --git a/plat/socionext/uniphier/uniphier.h b/plat/socionext/uniphier/uniphier.h index 89ed36287..648c2b94c 100644 --- a/plat/socionext/uniphier/uniphier.h +++ b/plat/socionext/uniphier/uniphier.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __UNIPHIER_H__ -#define __UNIPHIER_H__ +#ifndef UNIPHIER_H +#define UNIPHIER_H #include <stdint.h> #include <string.h> @@ -88,4 +88,4 @@ unsigned int uniphier_calc_core_pos(u_register_t mpidr); #define UNIPHIER_IMAGE_BUF_SIZE ((UNIPHIER_NS_DRAM_LIMIT) - \ (UNIPHIER_IMAGE_BUF_BASE)) -#endif /* __UNIPHIER_H__ */ +#endif /* UNIPHIER_H */ diff --git a/plat/st/stm32mp1/include/boot_api.h b/plat/st/stm32mp1/include/boot_api.h index e019cffcc..c841a7450 100644 --- a/plat/st/stm32mp1/include/boot_api.h +++ b/plat/st/stm32mp1/include/boot_api.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __BOOT_API_H -#define __BOOT_API_H +#ifndef BOOT_API_H +#define BOOT_API_H #include <stdint.h> #include <stdio.h> @@ -235,4 +235,4 @@ typedef struct { uint8_t binary_type; } __packed boot_api_image_header_t; -#endif /* __BOOT_API_H */ +#endif /* BOOT_API_H */ diff --git a/plat/st/stm32mp1/include/stm32mp1_context.h b/plat/st/stm32mp1/include/stm32mp1_context.h index fd08afc7d..698415af2 100644 --- a/plat/st/stm32mp1/include/stm32mp1_context.h +++ b/plat/st/stm32mp1/include/stm32mp1_context.h @@ -4,11 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __STM32MP1_CONTEXT_H__ -#define __STM32MP1_CONTEXT_H__ +#ifndef STM32MP1_CONTEXT_H +#define STM32MP1_CONTEXT_H #include <stdint.h> int stm32_save_boot_interface(uint32_t interface, uint32_t instance); -#endif /* __STM32MP1_CONTEXT_H__ */ +#endif /* STM32MP1_CONTEXT_H */ diff --git a/plat/st/stm32mp1/include/stm32mp1_dt.h b/plat/st/stm32mp1/include/stm32mp1_dt.h index 58e10d19a..19549ee97 100644 --- a/plat/st/stm32mp1/include/stm32mp1_dt.h +++ b/plat/st/stm32mp1/include/stm32mp1_dt.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __STM32MP1_DT_H__ -#define __STM32MP1_DT_H__ +#ifndef STM32MP1_DT_H +#define STM32MP1_DT_H #include <stdbool.h> @@ -38,4 +38,4 @@ int dt_get_stdout_node_offset(void); uint32_t dt_get_ddr_size(void); const char *dt_get_board_model(void); -#endif /* __STM32MP1_DT_H__ */ +#endif /* STM32MP1_DT_H */ diff --git a/plat/st/stm32mp1/include/stm32mp1_private.h b/plat/st/stm32mp1/include/stm32mp1_private.h index a789d53e6..3404bc685 100644 --- a/plat/st/stm32mp1/include/stm32mp1_private.h +++ b/plat/st/stm32mp1/include/stm32mp1_private.h @@ -4,8 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __STM32MP1_PRIVATE_H__ -#define __STM32MP1_PRIVATE_H__ +#ifndef STM32MP1_PRIVATE_H +#define STM32MP1_PRIVATE_H + +#include <stdint.h> void stm32mp1_io_setup(void); void configure_mmu(void); @@ -19,4 +21,4 @@ uintptr_t stm32mp1_get_boot_ctx_address(void); void stm32mp1_gic_pcpu_init(void); void stm32mp1_gic_init(void); -#endif /* __STM32MP1_PRIVATE_H__ */ +#endif /* STM32MP1_PRIVATE_H */ diff --git a/plat/st/stm32mp1/stm32mp1.ld.S b/plat/st/stm32mp1/stm32mp1.ld.S index 0d7a8bb7c..50c926fb9 100644 --- a/plat/st/stm32mp1/stm32mp1.ld.S +++ b/plat/st/stm32mp1/stm32mp1.ld.S @@ -4,8 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __STM32MP1_LD_S__ -#define __STM32MP1_LD_S__ +#ifndef STM32MP1_LD_S +#define STM32MP1_LD_S + #include <platform_def.h> #include <xlat_tables_defs.h> @@ -73,4 +74,4 @@ SECTIONS __TF_END__ = .; } -#endif /*__STM32MP1_LD_S__*/ +#endif /* STM32MP1_LD_S */ diff --git a/plat/ti/k3/common/drivers/sec_proxy/sec_proxy.h b/plat/ti/k3/common/drivers/sec_proxy/sec_proxy.h index facfd1988..2d987f83a 100644 --- a/plat/ti/k3/common/drivers/sec_proxy/sec_proxy.h +++ b/plat/ti/k3/common/drivers/sec_proxy/sec_proxy.h @@ -7,8 +7,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef K3_SEC_PROXY_H -#define K3_SEC_PROXY_H +#ifndef SEC_PROXY_H +#define SEC_PROXY_H #include <stdint.h> @@ -55,4 +55,4 @@ int k3_sec_proxy_send(enum k3_sec_proxy_chan_id id, const struct k3_sec_proxy_ms */ int k3_sec_proxy_recv(enum k3_sec_proxy_chan_id id, struct k3_sec_proxy_msg *msg); -#endif /* K3_SEC_PROXY_H */ +#endif /* SEC_PROXY_H */ diff --git a/plat/ti/k3/common/drivers/ti_sci/ti_sci.h b/plat/ti/k3/common/drivers/ti_sci/ti_sci.h index e40ad6bc5..1176b00f4 100644 --- a/plat/ti/k3/common/drivers/ti_sci/ti_sci.h +++ b/plat/ti/k3/common/drivers/ti_sci/ti_sci.h @@ -7,8 +7,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __TI_SCI_H -#define __TI_SCI_H +#ifndef TI_SCI_H +#define TI_SCI_H #include <stdint.h> #include <stdbool.h> @@ -205,4 +205,4 @@ int ti_sci_proc_get_boot_status(uint8_t proc_id, uint64_t *bv, */ int ti_sci_init(void); -#endif /* __TI_SCI_H */ +#endif /* TI_SCI_H */ diff --git a/plat/ti/k3/common/drivers/ti_sci/ti_sci_protocol.h b/plat/ti/k3/common/drivers/ti_sci/ti_sci_protocol.h index 2c4b23fcb..c6d76d7ea 100644 --- a/plat/ti/k3/common/drivers/ti_sci/ti_sci_protocol.h +++ b/plat/ti/k3/common/drivers/ti_sci/ti_sci_protocol.h @@ -10,8 +10,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __TI_SCI_PROTOCOL_H -#define __TI_SCI_PROTOCOL_H +#ifndef TI_SCI_PROTOCOL_H +#define TI_SCI_PROTOCOL_H #include <stdint.h> @@ -647,4 +647,4 @@ struct ti_sci_msg_resp_get_proc_boot_status { uint32_t status_flags; } __packed; -#endif /* __TI_SCI_PROTOCOL_H */ +#endif /* TI_SCI_PROTOCOL_H */ diff --git a/plat/ti/k3/include/k3_console.h b/plat/ti/k3/include/k3_console.h index 5b01a31f2..6376ab3b7 100644 --- a/plat/ti/k3/include/k3_console.h +++ b/plat/ti/k3/include/k3_console.h @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __K3_CONSOLE_H__ -#define __K3_CONSOLE_H__ +#ifndef K3_CONSOLE_H +#define K3_CONSOLE_H void bl31_console_setup(void); -#endif /* __K3_CONSOLE_H__ */ +#endif /* K3_CONSOLE_H */ diff --git a/plat/ti/k3/include/k3_gicv3.h b/plat/ti/k3/include/k3_gicv3.h index bbf5bf9fe..52f34ff1f 100644 --- a/plat/ti/k3/include/k3_gicv3.h +++ b/plat/ti/k3/include/k3_gicv3.h @@ -4,8 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __K3_GICV3_H__ -#define __K3_GICV3_H__ +#ifndef K3_GICV3_H +#define K3_GICV3_H + +#include <stdint.h> void k3_gic_driver_init(uintptr_t gicd_base, uintptr_t gicr_base); void k3_gic_init(void); @@ -13,4 +15,4 @@ void k3_gic_cpuif_enable(void); void k3_gic_cpuif_disable(void); void k3_gic_pcpu_init(void); -#endif /* __K3_GICV3_H__ */ +#endif /* K3_GICV3_H */ diff --git a/plat/ti/k3/include/plat_macros.S b/plat/ti/k3/include/plat_macros.S index 96d1cd20d..38056b54f 100644 --- a/plat/ti/k3/include/plat_macros.S +++ b/plat/ti/k3/include/plat_macros.S @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_MACROS_S__ -#define __PLAT_MACROS_S__ +#ifndef PLAT_MACROS_S +#define PLAT_MACROS_S /* --------------------------------------------- * The below required platform porting macro @@ -18,4 +18,4 @@ /* STUB */ .endm -#endif /* __PLAT_MACROS_S__ */ +#endif /* PLAT_MACROS_S */ diff --git a/plat/ti/k3/include/platform_def.h b/plat/ti/k3/include/platform_def.h index ab0739e90..7d1df0aef 100644 --- a/plat/ti/k3/include/platform_def.h +++ b/plat/ti/k3/include/platform_def.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLATFORM_DEF_H__ -#define __PLATFORM_DEF_H__ +#ifndef PLATFORM_DEF_H +#define PLATFORM_DEF_H #include <arch.h> #include <board_def.h> @@ -206,4 +206,4 @@ #define TI_SCI_HOST_ID 10 #define TI_SCI_MAX_MESSAGE_SIZE 52 -#endif /* __PLATFORM_DEF_H__ */ +#endif /* PLATFORM_DEF_H */ diff --git a/plat/xilinx/zynqmp/include/plat_macros.S b/plat/xilinx/zynqmp/include/plat_macros.S index 41bc1740d..e54cfc498 100644 --- a/plat/xilinx/zynqmp/include/plat_macros.S +++ b/plat/xilinx/zynqmp/include/plat_macros.S @@ -3,8 +3,8 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLAT_MACROS_S__ -#define __PLAT_MACROS_S__ +#ifndef PLAT_MACROS_S +#define PLAT_MACROS_S #include <arm_macros.S> #include <cci_macros.S> @@ -25,4 +25,4 @@ print_cci_regs .endm -#endif /* __PLAT_MACROS_S__ */ +#endif /* PLAT_MACROS_S */ diff --git a/plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.h b/plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.h index 387ffd237..197c78819 100644 --- a/plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.h +++ b/plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.h @@ -6,8 +6,8 @@ /* ZynqMP IPI mailbox doorbell service enums and defines */ -#ifndef _IPI_MAILBOX_SVC_H_ -#define _IPI_MAILBOX_SVC_H_ +#ifndef IPI_MAILBOX_SVC_H +#define IPI_MAILBOX_SVC_H #include <stdint.h> @@ -36,4 +36,4 @@ uint64_t ipi_smc_handler(uint32_t smc_fid, uint64_t x1, uint64_t x2, uint64_t x3, uint64_t x4, void *cookie, void *handle, uint64_t flags); -#endif /* _IPI_MAILBOX_SVC_H_ */ +#endif /* IPI_MAILBOX_SVC_H */ diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_clock.h b/plat/xilinx/zynqmp/pm_service/pm_api_clock.h index 386f2753b..f7cbdbaf0 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_clock.h +++ b/plat/xilinx/zynqmp/pm_service/pm_api_clock.h @@ -8,8 +8,8 @@ * ZynqMP system level PM-API functions for clock control. */ -#ifndef _PM_API_CLOCK_H_ -#define _PM_API_CLOCK_H_ +#ifndef PM_API_CLOCK_H +#define PM_API_CLOCK_H #include <utils_def.h> #include "pm_common.h" @@ -313,4 +313,4 @@ enum pm_ret_status pm_api_clk_set_pll_frac_data(unsigned int pll, enum pm_ret_status pm_api_clk_get_pll_frac_data(unsigned int pll, unsigned int *data); -#endif /* _PM_API_CLOCK_H_ */ +#endif /* PM_API_CLOCK_H */ diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.h b/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.h index d68c5e313..337f7321b 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.h +++ b/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.h @@ -8,8 +8,8 @@ * ZynqMP system level PM-API functions for pin control. */ -#ifndef _PM_API_IOCTL_H_ -#define _PM_API_IOCTL_H_ +#ifndef PM_API_IOCTL_H +#define PM_API_IOCTL_H #include "pm_common.h" @@ -80,4 +80,4 @@ enum pm_ret_status pm_api_ioctl(enum pm_node_id nid, unsigned int arg1, unsigned int arg2, unsigned int *value); -#endif /* _PM_API_IOCTL_H_ */ +#endif /* PM_API_IOCTL_H */ diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.h b/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.h index c70a77449..9923c00ba 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.h +++ b/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.h @@ -8,8 +8,8 @@ * ZynqMP system level PM-API functions for pin control. */ -#ifndef _PM_API_PINCTRL_H_ -#define _PM_API_PINCTRL_H_ +#ifndef PM_API_PINCTRL_H +#define PM_API_PINCTRL_H #include "pm_common.h" @@ -731,4 +731,4 @@ enum pm_ret_status pm_api_pinctrl_get_num_pins(unsigned int *npins); enum pm_ret_status pm_api_pinctrl_get_num_functions(unsigned int *nfuncs); enum pm_ret_status pm_api_pinctrl_get_num_func_groups(unsigned int fid, unsigned int *ngroups); -#endif /* _PM_API_PINCTRL_H_ */ +#endif /* PM_API_PINCTRL_H */ diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_sys.h b/plat/xilinx/zynqmp/pm_service/pm_api_sys.h index 1c9255e6f..fee91cdd9 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_sys.h +++ b/plat/xilinx/zynqmp/pm_service/pm_api_sys.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef _PM_API_SYS_H_ -#define _PM_API_SYS_H_ +#ifndef PM_API_SYS_H +#define PM_API_SYS_H #include <stdint.h> #include "pm_defs.h" @@ -176,4 +176,4 @@ enum pm_ret_status pm_aes_engine(uint32_t address_high, uint32_t address_low, uint32_t *value); -#endif /* _PM_API_SYS_H_ */ +#endif /* PM_API_SYS_H */ diff --git a/plat/xilinx/zynqmp/pm_service/pm_client.h b/plat/xilinx/zynqmp/pm_service/pm_client.h index 070db8990..0a34a0757 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_client.h +++ b/plat/xilinx/zynqmp/pm_service/pm_client.h @@ -9,8 +9,8 @@ * the execution environment. */ -#ifndef _PM_CLIENT_H_ -#define _PM_CLIENT_H_ +#ifndef PM_CLIENT_H +#define PM_CLIENT_H #include "pm_common.h" #include "pm_defs.h" @@ -25,4 +25,4 @@ enum pm_ret_status pm_set_suspend_mode(uint32_t mode); /* Global variables to be set in pm_client.c */ extern const struct pm_proc *primary_proc; -#endif /* _PM_CLIENT_H_ */ +#endif /* PM_CLIENT_H */ diff --git a/plat/xilinx/zynqmp/pm_service/pm_common.h b/plat/xilinx/zynqmp/pm_service/pm_common.h index 4d03bc0f6..54746271f 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_common.h +++ b/plat/xilinx/zynqmp/pm_service/pm_common.h @@ -9,8 +9,8 @@ * for PU Power Management. This file should be common for all PU's. */ -#ifndef _PM_COMMON_H_ -#define _PM_COMMON_H_ +#ifndef PM_COMMON_H +#define PM_COMMON_H #include <debug.h> #include <stdint.h> @@ -52,4 +52,4 @@ struct pm_proc { const struct pm_proc *pm_get_proc(unsigned int cpuid); const struct pm_proc *pm_get_proc_by_node(enum pm_node_id nid); -#endif /* _PM_COMMON_H_ */ +#endif /* PM_COMMON_H */ diff --git a/plat/xilinx/zynqmp/pm_service/pm_defs.h b/plat/xilinx/zynqmp/pm_service/pm_defs.h index 1fbf6eed9..7a0d97850 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_defs.h +++ b/plat/xilinx/zynqmp/pm_service/pm_defs.h @@ -6,8 +6,8 @@ /* ZynqMP power management enums and defines */ -#ifndef _PM_DEFS_H_ -#define _PM_DEFS_H_ +#ifndef PM_DEFS_H +#define PM_DEFS_H /********************************************************************* * Macro definitions @@ -265,4 +265,4 @@ enum pm_shutdown_subtype { PMF_SHUTDOWN_SUBTYPE_SYSTEM, }; -#endif /* _PM_DEFS_H_ */ +#endif /* PM_DEFS_H */ diff --git a/plat/xilinx/zynqmp/pm_service/pm_ipi.h b/plat/xilinx/zynqmp/pm_service/pm_ipi.h index 439dcf444..650de5220 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_ipi.h +++ b/plat/xilinx/zynqmp/pm_service/pm_ipi.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef _PM_IPI_H_ -#define _PM_IPI_H_ +#ifndef PM_IPI_H +#define PM_IPI_H #include "pm_common.h" @@ -22,4 +22,4 @@ void pm_ipi_buff_read_callb(unsigned int *value, size_t count); void pm_ipi_irq_enable(const struct pm_proc *proc); void pm_ipi_irq_clear(const struct pm_proc *proc); -#endif /* _PM_IPI_H_ */ +#endif /* PM_IPI_H */ diff --git a/plat/xilinx/zynqmp/pm_service/pm_svc_main.h b/plat/xilinx/zynqmp/pm_service/pm_svc_main.h index d89532146..0968f64cb 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_svc_main.h +++ b/plat/xilinx/zynqmp/pm_service/pm_svc_main.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef _PM_SVC_MAIN_H_ -#define _PM_SVC_MAIN_H_ +#ifndef PM_SVC_MAIN_H +#define PM_SVC_MAIN_H #include "pm_common.h" @@ -14,4 +14,4 @@ uint64_t pm_smc_handler(uint32_t smc_fid, uint64_t x1, uint64_t x2, uint64_t x3, uint64_t x4, void *cookie, void *handle, uint64_t flags); -#endif /* _PM_SVC_MAIN_H_ */ +#endif /* PM_SVC_MAIN_H */ diff --git a/plat/xilinx/zynqmp/zynqmp_def.h b/plat/xilinx/zynqmp/zynqmp_def.h index 9d19b1bbd..ba382dd8b 100644 --- a/plat/xilinx/zynqmp/zynqmp_def.h +++ b/plat/xilinx/zynqmp/zynqmp_def.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __ZYNQMP_DEF_H__ -#define __ZYNQMP_DEF_H__ +#ifndef ZYNQMP_DEF_H +#define ZYNQMP_DEF_H #include <common_def.h> @@ -340,4 +340,4 @@ #define AFIFM6_WRCTRL U(13) #define FABRIC_WIDTH U(3) -#endif /* __ZYNQMP_DEF_H__ */ +#endif /* ZYNQMP_DEF_H */ diff --git a/plat/xilinx/zynqmp/zynqmp_ipi.h b/plat/xilinx/zynqmp/zynqmp_ipi.h index 0544ddbfb..b9b40dde3 100644 --- a/plat/xilinx/zynqmp/zynqmp_ipi.h +++ b/plat/xilinx/zynqmp/zynqmp_ipi.h @@ -6,8 +6,8 @@ /* ZynqMP IPI management enums and defines */ -#ifndef _ZYNQMP_IPI_H_ -#define _ZYNQMP_IPI_H_ +#ifndef ZYNQMP_IPI_H +#define ZYNQMP_IPI_H #include <stdint.h> @@ -67,4 +67,4 @@ void ipi_mb_disable_irq(uint32_t local, uint32_t remote); /* Enable IPI mailbox notification interrupt */ void ipi_mb_enable_irq(uint32_t local, uint32_t remote); -#endif /* _ZYNQMP_IPI_H_ */ +#endif /* ZYNQMP_IPI_H */ diff --git a/plat/xilinx/zynqmp/zynqmp_private.h b/plat/xilinx/zynqmp/zynqmp_private.h index d5024c3ec..8a8d38abf 100644 --- a/plat/xilinx/zynqmp/zynqmp_private.h +++ b/plat/xilinx/zynqmp/zynqmp_private.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __ZYNQMP_PRIVATE_H__ -#define __ZYNQMP_PRIVATE_H__ +#ifndef ZYNQMP_PRIVATE_H +#define ZYNQMP_PRIVATE_H #include <bl_common.h> #include <interrupt_mgmt.h> @@ -38,4 +38,4 @@ int request_intr_type_el3(uint32_t, interrupt_type_handler_t); enum fsbl_handoff fsbl_atf_handover(entry_point_info_t *bl32_image_ep_info, entry_point_info_t *bl33_image_ep_info); -#endif /* __ZYNQMP_PRIVATE_H__ */ +#endif /* ZYNQMP_PRIVATE_H */ |