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/include/common/aarch64/asm_macros.S b/include/common/aarch64/asm_macros.S
index 91416e4..dea3021 100644
--- a/include/common/aarch64/asm_macros.S
+++ b/include/common/aarch64/asm_macros.S
@@ -3,8 +3,8 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __ASM_MACROS_S__
-#define __ASM_MACROS_S__
+#ifndef ASM_MACROS_S
+#define ASM_MACROS_S
#include <arch.h>
#include <asm_macros_common.S>
@@ -192,4 +192,4 @@
.endm
#endif
-#endif /* __ASM_MACROS_S__ */
+#endif /* ASM_MACROS_S */
diff --git a/include/common/aarch64/assert_macros.S b/include/common/aarch64/assert_macros.S
index 4567c69..06371c4 100644
--- a/include/common/aarch64/assert_macros.S
+++ b/include/common/aarch64/assert_macros.S
@@ -3,8 +3,8 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __ASSERT_MACROS_S__
-#define __ASSERT_MACROS_S__
+#ifndef ASSERT_MACROS_S
+#define ASSERT_MACROS_S
/*
* Assembler macro to enable asm_assert. Use this macro wherever
@@ -26,4 +26,4 @@
b asm_assert ;\
300:
-#endif /* __ASSERT_MACROS_S__ */
+#endif /* ASSERT_MACROS_S */
diff --git a/include/common/aarch64/console_macros.S b/include/common/aarch64/console_macros.S
index b285ecc..5c88d4f 100644
--- a/include/common/aarch64/console_macros.S
+++ b/include/common/aarch64/console_macros.S
@@ -3,8 +3,8 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __CONSOLE_MACROS_S__
-#define __CONSOLE_MACROS_S__
+#ifndef CONSOLE_MACROS_S
+#define CONSOLE_MACROS_S
#include <console.h>
@@ -84,4 +84,5 @@
b console_register
.endm
#endif /* USE_FINISH_CONSOLE_REG_2 */
-#endif /* __CONSOLE_MACROS_S__ */
+
+#endif /* CONSOLE_MACROS_S */
diff --git a/include/common/aarch64/el3_common_macros.S b/include/common/aarch64/el3_common_macros.S
index 4902583..adfb54e 100644
--- a/include/common/aarch64/el3_common_macros.S
+++ b/include/common/aarch64/el3_common_macros.S
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __EL3_COMMON_MACROS_S__
-#define __EL3_COMMON_MACROS_S__
+#ifndef EL3_COMMON_MACROS_S
+#define EL3_COMMON_MACROS_S
#include <arch.h>
#include <asm_macros.S>
@@ -341,4 +341,4 @@
#endif
.endm
-#endif /* __EL3_COMMON_MACROS_S__ */
+#endif /* EL3_COMMON_MACROS_S */