diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-08-12 23:05:22 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-08-12 23:05:22 +0200 |
| commit | 668a6b45915d10d75357f5b93f569bbf49ea2b06 (patch) | |
| tree | 5028cab02cae3e0ee460b9e6c51110c81390cd42 /include | |
| parent | 5d89115c5314987f7f57ee705f8f9b5c6b0be0f8 (diff) | |
| parent | 842404ea0730a7b48355794bdca6b787d4a1536a (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/am3517_evm.h | 38 | ||||
| -rw-r--r-- | include/usb.h | 2 |
2 files changed, 39 insertions, 1 deletions
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 10af21b1b8..a9045d8bad 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -99,6 +99,44 @@ #define CONFIG_OMAP3_MMC 1 #define CONFIG_DOS_PARTITION 1 +/* + * USB configuration + * Enable CONFIG_MUSB_HCD for Host functionalities MSC, keyboard + * Enable CONFIG_MUSB_UDC for Device functionalities. + */ +#define CONFIG_USB_AM35X 1 +#define CONFIG_MUSB_HCD 1 + +#ifdef CONFIG_USB_AM35X + +#ifdef CONFIG_MUSB_HCD +#define CONFIG_CMD_USB + +#define CONFIG_USB_STORAGE +#define CONGIG_CMD_STORAGE +#define CONFIG_CMD_FAT + +#ifdef CONFIG_USB_KEYBOARD +#define CONFIG_SYS_USB_EVENT_POLL +#define CONFIG_PREBOOT "usb start" +#endif /* CONFIG_USB_KEYBOARD */ + +#endif /* CONFIG_MUSB_HCD */ + +#ifdef CONFIG_MUSB_UDC +/* USB device configuration */ +#define CONFIG_USB_DEVICE 1 +#define CONFIG_USB_TTY 1 +#define CONFIG_SYS_CONSOLE_IS_IN_ENV 1 +/* Change these to suit your needs */ +#define CONFIG_USBD_VENDORID 0x0451 +#define CONFIG_USBD_PRODUCTID 0x5678 +#define CONFIG_USBD_MANUFACTURER "Texas Instruments" +#define CONFIG_USBD_PRODUCT_NAME "AM3517EVM" +#endif /* CONFIG_MUSB_UDC */ + +#endif /* CONFIG_USB_AM35X */ + /* commands to include */ #include <config_cmd_default.h> diff --git a/include/usb.h b/include/usb.h index bc4ccfe150..afd65e3180 100644 --- a/include/usb.h +++ b/include/usb.h @@ -133,7 +133,7 @@ struct usb_device { defined(CONFIG_USB_SL811HS) || defined(CONFIG_USB_ISP116X_HCD) || \ defined(CONFIG_USB_R8A66597_HCD) || defined(CONFIG_USB_DAVINCI) || \ defined(CONFIG_USB_OMAP3) || defined(CONFIG_USB_DA8XX) || \ - defined(CONFIG_USB_BLACKFIN) + defined(CONFIG_USB_BLACKFIN) || defined(CONFIG_USB_AM35X) int usb_lowlevel_init(void); int usb_lowlevel_stop(void); |