ARM: imx: ddr: Add missing PHY reset

[oweals/u-boot.git] / common / cli_readline.c

diff --git a/common/cli_readline.c b/common/cli_readline.c
index 60a232b065e821bd3294f10fa3b39b6daf99ad48..1f1e28c6d85787983adb683379e3b4acbdb047c0 100644 (file)
--- a/common/cli_readline.c
+++ b/common/cli_readline.c
@@ -11,6 +11,8 @@
 #include <common.h>
 #include <bootretry.h>
 #include <cli.h>
+#include <command.h>
+#include <time.h>
 #include <watchdog.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -273,6 +275,10 @@ static int cread_line(const char *const prompt, char *buf, unsigned int *len,
 
                ichar = getcmd_getch();
 
+               /* ichar=0x0 when error occurs in U-Boot getc */
+               if (!ichar)
+                       continue;
+
                if ((ichar == '\n') || (ichar == '\r')) {
                        putc('\n');
                        break;
@@ -565,12 +571,6 @@ int cli_readline_into_buffer(const char *const prompt, char *buffer,
                        return -2;      /* timed out */
                WATCHDOG_RESET();       /* Trigger watchdog, if needed */
 
-#ifdef CONFIG_SHOW_ACTIVITY
-               while (!tstc()) {
-                       show_activity(0);
-                       WATCHDOG_RESET();
-               }
-#endif
                c = getc();
 
                /*