From f6f5f3a105ee4ca16b58fbae4e375bbcdd4a5bea Mon Sep 17 00:00:00 2001 From: "Ye.Li" Date: Mon, 1 Sep 2014 10:33:47 +0800 Subject: [PATCH] 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 --- include/configs/mx6qarm2.h | 2 +- include/configs/mx6qsabreauto.h | 2 +- include/configs/mx6sabresd.h | 2 +- include/configs/mx6slevk.h | 2 +- include/configs/mx6sxsabresd.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index a564d86663..b3c1fc3456 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -82,7 +82,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 0f77e7f041..23d1537199 100644 --- a/include/configs/mx6qsabreauto.h +++ b/include/configs/mx6qsabreauto.h @@ -15,7 +15,7 @@ #define CONFIG_DEFAULT_FDT_FILE "imx6q-sabreauto.dtb" #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 232495cab6..95c7485f7f 100644 --- 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_SOC_MX6Q) #define CONFIG_DEFAULT_FDT_FILE "imx6q-sabresd-ldo.dtb" #elif defined(CONFIG_SOC_MX6DL) diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 5296c80c05..6ed21295ac 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -100,7 +100,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 14cb3bc6bb..59ca66220f 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -65,7 +65,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=" \ -- 2.39.2