Skip to contentSkip to conversation

arm: armada-xp: Fix SPL for AXP by using save_boot_params_ret

PATCH New Stefan Roese 2 participants 2 messages Mar 11, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

Cc Simon Glass <[email protected]>
Cc Luka Perkov <[email protected]>
---
 arch/arm/cpu/armv7/armada-xp/lowlevel_spl.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/cpu/armv7/armada-xp/lowlevel_spl.S +1 -1
index 1febd7b..6c5e544 100644
@@ -7,7 +7,7 @@
 #include <linux/linkage.h>
 
 ENTRY(save_boot_params)
-	bx	lr
+	b	save_boot_params_ret
 ENDPROC(save_boot_params)
 
 /*
Signature · 1 line
2.3.2
Applied
#1 lore raw

PATCH 1/1 arm: armada-xp: Fix SPL for AXP by using save_boot_params_ret

Hi Stefan,

Quoted 11 lines · Stefan Roese

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.

Cc Simon Glass <[email protected]>
Cc Luka Perkov <[email protected]>
---
 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