From: Ye.Li <Ye.Li@freescale.com>
Date: Mon, 1 Sep 2014 02:33:47 +0000 (+0800)
Subject: iMX6: Change mmcroot to use fixed mmc block index for USDHC
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=2d5987e950ee10f927f666a588d3fcb76737c38f;p=bsp%2Fu-boot.git

iMX6: Change mmcroot to use fixed mmc block index for USDHC

Kernel changed to use fixed mmcblk index for USDHC, which is
mmcblk0 --> USDHC1
mmcblk1 --> USDHC2
mmcblk2 --> USDHC3
mmcblk3 --> USDHC4
Thus, change the default mmcroot in u-boot to fit the changes in kernel.

Signed-off-by: Ye.Li <Ye.Li@freescale.com>
---

diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index 9f42735571..7ab8057226 100644
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -39,7 +39,7 @@
 	"ip_dyn=yes\0" \
 	"mmcdev=1\0" \
 	"mmcpart=1\0" \
-	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
+	"mmcroot=/dev/mmcblk3p2 rootwait rw\0" \
 	"mmcargs=setenv bootargs console=${console},${baudrate} " \
 		"root=${mmcroot}\0" \
 	"loadbootscript=" \
diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h
index ef7675c688..0249421314 100644
--- a/include/configs/mx6qsabreauto.h
+++ b/include/configs/mx6qsabreauto.h
@@ -12,7 +12,7 @@
 #define CONFIG_MACH_TYPE	3529
 #define CONFIG_MXC_UART_BASE	UART4_BASE
 #define CONSOLE_DEV		"ttymxc3"
-#define CONFIG_MMCROOT			"/dev/mmcblk0p2"
+#define CONFIG_MMCROOT			"/dev/mmcblk2p2"
 
 /* USB Configs */
 #define CONFIG_USB_EHCI
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index 598ab9aa2e..ad518e7f8c 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -16,7 +16,7 @@
 #define CONFIG_MACH_TYPE	3980
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 #define CONSOLE_DEV		"ttymxc0"
-#define CONFIG_MMCROOT			"/dev/mmcblk1p2"
+#define CONFIG_MMCROOT			"/dev/mmcblk2p2"
 
 #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
 
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index a1415f0529..7623d03a1b 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -61,7 +61,7 @@
 	"ip_dyn=yes\0" \
 	"mmcdev=1\0" \
 	"mmcpart=1\0" \
-	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
+	"mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
 	"mmcargs=setenv bootargs console=${console},${baudrate} " \
 		"root=${mmcroot}\0" \
 	"loadbootscript=" \
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index aff7a24587..2cbc006acb 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -57,7 +57,7 @@
 	"videomode=video=ctfb:x:800,y:480,depth:24,pclk:29850,le:89,ri:164,up:23,lo:10,hs:10,vs:10,sync:0,vmode:0\0" \
 	"mmcdev=2\0" \
 	"mmcpart=1\0" \
-	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
+	"mmcroot=/dev/mmcblk3p2 rootwait rw\0" \
 	"mmcargs=setenv bootargs console=${console},${baudrate} " \
 		"root=${mmcroot}\0" \
 	"loadbootscript=" \