diff options
author | Tom Rini <trini@konsulko.com> | 2016-04-20 09:31:58 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-04-20 09:31:58 -0400 |
commit | eb6b50f631628f48b7e72432ae878e6ff0e306c3 (patch) | |
tree | 40a37edba62f5769156b543ea7a5e9c9377d5a15 /configs/zynq_picozed_defconfig | |
parent | ec3ab3f9b5c75b5a11f8f6f52951fa8dd45990be (diff) | |
parent | e6c0bc0643e5a4387fecbcf83080d0b796eb067c (diff) | |
download | talos-obmc-uboot-eb6b50f631628f48b7e72432ae878e6ff0e306c3.tar.gz talos-obmc-uboot-eb6b50f631628f48b7e72432ae878e6ff0e306c3.zip |
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>
Diffstat (limited to 'configs/zynq_picozed_defconfig')
-rw-r--r-- | configs/zynq_picozed_defconfig | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig index c730f3c3f4..ffbc73d56c 100644 --- a/configs/zynq_picozed_defconfig +++ b/configs/zynq_picozed_defconfig @@ -13,6 +13,11 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_ZYNQ_SDHCI=y CONFIG_ZYNQ_GEM=y CONFIG_USB=y -CONFIG_USB_GADGET=y -CONFIG_USB_ULPI=y CONFIG_USB_ULPI_VIEWPORT=y +CONFIG_USB_ULPI=y +CONFIG_USB_GADGET=y +CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Xilinx" +CONFIG_G_DNL_VENDOR_NUM=0x03fd +CONFIG_G_DNL_PRODUCT_NUM=0x0300 |