]> git.sur5r.net Git - u-boot/commitdiff
Make bootretry work when command line editing is enabled
authorAndreas Engel <andreas.engel@ericsson.com>
Wed, 9 Jan 2008 16:10:56 +0000 (17:10 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 12 Jan 2008 20:14:14 +0000 (21:14 +0100)
Currently, when CONFIG_CMDLINE_EDITING is set, bootretry doesn't work.
This patch fixes the problem.

Signed-off-by: Andreas Engel <andreas.engel@ericsson.com>
common/main.c

index 1c7d73e5dba58212bc9541ab560375f644fd87b1..163ba02e62b0df0ef4f37afa6172259abe6a4f70 100644 (file)
@@ -709,6 +709,13 @@ static int cread_line(const char *const prompt, char *buf, unsigned int *len)
 
        while (1) {
                rlen = 1;
+#ifdef CONFIG_BOOT_RETRY_TIME
+               while (!tstc()) {       /* while no incoming data */
+                       if (retry_time >= 0 && get_ticks() > endtime)
+                               return (-2);    /* timed out */
+               }
+#endif
+
                ichar = getcmd_getch();
 
                if ((ichar == '\n') || (ichar == '\r')) {