projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
imx: mx7: move mmc env code to mmc_env.c
[oweals/u-boot.git]
/
arch
/
arm
/
mach-imx
/
spl.c
diff --git
a/arch/arm/mach-imx/spl.c
b/arch/arm/mach-imx/spl.c
index 6c16872f596f9b9ebeb6642eef572d38af48cde4..b2521b2101ccd72334f24b01955d104113549bc1 100644
(file)
--- 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;
}
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();
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;
return BOOT_DEVICE_NAND;
case SPI_NOR_BOOT:
return BOOT_DEVICE_SPI;
+ case USB_BOOT:
+ return BOOT_DEVICE_USB;
default:
return BOOT_DEVICE_NONE;
}
}
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)
#ifdef CONFIG_SPL_USB_GADGET_SUPPORT
int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)