[U-Boot,v3,10/26] ARM: boot0 hook: remove macro, include whole header file

For prepending some board specific header area to U-Boot images we
were so far including a header file with a macro definition containing
the actual header specification.
This works fine if there are just a few statements and if there is only
one alternative.
However adding more complex code quickly gets messy with this approach,
so let's just drop that intermediate macro and let the #include actually
insert the code directly.
This converts the callers and the callees, but doesn't change anything
at this point.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
 arch/arm/cpu/armv8/start.S                 | 1 -
 arch/arm/include/asm/arch-bcm235xx/boot0.h | 8 +-------
 arch/arm/include/asm/arch-bcm281xx/boot0.h | 8 +-------
 arch/arm/include/asm/arch-sunxi/boot0.h    | 8 +-------
 arch/arm/lib/vectors.S                     | 1 -
 5 files changed, 3 insertions(+), 23 deletions(-)

Hi Andre,

On Sun, Dec 18, 2016 at 5:50 PM, Andre Przywara <andre.przywara@arm.com> wrote:
> For prepending some board specific header area to U-Boot images we
> were so far including a header file with a macro definition containing
> the actual header specification.
> This works fine if there are just a few statements and if there is only
> one alternative.
> However adding more complex code quickly gets messy with this approach,
> so let's just drop that intermediate macro and let the #include actually
> insert the code directly.
> This converts the callers and the callees, but doesn't change anything
> at this point.
>
> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> ---
>  arch/arm/cpu/armv8/start.S                 | 1 -
>  arch/arm/include/asm/arch-bcm235xx/boot0.h | 8 +-------
>  arch/arm/include/asm/arch-bcm281xx/boot0.h | 8 +-------
>  arch/arm/include/asm/arch-sunxi/boot0.h    | 8 +-------
>  arch/arm/lib/vectors.S                     | 1 -
>  5 files changed, 3 insertions(+), 23 deletions(-)
>
> diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S
> index ee393d7..140609d 100644
> --- a/arch/arm/cpu/armv8/start.S
> +++ b/arch/arm/cpu/armv8/start.S
> @@ -26,7 +26,6 @@ _start:
>   * use it here.
>   */
>  #include <asm/arch/boot0.h>
> -ARM_SOC_BOOT0_HOOK
>  #else
>         b       reset
>  #endif
> diff --git a/arch/arm/include/asm/arch-bcm235xx/boot0.h b/arch/arm/include/asm/arch-bcm235xx/boot0.h
> index 7e72882..9ff90b8 100644
> --- a/arch/arm/include/asm/arch-bcm235xx/boot0.h
> +++ b/arch/arm/include/asm/arch-bcm235xx/boot0.h
> @@ -4,12 +4,6 @@
>   * SPDX-License-Identifier:    GPL-2.0+
>   */
>
> -#ifndef __BOOT0_H
> -#define __BOOT0_H
> -
>  /* BOOT0 header information */
> -#define ARM_SOC_BOOT0_HOOK     \
> -       .word   0xbabeface;     \
> +       .word   0xbabeface;
this trailing semi-colon is not necessary

>         .word   _end - _start
> -
> -#endif /* __BOOT0_H */
> diff --git a/arch/arm/include/asm/arch-bcm281xx/boot0.h b/arch/arm/include/asm/arch-bcm281xx/boot0.h
> index 7e72882..9ff90b8 100644
> --- a/arch/arm/include/asm/arch-bcm281xx/boot0.h
> +++ b/arch/arm/include/asm/arch-bcm281xx/boot0.h
> @@ -4,12 +4,6 @@
>   * SPDX-License-Identifier:    GPL-2.0+
>   */
>
> -#ifndef __BOOT0_H
> -#define __BOOT0_H
> -
>  /* BOOT0 header information */
> -#define ARM_SOC_BOOT0_HOOK     \
> -       .word   0xbabeface;     \
> +       .word   0xbabeface;
this trailing semi-colon is not necessary

>         .word   _end - _start
> -
> -#endif /* __BOOT0_H */
> diff --git a/arch/arm/include/asm/arch-sunxi/boot0.h b/arch/arm/include/asm/arch-sunxi/boot0.h
> index 6f28d63..6a13db5 100644
> --- a/arch/arm/include/asm/arch-sunxi/boot0.h
> +++ b/arch/arm/include/asm/arch-sunxi/boot0.h
> @@ -4,12 +4,6 @@
>   * SPDX-License-Identifier:    GPL-2.0+
>   */
>
> -#ifndef __BOOT0_H
> -#define __BOOT0_H
> -
>  /* reserve space for BOOT0 header information */
> -#define ARM_SOC_BOOT0_HOOK     \
> -       b       reset;          \
> +       b       reset
>         .space  1532
> -
> -#endif /* __BOOT0_H */
> diff --git a/arch/arm/lib/vectors.S b/arch/arm/lib/vectors.S
> index 5cc132b..9fe7415 100644
> --- a/arch/arm/lib/vectors.S
> +++ b/arch/arm/lib/vectors.S
> @@ -67,7 +67,6 @@ _start:
>   * use it here.
>   */
>  #include <asm/arch/boot0.h>
> -ARM_SOC_BOOT0_HOOK
>  #endif
>
>  /*
> --
> 2.8.2
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot

Tested-by: Steve Rae <steve.rae@raedomain.com>

Thanks, Steve