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
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef __PLAT_PRIVATE_H__ #ifndef PLAT_PRIVATE_H
#define __PLAT_PRIVATE_H__ #define PLAT_PRIVATE_H
#include <bl_common.h> #include <bl_common.h>
#include "hi3798cv200.h" #include "hi3798cv200.h"
...@@ -33,4 +33,4 @@ void poplar_gic_init(void); ...@@ -33,4 +33,4 @@ void poplar_gic_init(void);
void poplar_gic_cpuif_enable(void); void poplar_gic_cpuif_enable(void);
void poplar_gic_pcpu_init(void); void poplar_gic_pcpu_init(void);
#endif /* __PLAT_PRIVATE_H__ */ #endif /* PLAT_PRIVATE_H */
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef __POPLAR_LAYOUT_H #ifndef POPLAR_LAYOUT_H
#define __POPLAR_LAYOUT_H #define POPLAR_LAYOUT_H
/* /*
* Boot memory layout definitions for the HiSilicon Poplar board * Boot memory layout definitions for the HiSilicon Poplar board
...@@ -129,4 +129,4 @@ ...@@ -129,4 +129,4 @@
#define BL31_BASE (LLOADER_TEXT_BASE + BL31_OFFSET) #define BL31_BASE (LLOADER_TEXT_BASE + BL31_OFFSET)
#define BL31_LIMIT (BL31_BASE + BL31_SIZE) #define BL31_LIMIT (BL31_BASE + BL31_SIZE)
#endif /* !__POPLAR_LAYOUT_H */ #endif /* POPLAR_LAYOUT_H */
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef __IMX8_IOMUX_H__ #ifndef IMX8_IOMUX_H
#define __IMX8_IOMUX_H__ #define IMX8_IOMUX_H
#define PADRING_IFMUX_EN_SHIFT 31 #define PADRING_IFMUX_EN_SHIFT 31
#define PADRING_IFMUX_EN_MASK (1 << PADRING_IFMUX_EN_SHIFT) #define PADRING_IFMUX_EN_MASK (1 << PADRING_IFMUX_EN_SHIFT)
...@@ -22,4 +22,4 @@ ...@@ -22,4 +22,4 @@
#define PADRING_DSE_SHIFT 0 #define PADRING_DSE_SHIFT 0
#define PADRING_DSE_MASK (0x7 << PADRING_DSE_SHIFT) #define PADRING_DSE_MASK (0x7 << PADRING_DSE_SHIFT)
#endif /* __IMX8_IOMUX_H__ */ #endif /* IMX8_IOMUX_H */
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef __IMX_LPUART_H__ #ifndef IMX8_LPUART_H
#define __IMX_LPUART_H__ #define IMX8_LPUART_H
#include <console.h> #include <console.h>
...@@ -63,4 +63,4 @@ int console_lpuart_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, ...@@ -63,4 +63,4 @@ int console_lpuart_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud,
console_lpuart_t *console); console_lpuart_t *console);
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLY__*/
#endif /* __IMX_LPUART_H__*/ #endif /* IMX8_LPUART_H */
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* Header file used to configure SoC pad list. * Header file used to configure SoC pad list.
*/ */
#ifndef SC_PADS_H #ifndef IMX8QM_PADS_H
#define SC_PADS_H #define IMX8QM_PADS_H
/* Includes */ /* Includes */
...@@ -290,4 +290,4 @@ ...@@ -290,4 +290,4 @@
#define SC_P_COMP_CTL_GPIO_1V8_3V3_ENET_ENETA 268 /* */ #define SC_P_COMP_CTL_GPIO_1V8_3V3_ENET_ENETA 268 /* */
/*@}*/ /*@}*/
#endif /* SC_PADS_H */ #endif /* IMX8QM_PADS_H */
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* Header file used to configure SoC pad list. * Header file used to configure SoC pad list.
*/ */
#ifndef SC_PADS_H #ifndef IMX8QX_PADS_H
#define SC_PADS_H #define IMX8QX_PADS_H
/* Includes */ /* Includes */
...@@ -195,4 +195,4 @@ ...@@ -195,4 +195,4 @@
#define SC_P_COMP_CTL_GPIO_1V8_3V3_QSPI0B 173 /* */ #define SC_P_COMP_CTL_GPIO_1V8_3V3_QSPI0B 173 /* */
/*@}*/ /*@}*/
#endif /* SC_PADS_H */ #endif /* IMX8QX_PADS_H */
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef __IMX_AIPS_H__ #ifndef IMX_AIPS_H
#define __IMX_AIPS_H__ #define IMX_AIPS_H
#include <stdint.h> #include <stdint.h>
...@@ -19,4 +19,4 @@ struct aipstz_regs { ...@@ -19,4 +19,4 @@ struct aipstz_regs {
void imx_aips_init(void); void imx_aips_init(void);
#endif /* __IMX_AIPS_H__ */ #endif /* IMX_AIPS_H */
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef __IMX_CAAM_H__ #ifndef IMX_CAAM_H
#define __IMX_CAAM_H__ #define IMX_CAAM_H
#include <stdint.h> #include <stdint.h>
#include <arch.h> #include <arch.h>
...@@ -66,4 +66,4 @@ struct caam_ctrl { ...@@ -66,4 +66,4 @@ struct caam_ctrl {
/* Declare CAAM API */ /* Declare CAAM API */
void imx_caam_init(void); void imx_caam_init(void);
#endif /* __IMX_CAAM_H__ */ #endif /* IMX_CAAM_H */
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef __IMX_CLOCK_H__ #ifndef IMX_CLOCK_H
#define __IMX_CLOCK_H__ #define IMX_CLOCK_H
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
...@@ -999,4 +999,4 @@ void imx_clock_enable_usb(unsigned int usb_id); ...@@ -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_disable_usb(unsigned int usb_id);
void imx_clock_set_usb_clk_root_bits(uint32_t usb_clk_root_en_bits); void imx_clock_set_usb_clk_root_bits(uint32_t usb_clk_root_en_bits);
#endif /* __IMX_CLOCK_H__ */ #endif /* IMX_CLOCK_H */
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef __IMX_CSU_H__ #ifndef IMX_CSU_H
#define __IMX_CSU_H__ #define IMX_CSU_H
#include <arch.h> #include <arch.h>
...@@ -41,4 +41,4 @@ ...@@ -41,4 +41,4 @@
CSU_CSL_SUR_S2) CSU_CSL_SUR_S2)
void imx_csu_init(void); void imx_csu_init(void);
#endif /* __IMX_CSU_H__ */ #endif /* IMX_CSU_H */
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef __IMX_HAB_H__ #ifndef IMX_HAB_H
#define __IMX_HAB_H__ #define IMX_HAB_H
#include <imx_hab_arch.h> #include <imx_hab_arch.h>
#include <imx_regs.h> #include <imx_regs.h>
...@@ -30,4 +30,4 @@ ...@@ -30,4 +30,4 @@
#define HAB_ROM_VECTOR_TABLE_REPORT_STATUS (HAB_ROM_VECTOR_BASE + 0x24) #define HAB_ROM_VECTOR_TABLE_REPORT_STATUS (HAB_ROM_VECTOR_BASE + 0x24)
#define HAB_ROM_VECTOR_TABLE_FAILSAFE (HAB_ROM_VECTOR_BASE + 0x28) #define HAB_ROM_VECTOR_TABLE_FAILSAFE (HAB_ROM_VECTOR_BASE + 0x28)
#endif /* __IMX_HAB_H__ */ #endif /* IMX_HAB_H */
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef __IMX_IO_MUX_H__ #ifndef IMX_IO_MUX_H
#define __IMX_IO_MUX_H__ #define IMX_IO_MUX_H
#include <stdint.h> #include <stdint.h>
...@@ -606,4 +606,4 @@ ...@@ -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_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); 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 */
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef __IMX_SNVS_H__ #ifndef IMX_SNVS_H
#define __IMX_SNVS_H__ #define IMX_SNVS_H
#include <stdint.h> #include <stdint.h>
#include <arch.h> #include <arch.h>
...@@ -79,4 +79,4 @@ struct snvs { ...@@ -79,4 +79,4 @@ struct snvs {
void imx_snvs_init(void); void imx_snvs_init(void);
#endif /* __IMX_SNVS_H__ */ #endif /* IMX_SNVS_H */
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef __IMX_WDOG_H__ #ifndef IMX_WDOG_H
#define __IMX_WDOG_H__ #define IMX_WDOG_H
#include <arch.h> #include <arch.h>
#include <stdint.h> #include <stdint.h>
...@@ -58,4 +58,4 @@ static inline int wicr_calc_wict(int sec, int half_sec) ...@@ -58,4 +58,4 @@ static inline int wicr_calc_wict(int sec, int half_sec)
/* External facing API */ /* External facing API */
void imx_wdog_init(void); void imx_wdog_init(void);
#endif /* __IMX_WDOG_H__ */ #endif /* IMX_WDOG_H */
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef __PLAT_IMX8_H__ #ifndef PLAT_IMX8_H
#define __PLAT_IMX8_H__ #define PLAT_IMX8_H
#include <gicv3.h> #include <gicv3.h>
#include <psci.h> #include <psci.h>
...@@ -23,4 +23,5 @@ void __dead2 imx_system_reset(void); ...@@ -23,4 +23,5 @@ void __dead2 imx_system_reset(void);
int imx_validate_power_state(unsigned int power_state, int imx_validate_power_state(unsigned int power_state,
psci_power_state_t *req_state); psci_power_state_t *req_state);
void imx_get_sys_suspend_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 */
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef _SC_SCI_H #ifndef SCI_H
#define _SC_SCI_H #define SCI_H
/* Defines */ /* Defines */
...@@ -16,4 +16,4 @@ ...@@ -16,4 +16,4 @@
#include <sci/svc/pm/sci_pm_api.h> #include <sci/svc/pm/sci_pm_api.h>
#include <sci/svc/rm/sci_rm_api.h> #include <sci/svc/rm/sci_rm_api.h>
#endif /* _SC_SCI_H */ #endif /* SCI_H */
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* Header file for the IPC implementation. * Header file for the IPC implementation.
*/ */
#ifndef SC_IPC_H #ifndef SCI_IPC_H
#define SC_IPC_H #define SCI_IPC_H
/* Includes */ /* Includes */
...@@ -64,4 +64,4 @@ void sc_ipc_write(sc_ipc_t ipc, void *data); ...@@ -64,4 +64,4 @@ void sc_ipc_write(sc_ipc_t ipc, void *data);
sc_ipc_t ipc_handle; sc_ipc_t ipc_handle;
#endif /* SC_IPC_H */ #endif /* SCI_IPC_H */
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* Header file for the RPC implementation. * Header file for the RPC implementation.
*/ */
#ifndef SC_RPC_H #ifndef SCI_RPC_H
#define SC_RPC_H #define SCI_RPC_H
/* Includes */ /* Includes */
...@@ -124,4 +124,4 @@ void sc_rpc_dispatch(sc_rsrc_t mu, sc_rpc_msg_t *msg); ...@@ -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); void sc_rpc_xlate(sc_ipc_t ipc, sc_rpc_msg_t *msg);
#endif /* SC_RPC_H */ #endif /* SCI_RPC_H */
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef _SC_SCFW_H #ifndef SCI_SCFW_H
#define _SC_SCFW_H #define SCI_SCFW_H
/* Includes */ /* Includes */
...@@ -33,5 +33,4 @@ typedef uint64_t sc_ipc_t; ...@@ -33,5 +33,4 @@ typedef uint64_t sc_ipc_t;
typedef uint64_t sc_ipc_id_t; typedef uint64_t sc_ipc_id_t;
#endif /* _SC_SCFW_H */ #endif /* SCI_SCFW_H */
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* Header file containing types used across multiple service APIs. * Header file containing types used across multiple service APIs.
*/ */
#ifndef SC_TYPES_H #ifndef SCI_TYPES_H
#define SC_TYPES_H #define SCI_TYPES_H
/* Includes */ /* Includes */
...@@ -846,4 +846,4 @@ typedef __UINT32_TYPE__ uint32_t; ...@@ -846,4 +846,4 @@ typedef __UINT32_TYPE__ uint32_t;
typedef __UINT64_TYPE__ uint64_t; typedef __UINT64_TYPE__ uint64_t;
#endif #endif
#endif /* SC_TYPES_H */ #endif /* SCI_TYPES_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