From dd07d338dab13e7bee6c1c260d885d7c5716fb52 Mon Sep 17 00:00:00 2001 From: Ye Li Date: Wed, 9 May 2018 14:07:27 +0800 Subject: [PATCH] MLK-18243-17: arm: mach-imx: fix sd to mmc1 and emmc to mmc2 for i.MX8MM Since the SD is usdhc2 and eMMC is usdhc3, this cause mapping problem for spl_boot_device. So far hard coded them to correct MMC index, so that SD and eMMC boot can work. Signed-off-by: Ye Li Signed-off-by: Peng Fan (cherry picked from commit 3e4123fb3d6945a466563f4505a56bb0ea6f4ca0) (cherry picked from commit 6c6206ad1a5a3c70118a3ecf526b0ff00088adf7) --- arch/arm/mach-imx/spl.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index aea9ed6..32c7e60 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -147,10 +147,19 @@ u32 spl_boot_device(void) case SD1_BOOT: case MMC1_BOOT: return BOOT_DEVICE_MMC1; +#if defined(CONFIG_IMX8MM) + case SD2_BOOT: + case MMC2_BOOT: + return BOOT_DEVICE_MMC1; + case SD3_BOOT: + case MMC3_BOOT: + return BOOT_DEVICE_MMC2; +#else case SD2_BOOT: case MMC2_BOOT: return BOOT_DEVICE_MMC2; #endif +#endif case NAND_BOOT: return BOOT_DEVICE_NAND; case SPI_NOR_BOOT: -- 1.9.1