From: Tom Rini Date: Wed, 20 Apr 2016 13:31:58 +0000 (-0400) Subject: Merge branch 'master' of git://git.denx.de/u-boot-usb X-Git-Tag: v2016.05-rc2~3 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=eb6b50f631628f48b7e72432ae878e6ff0e306c3;p=u-boot 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 --- eb6b50f631628f48b7e72432ae878e6ff0e306c3 diff --cc configs/bcm28155_ap_defconfig index 538647d79b,8076c4f2fe..969c5bcaeb --- a/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 6626a1e3c6,0d63986803..4aa76b17b7 --- a/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 5f500040c4,8ce544e025..64ab406a35 --- a/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 1448514269,1b2b722d7d..f7973ed6e2 --- a/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