commit eb6b50f631628f48b7e72432ae878e6ff0e306c3
author Tom Rini <trini@konsulko.com> Wed Apr 20 09:31:58 2016 -0400
committer Tom Rini <trini@konsulko.com> Wed Apr 20 09:31:58 2016 -0400
tree 40a37edba62f5769156b543ea7a5e9c9377d5a15
parent ec3ab3f9b5c75b5a11f8f6f52951fa8dd45990be
parent e6c0bc0643e5a4387fecbcf83080d0b796eb067c

Merge branch 'master' of git://git.denx.de/u-boot-usb

Conflicts:
	configs/bcm28155_ap_defconfig
	configs/dra72_evm_defconfig
	configs/dra74_evm_defconfig
	configs/ma5d4evk_defconfig

Signed-off-by: Tom Rini <trini@konsulko.com>

configs/dra74_evm_defconfig

diff --git a/configs/dra74_evm_defconfig b/configs/dra74_evm_defconfig
index 5f50004..64ab406 100644
--- a/configs/dra74_evm_defconfig
+++ b/configs/dra74_evm_defconfig
@@ -15,6 +15,7 @@
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_DM=y
+CONFIG_DM_MMC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
@@ -23,5 +24,12 @@
 CONFIG_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
+CONFIG_USB_DWC3_OMAP=y
+CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
-CONFIG_DM_MMC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0451
+CONFIG_G_DNL_PRODUCT_NUM=0xd022