aboutsummaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2011-10-18 21:19:17 -0600
committerJohn Rigby <john.rigby@linaro.org>2012-12-06 12:16:42 -0700
commit5461313e54cce1bc85c0599d6dc7ba3c49094b62 (patch)
tree0d47a1545cea98c812324527b2879ca89667b5ce /include/configs
parentc8e42565afaaea61e1e5e159ca850652baa247f6 (diff)
OMAP4: Panda: Add usb peripheral boot
Stripped down fastboot protocol for now but could be just about anything. Will revisit once a fastboot or dfu implementation hits upstream. Signed-off-by: John Rigby <john.rigby@linaro.org> Conflicts: arch/arm/cpu/armv7/omap-common/Makefile arch/arm/include/asm/omap_common.h common/spl/spl.c include/configs/omap4_common.h spl/Makefile
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/omap4_common.h13
1 files changed, 13 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