Commit c3cf06f1 authored by Antonio Nino Diaz's avatar Antonio Nino Diaz
Browse files

Standardise header guards across codebase



All identifiers, regardless of use, that start with two underscores are
reserved. This means they can't be used in header guards.

The style that this project is now to use the full name of the file in
capital letters followed by 'H'. For example, for a file called
"uart_example.h", the header guard is UART_EXAMPLE_H.

The exceptions are files that are imported from other projects:

- CryptoCell driver
- dt-bindings folders
- zlib headers

Change-Id: I50561bf6c88b491ec440d0c8385c74650f3c106e
Signed-off-by: default avatarAntonio Nino Diaz <antonio.ninodiaz@arm.com>
parent f5ae1b0e
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
* https://spdx.org/licenses * https://spdx.org/licenses
*/ */
#ifndef __A3700_PLAT_DEF_H__ #ifndef A3700_PLAT_DEF_H
#define __A3700_PLAT_DEF_H__ #define A3700_PLAT_DEF_H
#include <marvell_def.h> #include <marvell_def.h>
...@@ -119,4 +119,4 @@ ...@@ -119,4 +119,4 @@
*/ */
#define MVEBU_COMPHY_REG_BASE (MVEBU_REGS_BASE + 0x18300) #define MVEBU_COMPHY_REG_BASE (MVEBU_REGS_BASE + 0x18300)
#endif /* __A3700_PLAT_DEF_H__ */ #endif /* A3700_PLAT_DEF_H */
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
* https://spdx.org/licenses * https://spdx.org/licenses
*/ */
#ifndef __A3700_PM_H__ #ifndef A3700_PM_H
#define __A3700_PM_H__ #define A3700_PM_H
#include <stdint.h> #include <stdint.h>
...@@ -48,5 +48,4 @@ struct pm_wake_up_src_config { ...@@ -48,5 +48,4 @@ struct pm_wake_up_src_config {
struct pm_wake_up_src_config *mv_wake_up_src_config_get(void); struct pm_wake_up_src_config *mv_wake_up_src_config_get(void);
#endif /* A3700_PM_H */
#endif /* __A3700_PM_H__ */
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
* https://spdx.org/licenses * https://spdx.org/licenses
*/ */
#ifndef _DDR_INFO_H_ #ifndef DDR_INFO_H
#define _DDR_INFO_H_ #define DDR_INFO_H
#define DRAM_MAX_IFACE 1 #define DRAM_MAX_IFACE 1
#define DRAM_CH0_MMAP_LOW_OFFSET 0x200 #define DRAM_CH0_MMAP_LOW_OFFSET 0x200
#endif /* _DDR_INFO_H_ */ #endif /* DDR_INFO_H */
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
* https://spdx.org/licenses * https://spdx.org/licenses
*/ */
#ifndef _DRAM_WIN_H_ #ifndef DRAM_WIN_H
#define _DRAM_WIN_H_ #define DRAM_WIN_H
#include <bl_common.h> #include <bl_common.h>
#include <io_addr_dec.h> #include <io_addr_dec.h>
...@@ -14,5 +14,4 @@ ...@@ -14,5 +14,4 @@
void dram_win_map_build(struct dram_win_map *win_map); void dram_win_map_build(struct dram_win_map *win_map);
void cpu_wins_init(void); void cpu_wins_init(void);
#endif /* _DRAM_WIN_H_ */ #endif /* DRAM_WIN_H */
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
* https://spdx.org/licenses * https://spdx.org/licenses
*/ */
#ifndef _IO_ADDR_DEC_H_ #ifndef IO_ADDR_DEC_H
#define _IO_ADDR_DEC_H_ #define IO_ADDR_DEC_H
#include <stdint.h> #include <stdint.h>
...@@ -63,5 +63,4 @@ int init_io_addr_dec(struct dram_win_map *dram_wins_map, ...@@ -63,5 +63,4 @@ int init_io_addr_dec(struct dram_win_map *dram_wins_map,
struct dec_win_config *io_dec_config, struct dec_win_config *io_dec_config,
uint32_t io_unit_num); uint32_t io_unit_num);
#endif /* _IO_ADDR_DEC_H_ */ #endif /* IO_ADDR_DEC_H */
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
* https://spdx.org/licenses * https://spdx.org/licenses
*/ */
#ifndef __PLAT_MACROS_S__ #ifndef PLAT_MACROS_S
#define __PLAT_MACROS_S__ #define PLAT_MACROS_S
#include <marvell_macros.S> #include <marvell_macros.S>
...@@ -23,4 +23,4 @@ ...@@ -23,4 +23,4 @@
print_cci_regs print_cci_regs
.endm .endm
#endif /* __PLAT_MACROS_S__ */ #endif /* PLAT_MACROS_S */
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
* https://spdx.org/licenses * https://spdx.org/licenses
*/ */
#ifndef __PLATFORM_DEF_H__ #ifndef PLATFORM_DEF_H
#define __PLATFORM_DEF_H__ #define PLATFORM_DEF_H
#include <board_marvell_def.h> #include <board_marvell_def.h>
#include <mvebu_def.h> #include <mvebu_def.h>
...@@ -228,4 +228,4 @@ ...@@ -228,4 +228,4 @@
#define BL32_LIMIT TRUSTED_DRAM_SIZE #define BL32_LIMIT TRUSTED_DRAM_SIZE
#endif #endif
#endif /* __PLATFORM_DEF_H__ */ #endif /* PLATFORM_DEF_H */
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
* https://spdx.org/licenses * https://spdx.org/licenses
*/ */
#ifndef __MVEBU_DEF_H__ #ifndef MVEBU_DEF_H
#define __MVEBU_DEF_H__ #define MVEBU_DEF_H
#include <a8k_plat_def.h> #include <a8k_plat_def.h>
#define CP_COUNT 1 /* A70x0 has single CP0 */ #define CP_COUNT 1 /* A70x0 has single CP0 */
#endif /* __MVEBU_DEF_H__ */ #endif /* MVEBU_DEF_H */
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
* https://spdx.org/licenses * https://spdx.org/licenses
*/ */
#ifndef __MVEBU_DEF_H__ #ifndef MVEBU_DEF_H
#define __MVEBU_DEF_H__ #define MVEBU_DEF_H
#include <a8k_plat_def.h> #include <a8k_plat_def.h>
...@@ -28,4 +28,4 @@ ...@@ -28,4 +28,4 @@
#endif #endif
#endif /* __MVEBU_DEF_H__ */ #endif /* MVEBU_DEF_H */
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
* https://spdx.org/licenses * https://spdx.org/licenses
*/ */
#ifndef __PHY_PORTING_LAYER_H #ifndef PHY_PORTING_LAYER_H
#define __PHY_PORTING_LAYER_H #define PHY_PORTING_LAYER_H
#define MAX_LANE_NR 6 #define MAX_LANE_NR 6
...@@ -164,4 +164,4 @@ static const struct sata_params ...@@ -164,4 +164,4 @@ static const struct sata_params
}, },
}, },
}; };
#endif /* __PHY_PORTING_LAYER_H */ #endif /* PHY_PORTING_LAYER_H */
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
* https://spdx.org/licenses * https://spdx.org/licenses
*/ */
#ifndef __MVEBU_DEF_H__ #ifndef MVEBU_DEF_H
#define __MVEBU_DEF_H__ #define MVEBU_DEF_H
#include <a8k_plat_def.h> #include <a8k_plat_def.h>
...@@ -14,4 +14,4 @@ ...@@ -14,4 +14,4 @@
#define I2C_SPD_ADDR 0x53 /* Access SPD data */ #define I2C_SPD_ADDR 0x53 /* Access SPD data */
#define I2C_SPD_P0_ADDR 0x36 /* Select SPD data page 0 */ #define I2C_SPD_P0_ADDR 0x36 /* Select SPD data page 0 */
#endif /* __MVEBU_DEF_H__ */ #endif /* MVEBU_DEF_H */
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
* https://spdx.org/licenses * https://spdx.org/licenses
*/ */
#ifndef __MVEBU_DEF_H__ #ifndef MVEBU_DEF_H
#define __MVEBU_DEF_H__ #define MVEBU_DEF_H
#include <a8k_plat_def.h> #include <a8k_plat_def.h>
...@@ -14,4 +14,4 @@ ...@@ -14,4 +14,4 @@
#define I2C_SPD_ADDR 0x53 /* Access SPD data */ #define I2C_SPD_ADDR 0x53 /* Access SPD data */
#define I2C_SPD_P0_ADDR 0x36 /* Select SPD data page 0 */ #define I2C_SPD_P0_ADDR 0x36 /* Select SPD data page 0 */
#endif /* __MVEBU_DEF_H__ */ #endif /* MVEBU_DEF_H */
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
* https://spdx.org/licenses * https://spdx.org/licenses
*/ */
#ifndef __A8K_PLAT_DEF_H__ #ifndef A8K_PLAT_DEF_H
#define __A8K_PLAT_DEF_H__ #define A8K_PLAT_DEF_H
#include <marvell_def.h> #include <marvell_def.h>
...@@ -191,4 +191,4 @@ enum ccu_target_ids { ...@@ -191,4 +191,4 @@ enum ccu_target_ids {
}; };
#endif /* __ASSEMBLER__ */ #endif /* __ASSEMBLER__ */
#endif /* __A8K_PLAT_DEF_H__ */ #endif /* A8K_PLAT_DEF_H */
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
*/ */
/* This driver provides I2C support for Marvell A8K and compatible SoCs */ /* This driver provides I2C support for Marvell A8K and compatible SoCs */
#ifndef A8K_I2C_H #ifndef MENTOR_I2C_PLAT_H
#define A8K_I2C_H #define MENTOR_I2C_PLAT_H
#define CONFIG_SYS_TCLK 250000000 #define CONFIG_SYS_TCLK 250000000
#define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SPEED 100000
...@@ -30,4 +30,4 @@ struct mentor_i2c_regs { ...@@ -30,4 +30,4 @@ struct mentor_i2c_regs {
uint32_t unstuck; uint32_t unstuck;
}; };
#endif #endif /* MENTOR_I2C_PLAT_H */
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
* https://spdx.org/licenses * https://spdx.org/licenses
*/ */
#ifndef __PLAT_MACROS_S__ #ifndef PLAT_MACROS_S
#define __PLAT_MACROS_S__ #define PLAT_MACROS_S
#include <marvell_macros.S> #include <marvell_macros.S>
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
.macro plat_crash_print_regs .macro plat_crash_print_regs
.endm .endm
#endif /* __PLAT_MACROS_S__ */ #endif /* PLAT_MACROS_S */
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
* https://spdx.org/licenses * https://spdx.org/licenses
*/ */
#ifndef __PLATFORM_DEF_H__ #ifndef PLATFORM_DEF_H
#define __PLATFORM_DEF_H__ #define PLATFORM_DEF_H
#include <board_marvell_def.h> #include <board_marvell_def.h>
#include <gic_common.h> #include <gic_common.h>
...@@ -198,4 +198,4 @@ ...@@ -198,4 +198,4 @@
#define MVEBU_PMU_IRQ_WA #define MVEBU_PMU_IRQ_WA
#endif /* __PLATFORM_DEF_H__ */ #endif /* PLATFORM_DEF_H */
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
* https://spdx.org/licenses * https://spdx.org/licenses
*/ */
#ifndef __MSS_PM_IPC_H #ifndef MSS_PM_IPC_H
#define __MSS_PM_IPC_H #define MSS_PM_IPC_H
#include <mss_ipc_drv.h> #include <mss_ipc_drv.h>
...@@ -32,4 +32,4 @@ int mss_pm_ipc_msg_send(unsigned int channel_id, unsigned int msg_id, ...@@ -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); int mss_pm_ipc_msg_trigger(void);
#endif /* __MSS_PM_IPC_H */ #endif /* MSS_PM_IPC_H */
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
* https://spdx.org/licenses * https://spdx.org/licenses
*/ */
#ifndef __PM_IPC_DRV_H #ifndef MSS_IPC_DRV_H
#define __PM_IPC_DRV_H #define MSS_IPC_DRV_H
#include <psci.h> #include <psci.h>
...@@ -117,4 +117,4 @@ int mv_pm_ipc_msg_rx(unsigned int channel_id, struct mss_pm_ipc_msg *msg); ...@@ -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, int mv_pm_ipc_msg_tx(unsigned int channel_id, unsigned int msg_id,
unsigned int cluster_power_state); unsigned int cluster_power_state);
#endif /* __PM_IPC_DRV_H */ #endif /* MSS_IPC_DRV_H */
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
* https://spdx.org/licenses * https://spdx.org/licenses
*/ */
#ifndef __MSS_PM_MEM_H #ifndef MSS_MEM_H
#define __MSS_PM_MEM_H #define MSS_MEM_H
/* MSS SRAM Memory base */ /* MSS SRAM Memory base */
#define MSS_SRAM_PM_CONTROL_BASE (MVEBU_REGS_BASE + 0x520000) #define MSS_SRAM_PM_CONTROL_BASE (MVEBU_REGS_BASE + 0x520000)
...@@ -57,4 +57,4 @@ struct mss_pm_ctrl_block { ...@@ -57,4 +57,4 @@ struct mss_pm_ctrl_block {
unsigned int ctrl_blk_size; unsigned int ctrl_blk_size;
}; };
#endif /* __MSS_PM_MEM_H */ #endif /* MSS_MEM_H */
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
* https://spdx.org/licenses * https://spdx.org/licenses
*/ */
#ifndef __MSS_SCP_BL2_FORMAT_H #ifndef MSS_SCP_BL2_FORMAT_H
#define __MSS_SCP_BL2_FORMAT_H #define MSS_SCP_BL2_FORMAT_H
#define MAX_NR_OF_FILES 5 #define MAX_NR_OF_FILES 5
#define FILE_MAGIC 0xddd01ff #define FILE_MAGIC 0xddd01ff
...@@ -41,4 +41,4 @@ typedef struct img_header { ...@@ -41,4 +41,4 @@ typedef struct img_header {
*/ */
} img_header_t; } img_header_t;
#endif /* __MSS_SCP_BL2_FORMAT_H */ #endif /* MSS_SCP_BL2_FORMAT_H */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment