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 9766563d02d66565e552660ff697fb8e7101cf11..fb99cea72230b24bd5d07ee4b44613a416cebf1b 100644 (file)
--- a/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
+++ b/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
@@ -27,6 +27,7 @@
  */
 
 #include <asm/arch/omap.h>
+#include <asm/arch/spl.h>
 #include <linux/linkage.h>
 
 ENTRY(save_boot_params)
@@ -38,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
@@ -53,15 +54,14 @@ 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, #2
+       cmp     r2, #BOOT_DEVICE_XIP
        blt     2f
-       cmp     r2, #7
+       cmp     r2, #BOOT_DEVICE_MMC2
        bgt     2f
        /* Store the boot mode (raw/FAT) in omap_bootmode */
        ldr     r2, [r0, #DEV_DESC_PTR_OFFSET]  @ get the device descriptor ptr
@@ -69,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)
@@ -82,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}