common: cli_readline: Ensure to call show_activity anytime U-Boot is waiting for...

diff --git a/common/bootretry.c b/common/bootretry.c
index 2d82798cd04bc6ba004d2382ceaab79637c79a85..6ba48d400a1f4dc435304a650ee15907d63293ca 100644 (file)
--- a/common/bootretry.c
+++ b/common/bootretry.c
@@ -47,6 +47,9 @@ int bootretry_tstc_timeout(void)
        while (!tstc()) {       /* while no incoming data */
                if (retry_time >= 0 && get_ticks() > endtime)
                        return -ETIMEDOUT;
+#ifdef CONFIG_SHOW_ACTIVITY
+               show_activity(0);
+#endif
                WATCHDOG_RESET();
        }
 

diff --git a/common/cli_readline.c b/common/cli_readline.c
index ecded11ca3985f27b132ef4d20f7e79ee02c8379..b68a5279773d88f6b57c9d971c2e66606217cc05 100644 (file)
--- a/common/cli_readline.c
+++ b/common/cli_readline.c
@@ -261,12 +261,16 @@ static int cread_line(const char *const prompt, char *buf, unsigned int *len,
        while (1) {
                if (bootretry_tstc_timeout())
                        return -2;      /* timed out */
-               if (first && timeout) {
+
+               if (first) {
                        uint64_t etime = endtick(timeout);
 
                        while (!tstc()) {       /* while no incoming data */
-                               if (get_ticks() >= etime)
+                               if (timeout && get_ticks() >= etime)
                                        return -2;      /* timed out */
+#ifdef CONFIG_SHOW_ACTIVITY
+                               show_activity(0);
+#endif
                                WATCHDOG_RESET();
                        }
                        first = 0;