diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/Kconfig | 12 | ||||
| -rw-r--r-- | common/Makefile | 2 | ||||
| -rw-r--r-- | common/console.c | 2 | ||||
| -rw-r--r-- | common/main.c | 1 |
4 files changed, 3 insertions, 14 deletions
diff --git a/common/Kconfig b/common/Kconfig index 5c66fd9156..7ff62552cb 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1154,15 +1154,3 @@ config FDT_SIMPLEFB config IO_TRACE bool - -config USB_HUB_DEBOUNCE_TIMEOUT - int "Timeout in milliseconds for USB HUB connection" - depends on USB - default 1000 - help - Value in milliseconds of the USB connection timeout, the max delay to - wait the hub port status to be connected steadily after being powered - off and powered on in the usb hub driver. - This define allows to increase the HUB_DEBOUNCE_TIMEOUT default - value = 1s because some usb device needs around 1.5s to be initialized - and a 2s value should solve detection issue on problematic USB keys. diff --git a/common/Makefile b/common/Makefile index 252e9656df..a50302d8b5 100644 --- a/common/Makefile +++ b/common/Makefile @@ -24,7 +24,7 @@ obj-$(CONFIG_CMD_MII) += miiphyutil.o obj-$(CONFIG_PHYLIB) += miiphyutil.o obj-$(CONFIG_USB_HOST) += usb.o usb_hub.o -obj-$(CONFIG_USB_GADGET) += usb.o usb_hub.o +obj-$(CONFIG_USB_GADGET) += usb.o obj-$(CONFIG_USB_STORAGE) += usb_storage.o obj-$(CONFIG_USB_ONBOARD_HUB) += usb_onboard_hub.o diff --git a/common/console.c b/common/console.c index e4301a4932..71ad8efd6f 100644 --- a/common/console.c +++ b/common/console.c @@ -842,7 +842,7 @@ int console_record_readline(char *str, int maxlen) return -ENOSPC; return membuff_readline((struct membuff *)&gd->console_out, str, - maxlen, ' '); + maxlen, '\0'); } int console_record_avail(void) diff --git a/common/main.c b/common/main.c index 682f3359ea..7c70de2e59 100644 --- a/common/main.c +++ b/common/main.c @@ -13,6 +13,7 @@ #include <command.h> #include <console.h> #include <env.h> +#include <fdtdec.h> #include <init.h> #include <net.h> #include <version_string.h> |