aboutsummaryrefslogtreecommitdiff
path: root/include/configs/omap4_common.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/configs/omap4_common.h')
-rw-r--r--include/configs/omap4_common.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
index d7007605a..cf3dbf220 100644
--- a/include/configs/omap4_common.h
+++ b/include/configs/omap4_common.h
@@ -116,7 +116,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 */
@@ -288,7 +290,16 @@
#define CONFIG_SPL_LIBCOMMON_SUPPORT
#define CONFIG_SPL_LIBDISK_SUPPORT
#define CONFIG_SPL_I2C_SUPPORT
-#ifndef CONFIG_USB_SPL
+/*
+ * 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