From: Kyungmin Park <kyungmin.park@samsung.com>
Date: Thu, 17 Dec 2009 11:21:48 +0000 (+0900)
Subject: s5pc110: Aquila: Fix mtdparts parsing problem
X-Git-Tag: CES1223_2~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3506471e1c1cb6953222a520f2d1480c3fa5bd15;p=kernel%2Fu-boot.git

s5pc110: Aquila: Fix mtdparts parsing problem

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

diff --git a/board/samsung/universal/universal.c b/board/samsung/universal/universal.c
index bf152af..4ce4e11 100644
--- a/board/samsung/universal/universal.c
+++ b/board/samsung/universal/universal.c
@@ -1723,12 +1723,10 @@ 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, memconfig1 & 0xFF000000);
+			sz, 0x50000000 /* memconfig1 & 0xFF000000 */);
 	}
-#endif
 
 	setenv("meminfo", meminfo);
 
diff --git a/include/configs/s5pc1xx_universal.h b/include/configs/s5pc1xx_universal.h
index 6af400f..f4d5fa3 100644
--- a/include/configs/s5pc1xx_universal.h
+++ b/include/configs/s5pc1xx_universal.h
@@ -142,7 +142,7 @@
 				",18m(modem)"\
 				",7m(fota)"\
 				",9m(log)"\
-				",-(UBI)"
+				",-(UBI)\0"
 
 #define MTDPARTS_DEFAULT_4KB	"mtdparts=samsung-onenand:256k(bootloader)"\
 				",256k(params)"\
@@ -150,7 +150,7 @@
 				",18m(modem)"\
 				",7m(fota)"\
 				",9m(log)"\
-				",-(UBI)"
+				",-(UBI)\0"
 
 #define NORMAL_MTDPARTS_DEFAULT MTDPARTS_DEFAULT