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: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
diff --git a/plat/marvell/a3700/a3700/mvebu_def.h b/plat/marvell/a3700/a3700/mvebu_def.h
index c58f06b..dad1085 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 6ae57b3..c7f40ad 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 bd8792a..cc6cf43 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 *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 1a9230d..254f78c 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 7ff20be..6f345f9 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 79f6f2c..42ef30b 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 @@
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 b52d1cf..f689b4f 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 7c72cc5..ca2553c 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 */