Autoboot timeout defined by CONFIG_BOOTDELAY will not be accurate if CONFIG_USB_KEYBOARD and CONFIG_SYS_USB_EVENT_POLL are defined in configuration file and when tstc() function for checking key pressed takes longer time than 10 ms (e.g., 50 ms) to finish.

Signed-off-by: Jim Lin jilin@nvidia.com --- Changes in v2: - use do-while and get_timer to count timeout

common/main.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/common/main.c b/common/main.c index b145f85..4dac01d 100644 --- a/common/main.c +++ b/common/main.c @@ -225,6 +225,7 @@ static inline int abortboot(int bootdelay) { int abort = 0; + unsigned long ts;

#ifdef CONFIG_MENUPROMPT printf(CONFIG_MENUPROMPT); @@ -248,11 +249,10 @@ int abortboot(int bootdelay) #endif

while ((bootdelay > 0) && (!abort)) { - int i; - --bootdelay; - /* delay 100 * 10ms */ - for (i=0; !abort && i<100; ++i) { + /* delay 1000 ms */ + ts = get_timer(0); + do { if (tstc()) { /* we got a key press */ abort = 1; /* don't auto boot */ bootdelay = 0; /* no more delay */ @@ -263,8 +263,7 @@ int abortboot(int bootdelay) # endif break; } - udelay(10000); - } + } while (!abort && get_timer(ts) < 1000);

printf("\b\b\b%2d ", bootdelay); }