armv7: Move save_boot_params_default() to start.S
PATCH 1/1 armv7: Move save_boot_params_default() to start.S
save_boot_params() is called by start.S, so move its default implementation to this file too. This is also useful for boards willing to use nand_spl since cpu.c is not built in this case.
--- .../arch/arm/cpu/armv7/cpu.c | 7 ------- .../arch/arm/cpu/armv7/start.S | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-)
arch/arm/cpu/armv7/cpu.c +0 -7
@@ -37,13 +37,6 @@#include <asm/cache.h> #include <asm/armv7.h> -void save_boot_params_default (u32 r0,u32 r1,u32 r2,u32 r3) -{ -} - -void save_boot_params (u32 r0,u32 r1,u32 r2,u32 r3) - __attribute__((weak,alias ("save_boot_params_default" ))); -int cleanup_before_linux (void ) {/*
arch/arm/cpu/armv7/start.S +7 -0
@@ -119,6 +119,13 @@ FIQ_STACK_START: IRQ_STACK_START_IN: .word 0x0badc0de +.globl save_boot_params_default +save_boot_params_default: + mov pc, lr + +.weak save_boot_params +save_boot_params = save_boot_params_default + /* * the actual reset code */
PATCH 1/1 armv7: Move save_boot_params_default() to start.S
Quoted 6 lines · Beno??t Th??baudeau
save_boot_params()is called bystart.S, so move its default implementation to this file too. This is also useful for boards willing to usenand_splsincecpu.cis not built in this case.Signed-off-by Beno??t Th??baudeau <[email protected]>Cc Albert Aribaud <[email protected]>
We should pick up http://patchwork.ozlabs.org/patch/169561/ instead as yours is missing START/ENDPROC and doesn't just declare the initial implementation weak.
Signature · 1 line
Tom
PATCH 1/1 armv7: Move save_boot_params_default() to start.S
Quoted 8 lines · Tom Rini
Quoted 6 lines · Beno?t Th?baudeau
save_boot_params()is called bystart.S, so move its default implementation to
this file too. This is also useful for boards willing to usenand_splsincecpu.cis not built in this case.
Quoted 6 lines
Quoted 2 lines
Signed-off-by Beno?t Th?baudeau <[email protected]>Cc Albert Aribaud <[email protected]>We should pick up http://patchwork.ozlabs.org/patch/169561/ instead as
yours is missing START/ENDPROC
Yes.
Quoted 2 lines
and doesn't just declare the initial
implementation weak.
What do you mean? It does:
+.weak save_boot_params
One version or the other, I don't care as long as one of them is applied. Why has Tetsuyuki's patch still not been applied? You've ack'ed it on 7/9.
Best regards,
Beno?t
PATCH 1/1 armv7: Move save_boot_params_default() to start.S
Quoted 16 lines · Beno?t Th?baudeau
Quoted 8 lines · Tom Rini
Quoted 6 lines · Beno?t Th?baudeau
save_boot_params()is called bystart.S, so move its default implementation to
this file too. This is also useful for boards willing to usenand_splsincecpu.cis not built in this case.Quoted 6 lines
Quoted 2 lines
Signed-off-by Beno?t Th?baudeau <[email protected]>Cc Albert Aribaud <[email protected]>We should pick up http://patchwork.ozlabs.org/patch/169561/ instead as
yours is missing START/ENDPROC
Quoted 7 lines
Yes.
Quoted 2 lines
and doesn't just declare the initial
implementation weak.What do you mean? It does:
+.weaksave_boot_params
Yes, but you add save_boot_params_default and alias it. That's extra work we don't need :)
Quoted 2 lines
One version or the other, I don't care as long as one of them is applied. Why has Tetsuyuki's patch still not been applied? You've ack'ed it on 7/9.
Bad timing around the v2012.07 release. If Albert doesn't pick it up next time he goes around I'll add it to a staging tree and send a request.
Signature · 1 line
Tom