Merge pull request #1673 from antonio-nino-diaz-arm/an/headers

Standardise header guards across codebase

include/services/spm_svc.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SPM_SVC_H__
-#define __SPM_SVC_H__
+#ifndef SPM_SVC_H
+#define SPM_SVC_H
 
 #include <utils_def.h>
 
@@ -79,4 +79,4 @@ uint64_t spm_sp_call(uint32_t smc_fid, uint64_t x1, uint64_t x2, uint64_t x3);
 
 #endif /* __ASSEMBLY__ */
 
-#endif /* __SPM_SVC_H__ */
+#endif /* SPM_SVC_H */

include/services/std_svc.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __STD_SVC_H__
-#define __STD_SVC_H__
+#ifndef STD_SVC_H
+#define STD_SVC_H
 
 /* SMC function IDs for Standard Service queries */
 
@@ -27,4 +27,4 @@
  */
 uintptr_t get_arm_std_svc_args(unsigned int svc_mask);
 
-#endif /* __STD_SVC_H__ */
+#endif /* STD_SVC_H */

include/tools_share/firmware_image_package.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __FIRMWARE_IMAGE_PACKAGE_H__
-#define __FIRMWARE_IMAGE_PACKAGE_H__
+#ifndef FIRMWARE_IMAGE_PACKAGE_H
+#define FIRMWARE_IMAGE_PACKAGE_H
 
 #include <stdint.h>
 #include <uuid.h>
@@ -88,4 +88,4 @@ typedef struct fip_toc_entry {
 	uint64_t	flags;
 } fip_toc_entry_t;
 
-#endif /* __FIRMWARE_IMAGE_PACKAGE_H__ */
+#endif /* FIRMWARE_IMAGE_PACKAGE_H */

include/tools_share/tbbr_oid.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TBBR_OID_H__
-#define __TBBR_OID_H__
+#ifndef TBBR_OID_H
+#define TBBR_OID_H
 
 /*
  * The following is a list of OID values defined and reserved by ARM, which
@@ -145,4 +145,4 @@
 /* NonTrustedFirmwareConfigHash - NT_FW_CONFIG */
 #define NON_TRUSTED_FW_CONFIG_HASH_OID		"1.3.6.1.4.1.4128.2100.1202"
 
-#endif /* __TBBR_OID_H__ */
+#endif /* TBBR_OID_H */

include/tools_share/uuid.h

@@ -31,8 +31,8 @@
  * All rights reserved.
  */
 
-#ifndef _SYS_UUID_H_
-#define _SYS_UUID_H_
+#ifndef UUID_H
+#define UUID_H
 
 /* Length of a node address (an IEEE 802 address). */
 #define	_UUID_NODE_LEN		6
@@ -59,4 +59,4 @@ struct uuid {
 /* XXX namespace pollution? */
 typedef struct uuid uuid_t;
 
-#endif /* _SYS_UUID_H_ */
+#endif /* UUID_H */

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 */

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 */

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 */

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 */

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 */

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 */

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 */

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 */

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 */

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 */

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 */

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 */

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 */

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 */

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 */