diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-08-18 21:19:00 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-08-18 21:19:00 +0200 |
| commit | 5549d22b656550d36b2cc46743c7220ab0e9dcc4 (patch) | |
| tree | acc88f5980b8ca5999e05e9a86429e5b397cdd7e /include | |
| parent | ae37a0704a8a27e47471f541a68b88370cd14aa8 (diff) | |
| parent | 9ce2c4b7f79c5bdc1697a6979a0d33e51c3cf57d (diff) | |
Merge branch 'master' of /home/wd/git/u-boot/master
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/am3517_evm.h | 38 | ||||
| -rw-r--r-- | include/configs/cm-bf548.h | 2 | ||||
| -rw-r--r-- | include/usb.h | 2 |
3 files changed, 40 insertions, 2 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/configs/cm-bf548.h b/include/configs/cm-bf548.h index 63b9399e14..fa62a8e9c1 100644 --- a/include/configs/cm-bf548.h +++ b/include/configs/cm-bf548.h @@ -64,7 +64,7 @@ #define CONFIG_EBIU_FCTL_VAL (BCLK_4) #define CONFIG_EBIU_MODE_VAL (B0MODE_FLASH) -#define CONFIG_SYS_MONITOR_LEN (384 * 1024) +#define CONFIG_SYS_MONITOR_LEN (512 * 1024) #define CONFIG_SYS_MALLOC_LEN (640 * 1024) 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); |