Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit dd07d338dab13e7bee6c1c260d885d7c5716fb52

Authored by Ye Li
1 parent b0aaad915b
Exists in smarc_8mm-imx_v2019.04_4.19.35_1.1.0 and in 1 other branch smarc_8m-imx_v2019.04_4.19.35_1.1.0

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 <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit 3e4123fb3d6945a466563f4505a56bb0ea6f4ca0)
(cherry picked from commit 6c6206ad1a5a3c70118a3ecf526b0ff00088adf7)

Showing 1 changed file with 9 additions and 0 deletions Side-by-side Diff

arch/arm/mach-imx/spl.c
Diff comments   View file @ dd07d33
... ... @@ -147,9 +147,18 @@
147 147 case SD1_BOOT:
148 148 case MMC1_BOOT:
149 149 return BOOT_DEVICE_MMC1;
  150 +#if defined(CONFIG_IMX8MM)
150 151 case SD2_BOOT:
151 152 case MMC2_BOOT:
  153 + return BOOT_DEVICE_MMC1;
  154 + case SD3_BOOT:
  155 + case MMC3_BOOT:
152 156 return BOOT_DEVICE_MMC2;
  157 +#else
  158 + case SD2_BOOT:
  159 + case MMC2_BOOT:
  160 + return BOOT_DEVICE_MMC2;
  161 +#endif
153 162 #endif
154 163 case NAND_BOOT:
155 164 return BOOT_DEVICE_NAND;