diff options
| author | Ye Li <ye.li@nxp.com> | 2021-05-14 03:41:18 -0700 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2022-04-06 18:04:30 +0800 |
| commit | da1a20fed19fe5ca27b9059a3305df909c1572cf (patch) | |
| tree | d50884e32908bffc96d82dd34b8887b9d2c8a6ce /include | |
| parent | e05cca5a5f3c803182247134e86441c47b3ab61e (diff) | |
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 <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit 2b633b897572713666621a2038d902fcba6b9a30)
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mx6sabreauto.h | 1 | ||||
| -rw-r--r-- | include/configs/mx6ul_14x14_evk.h | 1 | ||||
| -rw-r--r-- | include/configs/mx6ullevk.h | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h index a2ae6e4a71..023cc137e7 100644 --- a/include/configs/mx6sabreauto.h +++ b/include/configs/mx6sabreauto.h @@ -25,6 +25,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/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index bf6346e126..10e425d940 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -209,6 +209,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 56912f5983..1c57c18d55 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -210,6 +210,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 |