From: Andreas Engel <andreas.engel@ericsson.com>
Date: Wed, 9 Jan 2008 16:10:56 +0000 (+0100)
Subject: Make bootretry work when command line editing is enabled
X-Git-Tag: v1.3.2-rc1~102^2~6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=00ac50e348d1bace27a174b7f528d113bc7cdf7f;p=u-boot

Make bootretry work when command line editing is enabled

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>
---

diff --git a/common/main.c b/common/main.c
index 1c7d73e5db..163ba02e62 100644
--- a/common/main.c
+++ b/common/main.c
@@ -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')) {