diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-22 08:58:41 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-22 08:58:41 -0400 |
| commit | 2b63959e30f23ef3088dbed6626341c6d8371a66 (patch) | |
| tree | 1ea89ae7672fbb34886d05c0f6eabfea4d0e00d3 /arch/arm/mach-imx/spl.c | |
| parent | 2f2031e647564be8121c05507fbec8e6c5bc0e63 (diff) | |
| parent | 2448c34f9fc26d3c459e6e7b28c6357656bfa287 (diff) | |
Merge tag 'mmc-2020-4-22' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc
- iproc_sdhci memory leak fix and enable R1B resp quirk
- more mmc cmds and several mmc updates from Heinirich
- Use bounce buffer for tmio sdhci
- Alignment check for tmio sdhci
Diffstat (limited to 'arch/arm/mach-imx/spl.c')
| -rw-r--r-- | arch/arm/mach-imx/spl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 87dbdf3011..49bb3b928d 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -189,7 +189,7 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) #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) +u32 spl_mmc_boot_mode(const u32 boot_device) { #if defined(CONFIG_MX7) || defined(CONFIG_IMX8M) || defined(CONFIG_IMX8) switch (get_boot_device()) { |