From 4adb46a3144248b2d8b8a68684bee648815c4ada Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Wed, 11 Mar 2015 12:05:04 +0100 Subject: [PATCH] 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 Cc: Simon Glass Cc: Luka Perkov --- arch/arm/cpu/armv7/armada-xp/lowlevel_spl.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ENTRY(save_boot_params) - bx lr + b save_boot_params_ret ENDPROC(save_boot_params) /* -- 2.30.2