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 5412dd3c51dc958e39333f06ac29eab291d072ef..4bad4f52ab658d4c942883c0c972da24ee3872e4 100644 (file)
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -83,7 +83,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 51042ca72e54b7b8e2e1084ac2e96ed9da9615ff..1f5dc1b0333c8f45515776e6ce5a5626dd94d658 100644 (file)
--- 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 a035907fec378d3e682a928ebd92e182ba3ccc19..fe71321764c3fe0eb5621427d2b217119cf3467c 100644 (file)
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -21,7 +21,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 9f5bd858ac88fd37729fd8b89a0a387990e60dd9..24a06908dcbbeed53732ff9aea258c4b4b8ba80e 100644 (file)
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -101,7 +101,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 a29d62f023a0ecd9ba4f4de9a1dc8b6a85058fc1..a1fd5daa3548c2fdce41a59f71747361a26c0ed6 100644 (file)
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -66,7 +66,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=" \