projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: zynq: Do not select options if SPL is not enabled
[oweals/u-boot.git]
/
common
/
usb_hub.c
diff --git
a/common/usb_hub.c
b/common/usb_hub.c
index a92c9fb73d01c6fe774bb29adcf8235bc988e220..e1de813adf82225ab4f7204088a698eeb782b0e4 100644
(file)
--- a/
common/usb_hub.c
+++ b/
common/usb_hub.c
@@
-31,6
+31,9
@@
#include <asm/unaligned.h>
#include <linux/ctype.h>
#include <asm/byteorder.h>
#include <asm/unaligned.h>
#include <linux/ctype.h>
#include <asm/byteorder.h>
+#ifdef CONFIG_SANDBOX
+#include <asm/state.h>
+#endif
#include <asm/unaligned.h>
#include <dm/root.h>
#include <asm/unaligned.h>
#include <dm/root.h>
@@
-466,7
+469,12
@@
static int usb_hub_configure(struct usb_device *dev)
unsigned short portstatus, portchange;
int ret;
ulong start = get_timer(0);
unsigned short portstatus, portchange;
int ret;
ulong start = get_timer(0);
+ uint delay = CONFIG_SYS_HZ;
+#ifdef CONFIG_SANDBOX
+ if (state_get_skip_delays())
+ delay = 0;
+#endif
#ifdef CONFIG_DM_USB
debug("\n\nScanning '%s' port %d\n", dev->dev->name, i + 1);
#else
#ifdef CONFIG_DM_USB
debug("\n\nScanning '%s' port %d\n", dev->dev->name, i + 1);
#else
@@
-498,7
+506,7
@@
static int usb_hub_configure(struct usb_device *dev)
if (portstatus & USB_PORT_STAT_CONNECTION)
break;
if (portstatus & USB_PORT_STAT_CONNECTION)
break;
- } while (get_timer(start) <
CONFIG_SYS_HZ * 1
);
+ } while (get_timer(start) <
delay
);
if (ret < 0)
continue;
if (ret < 0)
continue;