From: Kyungmin Park <kyungmin.park@samsung.com>
Date: Thu, 17 Dec 2009 11:56:28 +0000 (+0900)
Subject: s5pc110: aquila: env code cleanup
X-Git-Tag: CES1223_2~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fb2b757b7cecb440b11b60c453166977126d5267;p=kernel%2Fu-boot.git

s5pc110: aquila: env code cleanup

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..686df00 100644
--- a/board/samsung/universal/universal.c
+++ b/board/samsung/universal/universal.c
@@ -23,7 +23,6 @@
  */
 
 #include <common.h>
-#include <lcd.h>
 #include <i2c.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
@@ -1596,10 +1595,10 @@ int misc_init_r(void)
 	if (board_is_limo_real() ||
 		board_is_limo_universal() ||
 		board_is_j1b2())
-		setenv("lcd", "lcd=s6e63m0");
+		setenv("lcdinfo", "lcd=s6e63m0");
 	/* it can't classify tl2796 with single-lcd and dual-lcd.
 	else
-		setenv("lcd", "lcd=tl2796-dual");
+		setenv("lcdinfo", "lcd=tl2796-dual");
 	*/
 
 	/* 
@@ -1608,10 +1607,10 @@ int misc_init_r(void)
 	 * setenv means that lcd panel has been turned on at u-boot.
 	 */
 	if (machine_is_geminus())
-		setenv("lcd", "lcd=lms480jc01");
+		setenv("lcdinfo", "lcd=lms480jc01");
 	/*
 	if (board_is_p2_real())
-		setenv("lcd", "lcd=ams701");
+		setenv("lcdinfo", "lcd=ams701");
 	*/
 #endif
 	show_hw_revision();
diff --git a/include/configs/s5pc1xx_universal.h b/include/configs/s5pc1xx_universal.h
index 6af400f..418f419 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
 
@@ -182,9 +182,9 @@
 	" bootm 0x30007FC0\0" \
 	"flashboot=set bootargs root=/dev/mtdblock${bootblock}" \
 	 " rootfstype=${rootfstype}" \
-	 " ubi.mtd=${ubiblock} ${opts} ${lcd} " CONFIG_COMMON_BOOT "; run bootk\0" \
+	 " ubi.mtd=${ubiblock} ${opts} ${lcdinfo} " CONFIG_COMMON_BOOT "; run bootk\0" \
 	"ubifsboot=set bootargs root=ubi0!rootfs rootfstype=ubifs" \
-	 " ubi.mtd=${ubiblock} ${opts} ${lcd} " CONFIG_COMMON_BOOT "; run bootk\0" \
+	 " ubi.mtd=${ubiblock} ${opts} ${lcdinfo} " CONFIG_COMMON_BOOT "; run bootk\0" \
 	"boottrace=setenv opts initcall_debug; run bootcmd\0" \
 	"android=set bootargs root=ubi0!ramdisk ubi.mtd=${ubiblock}" \
 	 " rootfstype=ubifs init=/init.sh " CONFIG_COMMON_BOOT "; run bootk\0" \
@@ -194,10 +194,10 @@
 	"ramboot=set bootargs " CONFIG_RAMDISK_BOOT \
 	 " initrd=0x33000000,8M ramdisk=8192\0" \
 	"mmcboot=set bootargs root=${mmcblk} rootfstype=${rootfstype}" \
-	 " ubi.mtd=${ubiblock} ${opts} ${lcd} " CONFIG_COMMON_BOOT "; run bootk\0" \
+	 " ubi.mtd=${ubiblock} ${opts} ${lcdinfo} " CONFIG_COMMON_BOOT "; run bootk\0" \
 	"verify=n\0" \
 	"rootfstype=cramfs\0" \
-	"mtdparts=" MTDPARTS_DEFAULT "\0" \
+	"mtdparts=" MTDPARTS_DEFAULT \
 	"meminfo=mem=80M mem=128M@0x40000000\0" \
 	"nfsroot=/nfsroot/arm\0" \
 	"mmcblk=/dev/mmcblk1p1\0" \