diff options
| author | Tom Rini | 2019-01-11 10:47:41 -0500 |
|---|---|---|
| committer | Tom Rini | 2019-01-11 10:47:41 -0500 |
| commit | 7f9418688d253853d0f69e9911d0d172d97f62cf (patch) | |
| tree | 64fa2f6f4563709cb67b8e3574d3ba5a39c0bb53 /arch/arm | |
| parent | d3035b856027cb9621a252aafc6316b3724d6294 (diff) | |
| parent | b3c518a88278619b1e109de114c450237d03e032 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/dts/omap5-u-boot.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/mach-imx/mx6/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/spl.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/dts/omap5-u-boot.dtsi b/arch/arm/dts/omap5-u-boot.dtsi index 1eb50cd4381..54a7285e6e1 100644 --- a/arch/arm/dts/omap5-u-boot.dtsi +++ b/arch/arm/dts/omap5-u-boot.dtsi @@ -12,6 +12,11 @@ tick-timer = &timer2; }; + aliases { + usb0 = &usb1; + usb1 = &usb2; + }; + ocp { u-boot,dm-spl; diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index e7cce46e03d..3d56346ccb5 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -263,7 +263,7 @@ config TARGET_MX6DL_MAMOJ select SPL_PINCTRL if SPL select SPL_SEPARATE_BSS if SPL select SPL_SERIAL_SUPPORT if SPL - select SPL_USB_GADGET_SUPPORT if SPL + select SPL_USB_GADGET if SPL select SPL_USB_HOST_SUPPORT if SPL select SPL_USB_SDP_SUPPORT if SPL select SPL_WATCHDOG_SUPPORT if SPL diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 58a92278df4..397d6d4a91f 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -154,7 +154,7 @@ u32 spl_boot_device(void) } #endif /* CONFIG_MX7 || CONFIG_IMX8M */ -#ifdef CONFIG_SPL_USB_GADGET_SUPPORT +#ifdef CONFIG_SPL_USB_GADGET int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) { put_unaligned(CONFIG_USB_GADGET_PRODUCT_NUM + 0xfff, &dev->idProduct); |