Add header guards to asm macro files

Some assembly files containing macros are included like header files
into other assembly files. This will cause assembler errors if they
are included multiple times.

Add header guards to assembly macro files to avoid assembler errors.

Change-Id: Ia632e767ed7df7bf507b294982b8d730a6f8fe69

diff --git a/include/common/asm_macros.S b/include/common/asm_macros.S
index 4dcb5f0cc5fd897e4d4f0b3da9f38d60e2575186..f9e7823c623ac13ed3717e3d070ad22045ca5f30 100644 (file)
--- a/include/common/asm_macros.S
+++ b/include/common/asm_macros.S
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2014, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2013-2015, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -27,6 +27,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+#ifndef __ASM_MACROS_S__
+#define __ASM_MACROS_S__
 
 #include <arch.h>
 
@@ -204,3 +206,5 @@ wait_for_entrypoint:
                        _mov_imm16      \_reg, (\_val), 48
                .endif
        .endm
+
+#endif /* __ASM_MACROS_S__ */

diff --git a/include/common/assert_macros.S b/include/common/assert_macros.S
index 807972f3d52ed1b057b20fa2bf68d4def9499a7c..cb6c78b8af6b3f822a70b84609b1f89a3568373c 100644 (file)
--- a/include/common/assert_macros.S
+++ b/include/common/assert_macros.S
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2014-2015, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -27,6 +27,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+#ifndef __ASSERT_MACROS_S__
+#define __ASSERT_MACROS_S__
 
        /*
         * Assembler macro to enable asm_assert. Use this macro wherever
@@ -47,3 +49,5 @@
        mov     x1, __LINE__ ;\
        b       asm_assert ;\
 300:
+
+#endif /* __ASSERT_MACROS_S__ */

diff --git a/include/lib/cpus/aarch64/cpu_macros.S b/include/lib/cpus/aarch64/cpu_macros.S
index 089f09c466f7e93fac46435d9a8005c86a20a6cd..72c35fb6262a43b27e0af1d450384c5d65f451f8 100644 (file)
--- a/include/lib/cpus/aarch64/cpu_macros.S
+++ b/include/lib/cpus/aarch64/cpu_macros.S
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2014-2015, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -27,6 +27,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+#ifndef __CPU_MACROS_S__
+#define __CPU_MACROS_S__
 
 #include <arch.h>
 
@@ -80,3 +82,5 @@ CPU_OPS_SIZE = .
        .quad \_name\()_cpu_reg_dump
 #endif
        .endm
+
+#endif /* __CPU_MACROS_S__ */

diff --git a/plat/fvp/include/plat_macros.S b/plat/fvp/include/plat_macros.S
index 9e5ef4d56eb1e79e47bc7da84461867da98d80c1..6349c119f3644452e4915371dd8d213120329671 100644 (file)
--- a/plat/fvp/include/plat_macros.S
+++ b/plat/fvp/include/plat_macros.S
@@ -27,6 +27,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+#ifndef __PLAT_MACROS_S__
+#define __PLAT_MACROS_S__
+
 #include <cci.h>
 #include <gic_v2.h>
 #include <plat_config.h>
@@ -117,3 +120,5 @@ cci_iface_regs:
        /* Store to the crash buf and print to console */
        bl      str_in_crash_buf_print
        .endm
+
+#endif /* __PLAT_MACROS_S__ */

diff --git a/plat/juno/include/plat_macros.S b/plat/juno/include/plat_macros.S
index ac1077b201065afc10bc35e5ac55bb2e3b332204..96b672ad2df264fc2e1880d01d35af111492f4fd 100644 (file)
--- a/plat/juno/include/plat_macros.S
+++ b/plat/juno/include/plat_macros.S
@@ -27,6 +27,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+#ifndef __PLAT_MACROS_S__
+#define __PLAT_MACROS_S__
 
 #include <cci.h>
 #include <gic_v2.h>
@@ -107,3 +109,6 @@ cci_iface_regs:
        /* Store to the crash buf and print to console */
        bl      str_in_crash_buf_print
        .endm
+
+
+#endif /* __PLAT_MACROS_S__ */