diff options
| author | Adam Ford <aford173@gmail.com> | 2019-10-08 07:56:44 -0500 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2019-10-08 16:36:37 +0200 |
| commit | 63ce94b16b3527bc6944d1ab8b2572c6f39e0aef (patch) | |
| tree | 01781edbbbfcfb05a351d45c1dfa89fe54b6151c | |
| parent | 83afe3b1c9f3dd872068bb67ec5b5814ac5a0cb3 (diff) | |
| download | u-boot-63ce94b16b3527bc6944d1ab8b2572c6f39e0aef.zip u-boot-63ce94b16b3527bc6944d1ab8b2572c6f39e0aef.tar.gz u-boot-63ce94b16b3527bc6944d1ab8b2572c6f39e0aef.tar.bz2 | |
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>
| -rw-r--r-- | arch/arm/mach-imx/spl.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 9fa397c..f025c4b 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; |