Add forgotten new fils from latest VoiceBlue update

[u-boot] / board / omap1510inn / platform.S

diff --git a/board/omap1510inn/platform.S b/board/omap1510inn/platform.S
index a1602d14c669a5655d50610f06ad1223731293b9..8045e84b2dd84d28f7a3bc5012f1773eadd65b76 100644 (file)
--- a/board/omap1510inn/platform.S
+++ b/board/omap1510inn/platform.S
@@ -84,6 +84,9 @@ platformsetup:
        ldr     r0, REG_FUNC_MUX_CTRL_C
        ldr     r1, VAL_FUNC_MUX_CTRL_C
        str     r1, [r0]
+       ldr     r0, REG_FUNC_MUX_CTRL_D
+       ldr     r1, VAL_FUNC_MUX_CTRL_D
+       str     r1, [r0]
        ldr     r0, REG_VOLTAGE_CTRL_0
        ldr     r1, VAL_VOLTAGE_CTRL_0
        str     r1, [r0]
@@ -156,8 +159,15 @@ lock_end:
         */
        mov r0, #0x10000000                 /* Load physical SDRAM base. */
        mov r1, pc                          /* Get current execution location. */
-       cmp r1, r0                          /* Compare. */
-       bge skip_sdram                      /* Skip over EMIF-fast initialization if running from SDRAM. */
+       /* Zero all but top 6 bits of PC, as they alone detect whether an
+        * address is in the range 0x1000:0000-0x13ff:ffff, the 64M sized
+        * valid range for SDRAM on the OMAP 1510/5910.
+        */
+       and r1, r1, #0xfc000000
+       cmp r1, r0                      /* Compare. */
+       beq skip_sdram                  /* Skip over EMIF-fast initialization
+                                        * if running from SDRAM.
+                                        */
 
        /*
         * Delay for SDRAM initialization.
@@ -352,9 +362,9 @@ VAL_PULL_DWN_CTRL_0:
 VAL_PULL_DWN_CTRL_1:
        .word 0x2e047fff
 VAL_PULL_DWN_CTRL_2:
-       .word 0xffd7d3e6
+       .word 0xffd603a6
 VAL_PULL_DWN_CTRL_3:
-       .word 0x00003f03
+       .word 0x00003e03
 VAL_VOLTAGE_CTRL_0:
        .word 0x00000007
 VAL_TEST_DBG_CTRL_0: