Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / arch / arm / cpu / arm1176 / start.S

diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S
index 1fc1da071b4cb09fb0b1a87ac2bf387729071309..f20da8eb7bfcc73dd146789465fd7715b75b0af8 100644 (file)
--- a/arch/arm/cpu/arm1176/start.S
+++ b/arch/arm/cpu/arm1176/start.S
@@ -393,9 +393,11 @@ c_runtime_cpu_setup:
        /* save caller lr in position 0 of saved stack */
        str     lr, [r0]
        /* get the spsr */
-       mrs     r0, spsr
+       mrs     lr, spsr
        /* save spsr in position 1 of saved stack */
        str     lr, [r0, #4]
+       /* restore lr */
+       ldr     lr, [r0]
        /* restore r0 */
        ldr     r0, [r13]
        /* pop stack entry */