diff options
| author | Tom Rini <trini@ti.com> | 2013-10-21 08:10:36 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-10-21 08:10:36 -0400 |
| commit | 748bde608a8dfea5b64e186af4d9c27642fe7813 (patch) | |
| tree | 8564b610e812404bd320ddea458fc585d9c49d7e /include/configs/nitrogen6x.h | |
| parent | 9dff87a297dabe4af60012ad2d990ff8967f1d55 (diff) | |
| parent | 449697f14ebc9f7cb5bf15bbad0d46c6ca2c4979 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'include/configs/nitrogen6x.h')
| -rw-r--r-- | include/configs/nitrogen6x.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index d515e49302..85fe5ee94e 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -30,6 +30,12 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_MISC_INIT_R #define CONFIG_MXC_GPIO +#define CONFIG_MV_UDC +#define CONFIG_USBD_HS +#define CONFIG_USB_GADGET_DUALSPEED +#define CONFIG_USB_ETHER +#define CONFIG_USB_ETH_CDC +#define CONFIG_NETCONSOLE #define CONFIG_CMD_FUSE #ifdef CONFIG_CMD_FUSE @@ -119,7 +125,8 @@ #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX #define CONFIG_USB_ETHER_SMSC95XX -#define CONFIG_MXC_USB_PORT 1 +#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 +#define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 |