| Message ID | 1426071904-10159-1-git-send-email-sr@denx.de |
|---|---|
| State | Accepted |
| Delegated to: | Stefan Roese |
| Headers | show |
Hi Stefan, On Wed, Mar 11, 2015 at 12:05:04PM +0100, Stefan Roese wrote: > Patch e11c6c27 (arm: Allow lr to be saved by board code) introduced > a different method to return from save_boot_params(). The SPL support > for AXP has been pulled and changing to this new method is now > required for SPL to work correctly. > > Signed-off-by: Stefan Roese <sr@denx.de> > Cc: Simon Glass <sjg@chromium.org> > Cc: Luka Perkov <luka.perkov@sartura.hr> > --- > arch/arm/cpu/armv7/armada-xp/lowlevel_spl.S | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to marvell's master branch. Thank you. Luka
diff --git a/arch/arm/cpu/armv7/armada-xp/lowlevel_spl.S b/arch/arm/cpu/armv7/armada-xp/lowlevel_spl.S index 1febd7b..6c5e544 100644 --- a/arch/arm/cpu/armv7/armada-xp/lowlevel_spl.S +++ b/arch/arm/cpu/armv7/armada-xp/lowlevel_spl.S @@ -7,7 +7,7 @@ #include <linux/linkage.h> ENTRY(save_boot_params) - bx lr + b save_boot_params_ret ENDPROC(save_boot_params) /*
Patch e11c6c27 (arm: Allow lr to be saved by board code) introduced a different method to return from save_boot_params(). The SPL support for AXP has been pulled and changing to this new method is now required for SPL to work correctly. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Luka Perkov <luka.perkov@sartura.hr> --- arch/arm/cpu/armv7/armada-xp/lowlevel_spl.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)