summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-06-10 20:37:00 -0400
committerTom Rini <trini@ti.com>2014-06-10 20:37:00 -0400
commit61e76f53708cf082ef9061a140b57df3513b8ba1 (patch)
tree5a25ff73cda65afe0bfdaa1af7884ca0125ad288 /include
parent76b21026ceb5a6a83fc53b0ecdf425f240318022 (diff)
parent3d83e6752d5595351a47309aab0749984c5909b7 (diff)
downloadblackbird-obmc-uboot-61e76f53708cf082ef9061a140b57df3513b8ba1.tar.gz
blackbird-obmc-uboot-61e76f53708cf082ef9061a140b57df3513b8ba1.zip
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'include')
-rw-r--r--include/configs/cm_t35.h2
-rw-r--r--include/configs/gw_ventana.h1
2 files changed, 0 insertions, 3 deletions
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 8c60e22c1d..5c484ef078 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -104,8 +104,6 @@
#define CONFIG_USB_DEVICE
#define CONFIG_USB_TTY
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-/* This delay is really for slow-to-power-on USB sticks, not the hub */
-#define CONFIG_USB_HUB_MIN_POWER_ON_DELAY 500
/* commands to include */
#include <config_cmd_default.h>
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index cd554957dd..f41c96ea7f 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -192,7 +192,6 @@
#define CONFIG_USB_ETH_CDC
#define CONFIG_NETCONSOLE
#define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
-#define CONFIG_USB_HUB_MIN_POWER_ON_DELAY 1200
/* Framebuffer and LCD */
#define CONFIG_VIDEO
OpenPOWER on IntegriCloud