diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-11-20 23:46:52 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-11-27 17:40:45 +0100 |
| commit | f57a19ecbdedfc9e2448b486985d74ca8b40a187 (patch) | |
| tree | efbc538bede3159c53f30efafeb86c7f476d38bb | |
| parent | c83b609c61b6c2a32055ee8d06712691b35f0938 (diff) | |
Revert "MLK-18243-17: arm: mach-imx: fix sd to mmc1 and emmc to mmc2 for i.MX8MM"
Nope, hard-coding SD to mmc1 and eMMC to mmc2 is wrong in so many ways!
This reverts commit 6c6206ad1a5a3c70118a3ecf526b0ff00088adf7.
| -rw-r--r-- | arch/arm/mach-imx/spl.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 2715b3b3d4..9ec8ef7784 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -125,19 +125,10 @@ 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: @@ -170,7 +161,6 @@ u32 spl_boot_mode(const u32 boot_device) /* for MMC return either RAW or FAT mode */ case SD1_BOOT: case SD2_BOOT: - case SD3_BOOT: #if defined(CONFIG_SPL_FAT_SUPPORT) return MMCSD_MODE_FS; #else @@ -179,7 +169,6 @@ u32 spl_boot_mode(const u32 boot_device) break; case MMC1_BOOT: case MMC2_BOOT: - case MMC3_BOOT: #if defined(CONFIG_SPL_FAT_SUPPORT) return MMCSD_MODE_FS; #elif defined(CONFIG_SUPPORT_EMMC_BOOT) |