random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-11-27 14:20:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Adam Ford 2019-10-08 07:56:44 -05:00 committed by Stefano Babic
parent 83afe3b1c9
commit 63ce94b16b
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-imx/spl.c
View File

@ -29,7 +29,6 @@ u32 spl_boot_device(void)
{ {
unsigned int bmode = readl(&src_base->sbmr2); unsigned int bmode = readl(&src_base->sbmr2);
u32 reg = imx6_src_get_boot_mode(); u32 reg = imx6_src_get_boot_mode();
u32 mmc_index = ((reg >> 11) & 0x03);
/* /*
* Check for BMODE if serial downloader is enabled * 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 */ /* SD/eSD: 8.5.3, Table 8-15 */
case IMX6_BMODE_SD: case IMX6_BMODE_SD:
case IMX6_BMODE_ESD: case IMX6_BMODE_ESD:
return BOOT_DEVICE_MMC1;
/* MMC/eMMC: 8.5.3 */
case IMX6_BMODE_MMC: case IMX6_BMODE_MMC:
case IMX6_BMODE_EMMC: case IMX6_BMODE_EMMC:
if (mmc_index == 1) return BOOT_DEVICE_MMC1;
return BOOT_DEVICE_MMC2;
else
return BOOT_DEVICE_MMC1;
/* NAND Flash: 8.5.2, Table 8-10 */ /* NAND Flash: 8.5.2, Table 8-10 */
case IMX6_BMODE_NAND_MIN ... IMX6_BMODE_NAND_MAX: case IMX6_BMODE_NAND_MIN ... IMX6_BMODE_NAND_MAX:
return BOOT_DEVICE_NAND; return BOOT_DEVICE_NAND;