diff options
| author | Tom Rini <trini@konsulko.com> | 2018-02-04 08:30:13 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-02-04 08:30:13 -0500 |
| commit | ab1af91093e3a5e3e86b77ebaf568facd386a1df (patch) | |
| tree | aa005b3bd0fd5716d8dd3b69c1c55f14a34f5f9e /arch/arm/mach-imx/spl.c | |
| parent | b2153075f42c2d46d310778e226bcb11f0af47f5 (diff) | |
| parent | d1ceb0c4881332cb0586920f0a40f8e4a48d99a9 (diff) | |
Merge git://git.denx.de/u-boot-imx
Diffstat (limited to 'arch/arm/mach-imx/spl.c')
| -rw-r--r-- | arch/arm/mach-imx/spl.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 6c16872f596..b2521b2101c 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -97,8 +97,8 @@ u32 spl_boot_device(void) return BOOT_DEVICE_NONE; } -#elif defined(CONFIG_MX7) -/* Translate iMX7 boot device to the SPL boot device enumeration */ +#elif defined(CONFIG_MX7) || defined(CONFIG_MX8M) +/* Translate iMX7/MX8M boot device to the SPL boot device enumeration */ u32 spl_boot_device(void) { enum boot_device boot_device_spl = get_boot_device(); @@ -115,11 +115,13 @@ u32 spl_boot_device(void) return BOOT_DEVICE_NAND; case SPI_NOR_BOOT: return BOOT_DEVICE_SPI; + case USB_BOOT: + return BOOT_DEVICE_USB; default: return BOOT_DEVICE_NONE; } } -#endif /* CONFIG_MX6 || CONFIG_MX7 */ +#endif /* CONFIG_MX6 || CONFIG_MX7 || CONFIG_MX8M */ #ifdef CONFIG_SPL_USB_GADGET_SUPPORT int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) |