86xx: Report which "bank" of NOR flash we are booting from on MPC8641HPCN

[u-boot] / common / cmd_load.c

diff --git a/common/cmd_load.c b/common/cmd_load.c
index 65a4d692a9fa6dc1a07ac4194cd78bd0c46e9481..73fbf743c9b7097116cf31bf59f06e628cd7b26f 100644 (file)
--- a/common/cmd_load.c
+++ b/common/cmd_load.c
@@ -513,12 +513,13 @@ int do_load_serial_bin (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                }
        }
 
-#ifdef CONFIG_AUTOSCRIPT
+#ifdef CONFIG_SOURCE
        if (load_addr) {
                char *s;
 
                if (((s = getenv("autoscript")) != NULL) && (strcmp(s,"yes") == 0)) {
-                       printf ("Running autoscript at addr 0x%08lX", load_addr);
+                       printf ("Running \"source\" command at addr 0x%08lX",
+                               load_addr);
 
                        s = getenv ("autoscript_uname");
                        if (s)
@@ -526,7 +527,7 @@ int do_load_serial_bin (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        else
                                puts (" ...\n");
 
-                       rcode = autoscript (load_addr, s);
+                       rcode = source (load_addr, s);
                }
        }
 #endif
@@ -1045,18 +1046,18 @@ static ulong load_serial_ymodem (ulong offset)
 #ifdef CONFIG_SYS_LOADS_BAUD_CHANGE
 U_BOOT_CMD(
        loads, 3, 0,    do_load_serial,
-       "loads   - load S-Record file over serial line\n",
+       "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 */
 U_BOOT_CMD(
        loads, 2, 0,    do_load_serial,
-       "loads   - load S-Record file over serial line\n",
+       "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 */
 
@@ -1069,17 +1070,17 @@ U_BOOT_CMD(
 #ifdef CONFIG_SYS_LOADS_BAUD_CHANGE
 U_BOOT_CMD(
        saves, 4, 0,    do_save_serial,
-       "saves   - save S-Record file over serial line\n",
+       "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,
-       "saves   - save S-Record file over serial line\n",
+       "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
@@ -1089,18 +1090,18 @@ U_BOOT_CMD(
 #if defined(CONFIG_CMD_LOADB)
 U_BOOT_CMD(
        loadb, 3, 0,    do_load_serial_bin,
-       "loadb   - load binary file over serial line (kermit mode)\n",
+       "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(
        loady, 3, 0,    do_load_serial_bin,
-       "loady   - load binary file over serial line (ymodem mode)\n",
+       "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
@@ -1119,7 +1120,7 @@ int do_hwflow (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        if (strcmp(argv[1], "on") == 0)
                                hwflow_onoff(1);
                        else
-                               printf("Usage: %s\n", cmdtp->usage);
+                               cmd_usage(cmdtp);
        }
        printf("RTS/CTS hardware flow control: %s\n", hwflow_onoff(0) ? "on" : "off");
        return 0;
@@ -1129,8 +1130,8 @@ int do_hwflow (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        hwflow, 2, 0,   do_hwflow,
-       "hwflow  - turn the harwdare flow control on/off\n",
-       "[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