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>

diff --cc configs/bcm28155_ap_defconfig
index 538647d79bc2947eef3a5b627d8a410e9362bb6b,8076c4f2fe02a6c67c50c69e7f97e3f2cccc3d3f..969c5bcaeb0d7f76d2f31ea29c1483a609916dcc
--- 1/configs/bcm28155_ap_defconfig
--- 2/configs/bcm28155_ap_defconfig
+++ b/configs/bcm28155_ap_defconfig
@@@ -9,4 -9,8 +9,9 @@@ CONFIG_CMD_GPIO=
  CONFIG_SYS_NS16550=y
  CONFIG_USB=y
  CONFIG_USB_GADGET=y
+ CONFIG_USB_GADGET_DWC2_OTG=y
+ CONFIG_USB_GADGET_DOWNLOAD=y
+ CONFIG_G_DNL_MANUFACTURER="Broadcom Corporation"
+ CONFIG_G_DNL_VENDOR_NUM=0x18d1
+ CONFIG_G_DNL_PRODUCT_NUM=0x0d02
 +CONFIG_OF_LIBFDT=y

diff --cc configs/dra72_evm_defconfig
index 6626a1e3c6a66aae8da1416d6852659c846ffdab,0d63986803bd7a0dd42f5b2c0abba6a844a5049f..4aa76b17b7ded2a8d27d10e7191ccb16cba4e3c6
--- 1/configs/dra72_evm_defconfig
--- 2/configs/dra72_evm_defconfig
+++ b/configs/dra72_evm_defconfig
@@@ -16,6 -16,6 +16,7 @@@ CONFIG_CMD_GPIO=
  # 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

diff --cc configs/dra74_evm_defconfig
index 5f500040c48c2dce0d13b42f2eb8061550b704c6,8ce544e025838b9ba9990a8cb9e69aca97224717..64ab406a350a19c5c1725dfbac357af1debfe144
--- 1/configs/dra74_evm_defconfig
--- 2/configs/dra74_evm_defconfig
+++ b/configs/dra74_evm_defconfig
@@@ -15,6 -15,6 +15,7 @@@ CONFIG_CMD_GPIO=
  # 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

diff --cc configs/ma5d4evk_defconfig
index 144851426937ae183a43628140a076a71e20f004,1b2b722d7d03e68a4a45fa5f7330f918246ab252..f7973ed6e253af643bc328bc9afe8cd3a748f193
--- 1/configs/ma5d4evk_defconfig
--- 2/configs/ma5d4evk_defconfig
+++ b/configs/ma5d4evk_defconfig
@@@ -12,5 -12,4 +12,6 @@@ CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4
  CONFIG_SPI_FLASH=y
  CONFIG_USB=y
  CONFIG_USB_GADGET=y
+ CONFIG_USB_GADGET_ATMEL_USBA=y
 +CONFIG_OF_LIBFDT=y
 +# CONFIG_EFI_LOADER is not set

diff --cc include/configs/bcm28155_ap.h
Simple merge

diff --cc include/configs/colibri_vf.h
Simple merge

diff --cc include/configs/ma5d4evk.h
Simple merge

diff --cc include/configs/siemens-am33x-common.h
Simple merge

diff --cc include/configs/smartweb.h
Simple merge