s5pc110: universal: Wrong operation at s5pc110

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>

diff --git a/board/samsung/universal/lowlevel_init.S b/board/samsung/universal/lowlevel_init.S
index f9f408e..eb67dcb 100644 (file)
--- a/board/samsung/universal/lowlevel_init.S
+++ b/board/samsung/universal/lowlevel_init.S
@@ -73,7 +73,9 @@ lowlevel_init:
 
        ldr     r1, [r0, #S5PC1XX_GPIO_DAT_OFFSET]
 #ifdef CONFIG_ONENAND_IPL
+#if 0
        orr     r1, r1, #(1 << 1)                       @ 1 * 1-bit
+#endif
 #else
        bic     r1, r1, #(1 << 1)
 #endif
@@ -82,10 +84,10 @@ lowlevel_init:
        /* IO retension release */
        ldreq   r0, =S5PC100_OTHERS                     @0xE0108200
        ldrne   r0, =S5PC110_OTHERS                     @0xE010E000
-       ldr     r1, [r0]
-       ldr     r2, =(1 << 31)                          @IO_RET_REL
-       orr     r1, r1, r2
-       str     r1, [r0]
+       ldreq   r1, [r0]
+       ldreq   r2, =(1 << 31)                          @IO_RET_REL
+       orreq   r1, r1, r2
+       streq   r1, [r0]
 
        /* Disable Watchdog */
        cmp     r7, r8

diff --git a/board/samsung/universal/mem_setup.S b/board/samsung/universal/mem_setup.S
index 45c787d..d0418d9 100644 (file)
--- a/board/samsung/universal/mem_setup.S
+++ b/board/samsung/universal/mem_setup.S
@@ -88,7 +88,8 @@ swap_memory:
         * [ 7:4 ] 2: 14 bits
         * [ 3:0 ] 2: 4 banks
         */
-       ldr     r1, =0x20f80222
+       ldreq   r1, =0x20f80222
+       ldrne   r1, =0x20f02222
        /* if r4 is 1, swap the bank */
        cmp     r4, #0x1
        orreq   r1, r1, #0x08000000
@@ -103,7 +104,9 @@ swap_memory:
         * [ 7:4 ] 2: 14 bits
         * [ 3:0 ] 2: 4 banks
         */
-       ldr     r1, =0x28f80222
+       cmp     r7, r8
+       ldreq   r1, =0x28f80222
+       ldrne   r1, =0x28f02222
        /* if r4 is 1, swap the bank */
        cmp     r4, #0x1
        biceq   r1, r1, #0x08000000
@@ -189,6 +192,8 @@ swap_memory:
        ldr     r1, =0xff212100
        str     r1, [r6, #0x004]                        @ S5P_MEMCONTROL
 
+       cmp     r7, r8
+       bne     1f
 
        /* Try to test memory area */
        cmp     r4, #0x1