TX6 Release 2013-04-22

[karo-tx-uboot.git] / arch / arm / cpu / armv7 / omap-common / lowlevel_init.S

diff --git a/arch/arm/cpu/armv7/omap-common/lowlevel_init.S b/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
index 358107776d54337a898f383eb5c68d00acf9f992..fb99cea72230b24bd5d07ee4b44613a416cebf1b 100644 (file)
--- a/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
+++ b/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
@@ -39,7 +39,7 @@ ENTRY(save_boot_params)
         */
        ldr     r2, =NON_SECURE_SRAM_START
        cmp     r2, r0
-       bgt     1f
+       bge     1f
        ldr     r2, =NON_SECURE_SRAM_END
        cmp     r2, r0
        blt     1f
@@ -54,10 +54,9 @@ ENTRY(save_boot_params)
        str     r0, [r1]
 #ifdef CONFIG_SPL_BUILD
        /* Store the boot device in spl_boot_device */
-       ldrb    r2, [r0, #BOOT_DEVICE_OFFSET]   @ r1 <- value of boot device
+       ldrb    r2, [r0, #BOOT_DEVICE_OFFSET]   @ r2 <- value of boot device
        and     r2, #BOOT_DEVICE_MASK
-       ldr     r3, =boot_params
-       strb    r2, [r3, #BOOT_DEVICE_OFFSET]   @ spl_boot_device <- r1
+       strb    r2, [r1, #BOOT_DEVICE_OFFSET]   @ spl_boot_device <- r2
 
        /* boot mode is passed only for devices that can raw/fat mode */
        cmp     r2, #BOOT_DEVICE_XIP
@@ -70,11 +69,10 @@ ENTRY(save_boot_params)
        ldr     r2, [r2, #BOOT_MODE_OFFSET]     @ get the boot mode
        ldr     r3, =omap_bootmode
        str     r2, [r3]
-#endif
 2:
+#endif
        ldrb    r2, [r0, #CH_FLAGS_OFFSET]
-       ldr     r3, =boot_params
-       strb    r2, [r3, #CH_FLAGS_OFFSET]
+       strb    r2, [r1, #CH_FLAGS_OFFSET]
 1:
        bx      lr
 ENDPROC(save_boot_params)
@@ -83,6 +81,7 @@ ENTRY(set_pl310_ctrl_reg)
        PUSH    {r4-r11, lr}    @ save registers - ROM code may pollute
                                @ our registers
        LDR     r12, =0x102     @ Set PL310 control register - value in R0
+       smc     #0
        .word   0xe1600070      @ SMC #0 - hand assembled because -march=armv5
                                @ call ROM Code API to set control register
        POP     {r4-r11, pc}