* add WATCHDOG_RESET to !tstc() loops
* prevents watchdog timeout, while waiting for input, 
  if CONFIG_BOOT_RETRY_TIME or CONFIG_SHOW_ACTIVITY defined


Signed-off-by: Jens Scharsig <js_at...@scharsoft.de>
---
 common/main.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/common/main.c b/common/main.c
index 3949a5b..f7e7c1c 100644
--- a/common/main.c
+++ b/common/main.c
@@ -730,6 +730,7 @@ static int cread_line(const char *const prompt, char *buf, 
unsigned int *len)
                while (!tstc()) {       /* while no incoming data */
                        if (retry_time >= 0 && get_ticks() > endtime)
                                return (-2);    /* timed out */
+                       WATCHDOG_RESET();
                }
 #endif
 
@@ -997,6 +998,7 @@ int readline_into_buffer (const char *const prompt, char * 
buffer)
                while (!tstc()) {       /* while no incoming data */
                        if (retry_time >= 0 && get_ticks() > endtime)
                                return (-2);    /* timed out */
+                       WATCHDOG_RESET();
                }
 #endif
                WATCHDOG_RESET();               /* Trigger watchdog, if needed 
*/
@@ -1005,6 +1007,7 @@ int readline_into_buffer (const char *const prompt, char 
* buffer)
                while (!tstc()) {
                        extern void show_activity(int arg);
                        show_activity(0);
+                       WATCHDOG_RESET();
                }
 #endif
                c = getc();
-- 
1.6.0.2

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to