karo: add support for TXA5 (SAMA5D4) modules

[karo-tx-uboot.git] / common / cli_simple.c

diff --git a/common/cli_simple.c b/common/cli_simple.c
index 5b7e2ce7d53a832a71edd7a8ad5f38f1bf7cb899..6c65cc686cb2d86af46574adbefdd9a41a617242 100644 (file)
--- a/common/cli_simple.c
+++ b/common/cli_simple.c
@@ -57,7 +57,7 @@ int cli_simple_parse_line(char *line, char *argv[])
        return nargs;
 }
 
-static void process_macros(const char *input, char *output)
+void cli_simple_process_macros(const char *input, char *output)
 {
        char c, prev;
        const char *varname_start = NULL;
@@ -236,7 +236,7 @@ int cli_simple_run_command(const char *cmd, int flag)
                debug_parser("token: \"%s\"\n", token);
 
                /* find macros in this token and replace them */
-               process_macros(token, finaltoken);
+               cli_simple_process_macros(token, finaltoken);
 
                /* Extract arguments */
                argc = cli_simple_parse_line(finaltoken, argv);
@@ -256,7 +256,7 @@ int cli_simple_run_command(const char *cmd, int flag)
        return rc ? rc : repeatable;
 }
 
-void cli_loop(void)
+void cli_simple_loop(void)
 {
        static char lastcommand[CONFIG_SYS_CBSIZE] = { 0, };
 
@@ -265,14 +265,12 @@ void cli_loop(void)
        int rc = 1;
 
        for (;;) {
-#ifdef CONFIG_BOOT_RETRY_TIME
                if (rc >= 0) {
                        /* Saw enough of a valid command to
                         * restart the timeout.
                         */
-                       reset_cmd_timeout();
+                       bootretry_reset_cmd_timeout();
                }
-#endif
                len = cli_readline(CONFIG_SYS_PROMPT);
 
                flag = 0;       /* assume no special flags for now */
@@ -297,7 +295,7 @@ void cli_loop(void)
                if (len == -1)
                        puts("<INTERRUPT>\n");
                else
-                       rc = run_command(lastcommand, flag);
+                       rc = run_command_repeatable(lastcommand, flag);
 
                if (rc <= 0) {
                        /* invalid command or not repeatable, forget it */
@@ -333,7 +331,7 @@ int cli_simple_run_command_list(char *cmd, int flag)
                ++next;
        }
        if (rcode == 0 && *line)
-               rcode = (cli_simple_run_command(line, 0) >= 0);
+               rcode = (cli_simple_run_command(line, 0) < 0);
 
        return rcode;
 }