From: Donghwa Lee <dh09.lee@samsung.com>
Date: Wed, 15 Dec 2010 05:11:21 +0000 (+0900)
Subject: s5pc110: add mmcboot config
X-Git-Tag: v0.2~147
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4de627ab8ef00a0fd5f73b7759b2b844b9d26498;p=kernel%2Fu-boot.git

s5pc110: add mmcboot config
Signed-off-by: Donghwa Lee <dh09.lee@samsung.com>
---

diff --git a/drivers/misc/info_action.c b/drivers/misc/info_action.c
index 49bda15..8a5464e 100644
--- a/drivers/misc/info_action.c
+++ b/drivers/misc/info_action.c
@@ -36,6 +36,7 @@ void info_action_check(void)
 		setenv("bootcmd", buf);
 		setenv("mmcdev", "2");
 		setenv("mmcrootpart", "0");
+		setenv("mmcbootpart", "1");
 		break;
 	case INFO_ACTION_LCD_CONSOLE:
 		printf("lcd console mode\n");
diff --git a/include/configs/s5pc110_universal.h b/include/configs/s5pc110_universal.h
index f493adb..c73694b 100644
--- a/include/configs/s5pc110_universal.h
+++ b/include/configs/s5pc110_universal.h
@@ -291,10 +291,11 @@
 	 "${netmask}:generic:usb0:off " CONFIG_COMMON_BOOT "; run bootk\0" \
 	"ramboot=set bootargs " CONFIG_RAMDISK_BOOT \
 	 " initrd=0x33000000,8M ramdisk=8192\0" \
-	"mmcboot=set bootargs root=${mmcblk} rootfstype=${rootfstype}" \
+	"mmcboot=set bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} " \
+		"rootwait ${console} ${meminfo} ${opts} ${lcdinfo}; " \
+		"run loaduimage; bootm 0x30007FC0\0" \
 	 CONFIG_UBI_MTD " ${opts} ${lcdinfo} " CONFIG_COMMON_BOOT "; run bootk\0" \
 	"bootchart=set opts init=/sbin/bootchartd; run bootcmd\0" \
-	"sdboot=set bootargs root=/dev/mmcblk1p2 rootwait " CONFIG_COMMON_BOOT \
 	CONFIG_UBI_MTD "; bootm 0x30007FC0\0" \
 	"verify=n\0" \
 	"rootfstype=cramfs\0" \
@@ -306,7 +307,8 @@
 	"bootblock=" CONFIG_BOOTBLOCK "\0" \
 	"ubiblock=" CONFIG_UBIBLOCK" \0" \
 	"ubi=enabled\0" \
-	"loaduimage=fatload mmc 1 0x30007FC0 uImage\0" \
+	"loaduimage=fatload mmc ${mmcdev}:${mmcbootpart} 0x30007FC0 uImage\0" \
+	"mmcbootpart=2\0" \
 	"opts=always_resume=1"
 
 /*