Revert "s5pc110: Aquila: Fix mtdparts parsing problem"

This reverts commit 3506471e1c1cb6953222a520f2d1480c3fa5bd15.

diff --git a/board/samsung/universal/universal.c b/board/samsung/universal/universal.c
index 4ce4e11..bf152af 100644 (file)
--- a/board/samsung/universal/universal.c
+++ b/board/samsung/universal/universal.c
@@ -1723,10 +1723,12 @@ int dram_init(void)
        count += sprintf(meminfo, "mem=%dM mem=%dM@0x%x",
                        (int)gd->bd->bi_dram[0].size >> 20,
                        size, (unsigned int)gd->bd->bi_dram[1].start);
+#if 0
        if (sz) {
                sprintf(meminfo + count, " mem=%dM@0x%x",
-                       sz, 0x50000000 /* memconfig1 & 0xFF000000 */);
+                       sz, memconfig1 & 0xFF000000);
        }
+#endif
 
        setenv("meminfo", meminfo);
 

diff --git a/include/configs/s5pc1xx_universal.h b/include/configs/s5pc1xx_universal.h
index f4d5fa3..6af400f 100644 (file)
--- a/include/configs/s5pc1xx_universal.h
+++ b/include/configs/s5pc1xx_universal.h
@@ -142,7 +142,7 @@
                                ",18m(modem)"\
                                ",7m(fota)"\
                                ",9m(log)"\
-                               ",-(UBI)\0"
+                               ",-(UBI)"
 
 #define MTDPARTS_DEFAULT_4KB   "mtdparts=samsung-onenand:256k(bootloader)"\
                                ",256k(params)"\
@@ -150,7 +150,7 @@
                                ",18m(modem)"\
                                ",7m(fota)"\
                                ",9m(log)"\
-                               ",-(UBI)\0"
+                               ",-(UBI)"
 
 #define NORMAL_MTDPARTS_DEFAULT MTDPARTS_DEFAULT