diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/configs/omap4_common.h | 13 | ||||
-rw-r--r-- | include/spl.h | 4 | ||||
-rw-r--r-- | include/usb/musb_udc.h | 4 |
3 files changed, 21 insertions, 0 deletions
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h index 049f39c01..61a29707c 100644 --- a/include/configs/omap4_common.h +++ b/include/configs/omap4_common.h @@ -114,7 +114,9 @@ /* USB device configuration */ #define CONFIG_USB_DEVICE 1 +#ifndef CONFIG_SPL_USB #define CONFIG_USB_TTY 1 +#endif #define CONFIG_SYS_CONSOLE_IS_IN_ENV 1 /* Flash */ @@ -271,8 +273,19 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_I2C_SUPPORT +/* + * TODO: Fix this: + * Because of spl image size issues, usb peripheral boot + * and mmc/fat boot can not be enabled at the same time + */ +#ifdef CONFIG_SPL_USB +#define CONFIG_SPL_DSU_SUPPORT +#define CONFIG_SPL_USB_SUPPORT +#define CONFIG_SPL_MUSB_SUPPORT +#else #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_FAT_SUPPORT +#endif #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT diff --git a/include/spl.h b/include/spl.h index b02f36fa9..21744f3f3 100644 --- a/include/spl.h +++ b/include/spl.h @@ -74,6 +74,10 @@ void spl_spi_load_image(void); /* Ethernet SPL functions */ void spl_net_load_image(const char *device); +/* USB SPL functions */ +void spl_dsu_load_image(void); +int dsudownload(u32 *, u32 *); + #ifdef CONFIG_SPL_BOARD_INIT void spl_board_init(void); #endif diff --git a/include/usb/musb_udc.h b/include/usb/musb_udc.h index be808fd51..03cc2bd08 100644 --- a/include/usb/musb_udc.h +++ b/include/usb/musb_udc.h @@ -50,4 +50,8 @@ int udc_init(void); #endif /* CONFIG_USB_TTY */ +#ifdef CONFIG_SPL_DSU_SUPPORT +#define EP0_MAX_PACKET_SIZE 64 /* MUSB_EP0_FIFOSIZE */ +#endif + #endif /* __MUSB_UDC_H__ */ |