Patchwork [U-Boot] arm: armv7: omap3: Fix restore sequence in lowlevel_init

login
register
mail settings
Submitter Albert ARIBAUD
Date Oct. 7, 2012, 6:40 p.m.
Message ID <1349635240-22759-1-git-send-email-albert.u.boot@aribaud.net>
Download mbox | patch
Permalink /patch/189859/
State Superseded
Headers show

Comments

Albert ARIBAUD - Oct. 7, 2012, 6:40 p.m.
The restore sequence in lowlevel_init was in the wrong order,
causing lr to lose its original value and be set equal to ip
instead.

Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
---
 arch/arm/cpu/armv7/omap3/lowlevel_init.S |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/arch/arm/cpu/armv7/omap3/lowlevel_init.S b/arch/arm/cpu/armv7/omap3/lowlevel_init.S
index ebf69fa..7dde7c3 100644
--- a/arch/arm/cpu/armv7/omap3/lowlevel_init.S
+++ b/arch/arm/cpu/armv7/omap3/lowlevel_init.S
@@ -225,8 +225,8 @@  ENTRY(lowlevel_init)
 	bl	cpy_clk_code
 #endif /* NAND Boot */
 	bl	s_init		/* go setup pll, mux, memory */
-	ldr	ip, [sp]	/* restore save ip */
 	mov	lr, ip		/* restore link reg */
+	ldr	ip, [sp]	/* restore save ip */
 
 	/* back to arch calling code */
 	mov	pc, lr