From 2b633b897572713666621a2038d902fcba6b9a30 Mon Sep 17 00:00:00 2001 From: Ye Li Date: Fri, 14 May 2021 03:41:18 -0700 Subject: [PATCH] MLK-25496 imx6: Fix CONFIG_SYS_MMC_ENV_DEV for QSPI/SPI/EIM boot CONFIG_SYS_MMC_ENV_DEV depends on CONFIG_ENV_IS_IN_MMC. So even we have added it in defconfig for QSPI/SPI/EIM, but this does not really set due to we set ENV in NOR flash device. This causes "mmcdev" set to invalid value. So u-boot fails to select SD card before loading kernel image. Signed-off-by: Ye Li Reviewed-by: Peng Fan --- include/configs/mx6sabreauto.h | 1 + include/configs/mx6sxsabreauto.h | 1 + include/configs/mx6sxsabresd.h | 1 + include/configs/mx6ul_14x14_evk.h | 1 + include/configs/mx6ullevk.h | 1 + 5 files changed, 5 insertions(+) diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h index 17826ad634..a156e48dea 100644 --- a/include/configs/mx6sabreauto.h +++ b/include/configs/mx6sabreauto.h @@ -26,6 +26,7 @@ #include "mx6sabre_common.h" #define CONFIG_SYS_FSL_USDHC_NUM 2 +#define CONFIG_SYS_MMC_ENV_DEV 2 /* SDHC3 */ /*Since the pin conflicts on EIM D18, disable the USB host if the NOR flash is enabled */ #ifdef CONFIG_USB diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 5cd1bfa383..6ae3c52e3f 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -232,6 +232,7 @@ #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_MMCROOT "/dev/mmcblk2p2" /* USDHC3 */ +#define CONFIG_SYS_MMC_ENV_DEV 2 /*USDHC3*/ #if defined(CONFIG_ENV_IS_IN_SPI_FLASH) #define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 52345e1300..3060efe3e3 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -248,5 +248,6 @@ #define CONFIG_SYS_FSL_USDHC_NUM 3 #define CONFIG_MMCROOT "/dev/mmcblk3p2" /* USDHC4 */ +#define CONFIG_SYS_MMC_ENV_DEV 3 /*USDHC4*/ #endif /* __CONFIG_H */ diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 0062675428..014bcea6c4 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -238,6 +238,7 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) /* environment organization */ +#define CONFIG_SYS_MMC_ENV_DEV 1 /* USDHC2 */ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ /* NAND stuff */ diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index f4253de00b..6f53dc59ed 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -238,6 +238,7 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) /* environment organization */ +#define CONFIG_SYS_MMC_ENV_DEV 1 /* USDHC2 */ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ #define CONFIG_IOMUX_LPSR -- 2.17.1