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=3e86dfb5fd3aa729d13671f9d6d4117596042d10;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 86a03160dd..49b908f847 100644
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -44,7 +44,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 22603442d7..7c16438a8a 100644
--- a/include/configs/mx6qsabreauto.h
+++ b/include/configs/mx6qsabreauto.h
@@ -17,7 +17,7 @@
 #elif defined CONFIG_MX6DL
 #define CONFIG_DEFAULT_FDT_FILE	"imx6dl-sabreauto.dtb"
 #endif
-#define CONFIG_MMCROOT			"/dev/mmcblk0p2"
+#define CONFIG_MMCROOT			"/dev/mmcblk2p2"
 #define PHYS_SDRAM_SIZE		(2u * 1024 * 1024 * 1024)
 
 /* USB Configs */
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index d4b74cf0e3..89c5daa222 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -18,7 +18,7 @@
 #define CONFIG_MACH_TYPE	3980
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 #define CONFIG_CONSOLE_DEV		"ttymxc0"
-#define CONFIG_MMCROOT			"/dev/mmcblk0p2"
+#define CONFIG_MMCROOT			"/dev/mmcblk2p2"
 #if defined(CONFIG_MX6Q)
 #define CONFIG_DEFAULT_FDT_FILE	"imx6q-sabresd-ldo.dtb"
 #elif defined(CONFIG_MX6DL)
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index 25e53ff033..07d9d8529d 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -63,7 +63,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 848bdcd674..7785888504 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -38,7 +38,7 @@
 	"ip_dyn=yes\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=" \