43 lines
1.2 KiB
Diff
43 lines
1.2 KiB
Diff
From f6bfab7799821fbb7289b5cd0b932220dec81a00 Mon Sep 17 00:00:00 2001
|
|
From: Peter Robinson <pbrobinson@gmail.com>
|
|
Date: Tue, 8 Oct 2019 10:52:07 +0100
|
|
Subject: [PATCH] Revert "spl: imx6: Let spl_boot_device return USDHC1 or
|
|
USDHC2"
|
|
|
|
This reverts commit 14d319b1856b86e593e01abd0a1e3c2d63b52a8a.
|
|
---
|
|
arch/arm/mach-imx/spl.c | 8 +++-----
|
|
1 file changed, 3 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
|
|
index 1f230aca33..9f1e0f6a72 100644
|
|
--- a/arch/arm/mach-imx/spl.c
|
|
+++ b/arch/arm/mach-imx/spl.c
|
|
@@ -24,7 +24,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
|
|
@@ -85,12 +84,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;
|
|
--
|
|
2.21.0
|
|
|