From: Stefan Roese <sr@denx.de>
Date: Wed, 11 Mar 2015 11:05:04 +0000 (+0100)
Subject: arm: armada-xp: Fix SPL for AXP by using save_boot_params_ret
X-Git-Tag: v2015.04~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4adb46a3144248b2d8b8a68684bee648815c4ada;p=oweals%2Fu-boot.git

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>
---

diff --git a/arch/arm/cpu/armv7/armada-xp/lowlevel_spl.S b/arch/arm/cpu/armv7/armada-xp/lowlevel_spl.S
index f4a701204b..69da7fe7af 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)
 
 /*