s5pc100: Change the memory layout

CS0: OneDRAM:    0x3000'0000 ~ 0x34FF'FFFF (80MiB)
CS1: Mobile DDR: 0x3800'0000 ~ 0x3FFF'FFFF (128MiB)

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

diff --git a/board/samsung/universal/mem_setup.S b/board/samsung/universal/mem_setup.S
index cbe5db2..bf9b4bb 100644 (file)
--- a/board/samsung/universal/mem_setup.S
+++ b/board/samsung/universal/mem_setup.S
@@ -76,8 +76,8 @@ mem_ctrl_asm_init:
 
        /*
         * Note:
-        * If Bank0 has OneDRAM we place it at 0x3800'0000 (s5pc100 only)
-        * So finally Bank1 should address start at at 0x3000'0000
+        * If Bank0 has Mobile RAM we place it at 0x3800'0000 (s5pc100 only)
+        * So finally Bank1 OneDRAM should address start at at 0x3000'0000
         */
        mov     r4, #0x0
 
@@ -243,7 +243,7 @@ swap_memory:
        str     r4, [r1]
        ldr     r2, [r1]
        cmp     r2, r4
-       bne     swap_memory
+       beq     swap_memory
 1:
        mov     pc, lr
 

diff --git a/board/samsung/universal/universal.c b/board/samsung/universal/universal.c
index 06ca559..da78c79 100644 (file)
--- a/board/samsung/universal/universal.c
+++ b/board/samsung/universal/universal.c
@@ -229,6 +229,7 @@ static void check_hw_revision(void)
                setenv("meminfo", "mem=80M mem=128M@0x40000000");
                setenv("mtdparts", MTDPARTS_DEFAULT_4KB);
        } else {
+               setenv("meminfo", "mem=80M mem=128M@0x38000000");
                setenv("bootk", "onenand read 0x30007FC0 0x60000 0x300000; bootm 0x30007FC0");
                setenv("updatek", "onenand erase 0x60000 0x300000; onenand write 0x31008000 0x60000 0x300000");
        }

diff --git a/include/configs/s5pc100_universal.h b/include/configs/s5pc100_universal.h
index f465486..cb53942 100644 (file)
--- a/include/configs/s5pc100_universal.h
+++ b/include/configs/s5pc100_universal.h
@@ -190,7 +190,7 @@
        "verify=n\0" \
        "rootfstype=cramfs\0" \
        "mtdparts=" MTDPARTS_DEFAULT "\0" \
-       "meminfo=mem=208M\0" \
+       "meminfo=mem=80M mem=128M@0x40000000\0" \
        "nfsroot=/nfsroot/arm\0" \
        "bootblock=5\0" \
        "ubiblock=4\0" \