Message ID | 20190507121854.18575-12-miquel.raynal@bootlin.com |
---|---|
State | Accepted |
Commit | 6d09581f780644df62f594118156abc638152c15 |
Delegated to: | Tom Rini |
Headers | show |
Series | Enable returning back to BootROM from spear SPL | expand |
On 07.05.19 14:18, Miquel Raynal wrote: > The _main call is not supposed to return at all: don't link the > branch. > > Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Reviewed-by: Stefan Roese <sr@denx.de> Thanks, Stefan
On Tue, May 07, 2019 at 02:18:53PM +0200, Miquel Raynal wrote: > The _main call is not supposed to return at all: don't link the > branch. > > Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> > Reviewed-by: Stefan Roese <sr@denx.de> Applied to u-boot/master, thanks!
diff --git a/arch/arm/cpu/arm926ejs/spear/start.S b/arch/arm/cpu/arm926ejs/spear/start.S index 2cf854eb74..9ac96291b7 100644 --- a/arch/arm/cpu/arm926ejs/spear/start.S +++ b/arch/arm/cpu/arm926ejs/spear/start.S @@ -57,8 +57,9 @@ reset: /* * Go setup Memory and board specific bits prior to relocation. + * This call is not supposed to return. */ - bl _main /* _main will call board_init_f */ + b _main /* _main will call board_init_f */ back_to_bootrom: pop {r0-r12,pc}
The _main call is not supposed to return at all: don't link the branch. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> --- arch/arm/cpu/arm926ejs/spear/start.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)