diff options
| -rw-r--r-- | include/common/asm_macros.S | 6 | ||||
| -rw-r--r-- | include/common/assert_macros.S | 6 | ||||
| -rw-r--r-- | include/lib/cpus/aarch64/cpu_macros.S | 6 | ||||
| -rw-r--r-- | plat/fvp/include/plat_macros.S | 5 | ||||
| -rw-r--r-- | plat/juno/include/plat_macros.S | 5 |
5 files changed, 25 insertions, 3 deletions
diff --git a/include/common/asm_macros.S b/include/common/asm_macros.S index 4dcb5f0..f9e7823 100644 --- 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 807972f..cb6c78b 100644 --- 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 089f09c..72c35fb 100644 --- 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 9e5ef4d..6349c11 100644 --- 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 ac1077b..96b672a 100644 --- 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__ */ |