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 /include/configs/gw_ventana.h | |
| 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 'include/configs/gw_ventana.h')
| -rw-r--r-- | include/configs/gw_ventana.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 793b3fb88e..747eafc240 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -184,9 +184,7 @@ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_KEYBOARD -#define CONFIG_CI_UDC #define CONFIG_USBD_HS -#define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_ETHER #define CONFIG_USB_ETH_CDC #define CONFIG_NETCONSOLE @@ -195,13 +193,6 @@ /* USB Mass Storage Gadget */ #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_FUNCTION_MASS_STORAGE -#define CONFIG_USB_GADGET_DOWNLOAD -#define CONFIG_USB_GADGET_VBUS_DRAW 2 - -/* Netchip IDs */ -#define CONFIG_G_DNL_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5 -#define CONFIG_G_DNL_MANUFACTURER "Gateworks" /* Framebuffer and LCD */ #define CONFIG_VIDEO |
