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/nyan-big_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/nyan-big_defconfig')
| -rw-r--r-- | configs/nyan-big_defconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig index de7e9eb6a7..d86a55ca68 100644 --- a/configs/nyan-big_defconfig +++ b/configs/nyan-big_defconfig @@ -35,6 +35,11 @@ CONFIG_TPM_TIS_INFINEON=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y +CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="NVIDIA" +CONFIG_G_DNL_VENDOR_NUM=0x0955 +CONFIG_G_DNL_PRODUCT_NUM=0x701a CONFIG_DM_VIDEO=y CONFIG_DISPLAY=y CONFIG_VIDEO_TEGRA124=y |
