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 eb89031317112fe79a588e9e30e6cbb9b5d3597f..0c97155c4f71dded4599aa9350486268cf80b485 100644 (file)
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -41,7 +41,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 200e46836aa716306687911bf91deff6438f77ab..e53a482fbb879cd815518cb036f0c8b54840a1a1 100644 (file)
--- 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 CONFIG_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 25f51bebff4b8e262b2ce5d2ece89156d8c0e04b..97ef2a88519a91973cc970d45dc6493b6007c2aa 100644 (file)
--- 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/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 86b75b4557c75d8df479202e7de1bedec907b7d6..7731df02aecf961239796451fb8130657f921883 100644 (file)
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -66,7 +66,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 9281fee5f9ff35d371b4d873b5f014d0a5bb9c76..9700210cb865b8bd21174c9afdbfdb930b7b9974 100644 (file)
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -61,7 +61,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=" \