summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-03-18 15:33:47 -0400
committerTom Rini <trini@ti.com>2013-03-18 15:33:47 -0400
commit3c47f2f4871c345c20b9d986b11fec550ef6cc9f (patch)
tree267c6eedacaa02cc8c7096f67bedb9d17fe3e21d /include/configs
parent0ce033d2582129243aca10d3072a221386bbba44 (diff)
parentae003d057077d792c1f2131753a7596c94e0bba4 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/coreboot.h17
-rw-r--r--include/configs/trats.h5
2 files changed, 22 insertions, 0 deletions
diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h
index 49f05decc0..87daf62681 100644
--- a/include/configs/coreboot.h
+++ b/include/configs/coreboot.h
@@ -273,6 +273,23 @@
*/
#define CONFIG_PCI
+/*-----------------------------------------------------------------------
+ * USB configuration
+ */
+#define CONFIG_USB_EHCI
+#define CONFIG_USB_EHCI_PCI
+#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 12
+#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
+#define CONFIG_USB_STORAGE
+#define CONFIG_USB_KEYBOARD
+#define CONFIG_SYS_USB_EVENT_POLL
+
+#define CONFIG_USB_HOST_ETHER
+#define CONFIG_USB_ETHER_ASIX
+#define CONFIG_USB_ETHER_SMSC95XX
+
+#define CONFIG_CMD_USB
+
#define CONFIG_EXTRA_ENV_SETTINGS \
CONFIG_STD_DEVICES_SETTINGS
diff --git a/include/configs/trats.h b/include/configs/trats.h
index 63745ac8f1..31d81901bc 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -316,4 +316,9 @@
#define CONFIG_VIDEO_BMP_GZIP
#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE ((500 * 120 * 4) + (1 << 12))
+#define CONFIG_CMD_USB_MASS_STORAGE
+#if defined(CONFIG_CMD_USB_MASS_STORAGE)
+#define CONFIG_USB_GADGET_MASS_STORAGE
+#endif
+
#endif /* __CONFIG_H */