Command usage cleanup

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

diff --git a/common/cmd_autoscript.c b/common/cmd_autoscript.c
index 932f6388ff699a744d379406dce6555ee49a13f7..e5a9bc02db23b05374a572cd99b97e856839f72a 100644 (file)
--- a/common/cmd_autoscript.c
+++ b/common/cmd_autoscript.c
@@ -43,16 +43,14 @@
 #if defined(CONFIG_8xx)
 #include <mpc8xx.h>
 #endif
-#ifdef CFG_HUSH_PARSER
+#ifdef CONFIG_SYS_HUSH_PARSER
 #include <hush.h>
 #endif
 
-#if defined(CONFIG_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT)
-
 int
 autoscript (ulong addr, const char *fit_uname)
 {
-       ulong           len;
+       ulong           len;
        image_header_t  *hdr;
        ulong           *data;
        char            *cmd;
@@ -166,7 +164,7 @@ autoscript (ulong addr, const char *fit_uname)
        memmove (cmd, (char *)data, len);
        *(cmd + len) = 0;
 
-#ifdef CFG_HUSH_PARSER /*?? */
+#ifdef CONFIG_SYS_HUSH_PARSER /*?? */
        rcode = parse_string_outer (cmd, FLAG_PARSE_SEMICOLON);
 #else
        {
@@ -182,7 +180,7 @@ autoscript (ulong addr, const char *fit_uname)
                        if (*next == '\n') {
                                *next = '\0';
                                /* run only non-empty commands */
-                               if ((next - line) > 1) {
+                               if (*line) {
                                        debug ("** exec: \"%s\"\n",
                                                line);
                                        if (run_command (line, 0) < 0) {
@@ -194,14 +192,14 @@ autoscript (ulong addr, const char *fit_uname)
                        }
                        ++next;
                }
+               if (rcode == 0 && *line)
+                       rcode = (run_command(line, 0) >= 0);
        }
 #endif
        free (cmd);
        return rcode;
 }
 
-#endif
-
 /**************************************************/
 #if defined(CONFIG_CMD_AUTOSCRIPT)
 int
@@ -213,7 +211,7 @@ do_autoscript (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        /* Find script image */
        if (argc < 2) {
-               addr = CFG_LOAD_ADDR;
+               addr = CONFIG_SYS_LOAD_ADDR;
                debug ("*  autoscr: default load address = 0x%08lx\n", addr);
 #if defined(CONFIG_FIT)
        } else if (fit_parse_subimage (argv[1], load_addr, &addr, &fit_uname)) {
@@ -232,7 +230,7 @@ do_autoscript (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        autoscr, 2, 0,  do_autoscript,
-       "autoscr - run script from memory\n",
+       "run script from memory",
        "[addr] - run script starting at addr"
        " - A valid autoscr header must be present\n"
 #if defined(CONFIG_FIT)