diff options
| author | Stefan Roese <sr@denx.de> | 2015-03-11 12:05:04 +0100 |
|---|---|---|
| committer | Luka Perkov <luka.perkov@sartura.hr> | 2015-04-11 11:49:00 +0200 |
| commit | 4adb46a3144248b2d8b8a68684bee648815c4ada (patch) | |
| tree | e931f6126481a4e31eba86764e92a4dbea801f40 /arch/arm/cpu | |
| parent | c175f306b3f8885965f63ff6c71df5c0f899b4c9 (diff) | |
| download | u-boot-imx-4adb46a3144248b2d8b8a68684bee648815c4ada.zip u-boot-imx-4adb46a3144248b2d8b8a68684bee648815c4ada.tar.gz u-boot-imx-4adb46a3144248b2d8b8a68684bee648815c4ada.tar.bz2 | |
arm: armada-xp: Fix SPL for AXP by using save_boot_params_ret
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>
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/armv7/armada-xp/lowlevel_spl.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/armada-xp/lowlevel_spl.S b/arch/arm/cpu/armv7/armada-xp/lowlevel_spl.S index f4a7012..69da7fe 100644 --- a/arch/arm/cpu/armv7/armada-xp/lowlevel_spl.S +++ b/arch/arm/cpu/armv7/armada-xp/lowlevel_spl.S @@ -6,7 +6,7 @@ #include <linux/linkage.h> ENTRY(save_boot_params) - bx lr + b save_boot_params_ret ENDPROC(save_boot_params) /* |