driver/serial: delete at91rm9200_usart

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

diff --git a/common/cmd_load.c b/common/cmd_load.c
index d5eaac7351c5c2d043db48b30f15cff9eb25f8e8..dad03037a08d4cf6469b9b1645096d98bda29885 100644 (file)
--- a/common/cmd_load.c
+++ b/common/cmd_load.c
@@ -51,7 +51,7 @@ static int do_echo = 1;
 /* -------------------------------------------------------------------- */
 
 #if defined(CONFIG_CMD_LOADS)
-int do_load_serial (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_load_serial (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        long offset = 0;
        ulong addr;
@@ -255,7 +255,7 @@ read_record (char *buf, ulong len)
 
 #if defined(CONFIG_CMD_SAVES)
 
-int do_save_serial (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_save_serial (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        ulong offset = 0;
        ulong size   = 0;
@@ -433,7 +433,7 @@ int  his_pad_count;  /* number of pad chars he needs */
 char his_pad_char;   /* pad chars he needs */
 char his_quote;      /* quote chars he'll use */
 
-int do_load_serial_bin (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_load_serial_bin (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        ulong offset = 0;
        ulong addr;
@@ -513,24 +513,6 @@ int do_load_serial_bin (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                }
        }
 
-#ifdef CONFIG_SOURCE
-       if (load_addr) {
-               char *s;
-
-               if (((s = getenv("autoscript")) != NULL) && (strcmp(s,"yes") == 0)) {
-                       printf ("Running "source" command at addr 0x%08lX",
-                               load_addr);
-
-                       s = getenv ("autoscript_uname");
-                       if (s)
-                               printf (":%s ...\n", s);
-                       else
-                               puts (" ...\n");
-
-                       rcode = source (load_addr, s);
-               }
-       }
-#endif
        return rcode;
 }
 
@@ -1049,7 +1031,7 @@ U_BOOT_CMD(
        "load S-Record file over serial line",
        "[ off ] [ baud ]\n"
        "    - load S-Record file over serial line"
-       " with offset 'off' and baudrate 'baud'\n"
+       " with offset 'off' and baudrate 'baud'"
 );
 
 #else  /* ! CONFIG_SYS_LOADS_BAUD_CHANGE */
@@ -1057,7 +1039,7 @@ U_BOOT_CMD(
        loads, 2, 0,    do_load_serial,
        "load S-Record file over serial line",
        "[ off ]\n"
-       "    - load S-Record file over serial line with offset 'off'\n"
+       "    - load S-Record file over serial line with offset 'off'"
 );
 #endif /* CONFIG_SYS_LOADS_BAUD_CHANGE */
 
@@ -1073,14 +1055,14 @@ U_BOOT_CMD(
        "save S-Record file over serial line",
        "[ off ] [size] [ baud ]\n"
        "    - save S-Record file over serial line"
-       " with offset 'off', size 'size' and baudrate 'baud'\n"
+       " with offset 'off', size 'size' and baudrate 'baud'"
 );
 #else  /* ! CONFIG_SYS_LOADS_BAUD_CHANGE */
 U_BOOT_CMD(
        saves, 3, 0,    do_save_serial,
        "save S-Record file over serial line",
        "[ off ] [size]\n"
-       "    - save S-Record file over serial line with offset 'off' and size 'size'\n"
+       "    - save S-Record file over serial line with offset 'off' and size 'size'"
 );
 #endif /* CONFIG_SYS_LOADS_BAUD_CHANGE */
 #endif
@@ -1093,7 +1075,7 @@ U_BOOT_CMD(
        "load binary file over serial line (kermit mode)",
        "[ off ] [ baud ]\n"
        "    - load binary file over serial line"
-       " with offset 'off' and baudrate 'baud'\n"
+       " with offset 'off' and baudrate 'baud'"
 );
 
 U_BOOT_CMD(
@@ -1101,7 +1083,7 @@ U_BOOT_CMD(
        "load binary file over serial line (ymodem mode)",
        "[ off ] [ baud ]\n"
        "    - load binary file over serial line"
-       " with offset 'off' and baudrate 'baud'\n"
+       " with offset 'off' and baudrate 'baud'"
 );
 
 #endif
@@ -1109,7 +1091,7 @@ U_BOOT_CMD(
 /* -------------------------------------------------------------------- */
 
 #if defined(CONFIG_CMD_HWFLOW)
-int do_hwflow (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_hwflow (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        extern int hwflow_onoff(int);
 
@@ -1120,7 +1102,7 @@ int do_hwflow (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        if (strcmp(argv[1], "on") == 0)
                                hwflow_onoff(1);
                        else
-                               cmd_usage(cmdtp);
+                               return cmd_usage(cmdtp);
        }
        printf("RTS/CTS hardware flow control: %s\n", hwflow_onoff(0) ? "on" : "off");
        return 0;
@@ -1130,8 +1112,8 @@ int do_hwflow (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        hwflow, 2, 0,   do_hwflow,
-       "turn the harwdare flow control on/off",
-       "[on|off]\n - change RTS/CTS hardware flow control over serial line\n"
+       "turn RTS/CTS hardware flow control in serial line on/off",
+       "[on|off]"
 );
 
 #endif