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 087aebb84b6b5aa69364041951305e81dcb6c4a1..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)
@@ -52,17 +53,17 @@ ENTRY(save_boot_params)
        ldr     r1, =boot_params
        str     r0, [r1]
 #ifdef CONFIG_SPL_BUILD
-       /* Store the boot device in omap_boot_device */
+       /* Store the boot device in spl_boot_device */
        ldrb    r2, [r0, #BOOT_DEVICE_OFFSET]   @ r2 <- value of boot device
        and     r2, #BOOT_DEVICE_MASK
-       strb    r2, [r1, #BOOT_DEVICE_OFFSET]   @ omap_boot_device <- r2
+       strb    r2, [r1, #BOOT_DEVICE_OFFSET]   @ spl_boot_device <- r2
 
-       /* boot mode is passed only for devices that can do raw/fat mode */
-       cmp     r2, #2
+       /* boot mode is passed only for devices that can raw/fat mode */
+       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_boot_mode */
+       /* Store the boot mode (raw/FAT) in omap_bootmode */
        ldr     r2, [r0, #DEV_DESC_PTR_OFFSET]  @ get the device descriptor ptr
        ldr     r2, [r2, #DEV_DATA_PTR_OFFSET]  @ get the pDeviceData ptr
        ldr     r2, [r2, #BOOT_MODE_OFFSET]     @ get the boot mode
@@ -76,28 +77,11 @@ ENTRY(save_boot_params)
        bx      lr
 ENDPROC(save_boot_params)
 
-ENTRY(lowlevel_init)
-       /*
-        * Setup a temporary stack
-        */
-       ldr     sp, =LOW_LEVEL_SRAM_STACK
-
-       /*
-        * Save the old lr(passed in ip) and the current lr to stack
-        */
-       push    {ip, lr}
-
-       /*
-        * go setup pll, mux, memory
-        */
-       bl      s_init
-       pop     {ip, pc}
-ENDPROC(lowlevel_init)
-
 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}