mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-29 08:00:26 +09:00
imx: spl: Partially revert "spl: eMMC/SD: Provide one __weak spl_boot_mode() function"
Commit d695d66278
("spl: eMMC/SD: Provide one __weak spl_boot_mode()
function") breaks the boot on several i.MX6 boards,
such as cuboxi and wandboard:
U-Boot SPL 2018.03-rc1-00212-g48914fc119 (Feb 10 2018 - 11:04:33 +1300)
Trying to boot from MMC1
Failed to mount ext2 filesystem...
spl_load_image_ext: ext4fs mount err - 0
Partially revert it so that we can boot U-Boot again on these
i.MX6 platforms.
Reported-by: Jonathan Gray <jsg@jsg.id.au>
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Tested-by: Breno Lima <breno.lima@nxp.com>
This commit is contained in:
parent
520d822632
commit
0339086bd9
@ -132,6 +132,29 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(CONFIG_SPL_MMC_SUPPORT)
|
||||||
|
/* called from spl_mmc to see type of boot mode for storage (RAW or FAT) */
|
||||||
|
u32 spl_boot_mode(const u32 boot_device)
|
||||||
|
{
|
||||||
|
switch (spl_boot_device()) {
|
||||||
|
/* for MMC return either RAW or FAT mode */
|
||||||
|
case BOOT_DEVICE_MMC1:
|
||||||
|
case BOOT_DEVICE_MMC2:
|
||||||
|
#if defined(CONFIG_SPL_FAT_SUPPORT)
|
||||||
|
return MMCSD_MODE_FS;
|
||||||
|
#elif defined(CONFIG_SUPPORT_EMMC_BOOT)
|
||||||
|
return MMCSD_MODE_EMMCBOOT;
|
||||||
|
#else
|
||||||
|
return MMCSD_MODE_RAW;
|
||||||
|
#endif
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
puts("spl: ERROR: unsupported device\n");
|
||||||
|
hang();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_SECURE_BOOT)
|
#if defined(CONFIG_SECURE_BOOT)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user