LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
Tested-by: Steve Rae <steve.rae@raedomain.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>
This commit is contained in:
Andre Przywara 2017-01-02 11:48:34 +00:00 committed by Jagan Teki
parent a5168a5900
commit ce62e57fc5
5 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/cpu/armv8/start.S
View File

@ -26,7 +26,6 @@ _start:
* use it here. * use it here.
*/ */
#include <asm/arch/boot0.h> #include <asm/arch/boot0.h>
ARM_SOC_BOOT0_HOOK
#else #else
b reset b reset
#endif #endif

8
arch/arm/include/asm/arch-bcm235xx/boot0.h
View File

@ -4,12 +4,6 @@
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
#ifndef __BOOT0_H
#define __BOOT0_H
/* BOOT0 header information */ /* BOOT0 header information */
#define ARM_SOC_BOOT0_HOOK \ .word 0xbabeface
.word 0xbabeface; \
.word _end - _start .word _end - _start
#endif /* __BOOT0_H */

8
arch/arm/include/asm/arch-bcm281xx/boot0.h
View File

@ -4,12 +4,6 @@
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
#ifndef __BOOT0_H
#define __BOOT0_H
/* BOOT0 header information */ /* BOOT0 header information */
#define ARM_SOC_BOOT0_HOOK \ .word 0xbabeface
.word 0xbabeface; \
.word _end - _start .word _end - _start
#endif /* __BOOT0_H */

8
arch/arm/include/asm/arch-sunxi/boot0.h
View File

@ -4,12 +4,6 @@
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
#ifndef __BOOT0_H
#define __BOOT0_H
/* reserve space for BOOT0 header information */ /* reserve space for BOOT0 header information */
#define ARM_SOC_BOOT0_HOOK \ b reset
b reset; \
.space 1532 .space 1532
#endif /* __BOOT0_H */

1
arch/arm/lib/vectors.S
View File

@ -67,7 +67,6 @@ _start:
* use it here. * use it here.
*/ */
#include <asm/arch/boot0.h> #include <asm/arch/boot0.h>
ARM_SOC_BOOT0_HOOK
#endif #endif
/* /*