mx6qsabresd: Fix booting the kernel from SDHC3

Since commit de7d02aeb (mx6qsabresd: add usdhc2 and usdhc4 support)
SDHC3 device node is no longer 0, which breaks loading a uImage from SDHC3.

Fix it by adapting the default environment to use CONFIG_SYS_MMC_ENV_DEV as the
correct mmc node for loading the kernel from.

While at it, go back to using SDHC3 as the default mmc, since we have Yocto
images that generate an SD card containing U-boot,kernel and rootfs, so it is
more convenient to keep using SDHC3 as it was originally.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h
index 3229d5ace3132b8cf6bb28469257e7fd19bd584e..cda4512905cdb9baa6f6b6dc6d8109ec00721f8e 100644 (file)
--- a/include/configs/mx6qsabre_common.h
+++ b/include/configs/mx6qsabre_common.h
@@ -90,7 +90,7 @@
        "console=" CONFIG_CONSOLE_DEV "\0" \
        "fdt_high=0xffffffff\0"   \
        "initrd_high=0xffffffff\0" \
-       "mmcdev=0\0" \
+       "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
        "mmcpart=1\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate} " \

diff --git a/include/configs/mx6qsabresd.h b/include/configs/mx6qsabresd.h
index b64e9254f8887a47b78bb5a9cd9d064bcc90bd10..3b8d752eed86d20c04da31c82de36c812bc4498c 100644 (file)
--- a/include/configs/mx6qsabresd.h
+++ b/include/configs/mx6qsabresd.h
@@ -28,7 +28,7 @@
 
 #define CONFIG_SYS_FSL_USDHC_NUM       3
 #if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_SYS_MMC_ENV_DEV         2       /* eMMC/uSDHC4 */
+#define CONFIG_SYS_MMC_ENV_DEV         1       /* SDHC3 */
 #define CONFIG_SYS_MMC_ENV_PART                1       /* Boot partition 1 */
 #endif