Merge branch 'master' of git://git.denx.de/u-boot-usb
This commit is contained in:
@@ -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>
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user