From: Adam Ford <aford173@gmail.com>
Date: Tue, 8 Oct 2019 12:56:44 +0000 (-0500)
Subject: Revert "spl: imx6: Let spl_boot_device return USDHC1 or USDHC2"
X-Git-Tag: v2020.01-rc1~33^2~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=63ce94b16b3527bc6944d1ab8b2572c6f39e0aef;p=oweals%2Fu-boot.git

Revert "spl: imx6: Let spl_boot_device return USDHC1 or USDHC2"

Apologies to everyone whose board I broke by attempting to return
MMC1 or MMC2. I misunderstood how the MMC indexing worked.

This reverts commit 14d319b1856b86e593e01abd0a1e3c2d63b52a8a.

Signed-off-by: Adam Ford <aford173@gmail.com>
---

diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
index 9fa397c94d..f025c4b301 100644
--- a/arch/arm/mach-imx/spl.c
+++ b/arch/arm/mach-imx/spl.c
@@ -29,7 +29,6 @@ u32 spl_boot_device(void)
 {
 	unsigned int bmode = readl(&src_base->sbmr2);
 	u32 reg = imx6_src_get_boot_mode();
-	u32 mmc_index = ((reg >> 11) & 0x03);
 
 	/*
 	 * Check for BMODE if serial downloader is enabled
@@ -90,12 +89,11 @@ u32 spl_boot_device(void)
 	/* SD/eSD: 8.5.3, Table 8-15  */
 	case IMX6_BMODE_SD:
 	case IMX6_BMODE_ESD:
+		return BOOT_DEVICE_MMC1;
+	/* MMC/eMMC: 8.5.3 */
 	case IMX6_BMODE_MMC:
 	case IMX6_BMODE_EMMC:
-		if (mmc_index == 1)
-			return BOOT_DEVICE_MMC2;
-		else
-			return BOOT_DEVICE_MMC1;
+		return BOOT_DEVICE_MMC1;
 	/* NAND Flash: 8.5.2, Table 8-10 */
 	case IMX6_BMODE_NAND_MIN ... IMX6_BMODE_NAND_MAX:
 		return BOOT_DEVICE_NAND;