Merge branch 'master' of git://git.denx.de/u-boot-fdt

[platform/kernel/u-boot.git] / common / cmd_load.c

diff --git a/common/cmd_load.c b/common/cmd_load.c
index 1351fe2..d5eaac7 100644 (file)
--- a/common/cmd_load.c
+++ b/common/cmd_load.c
@@ -58,7 +58,7 @@ int do_load_serial (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        int i;
        char *env_echo;
        int rcode = 0;
-#ifdef CFG_LOADS_BAUD_CHANGE
+#ifdef CONFIG_SYS_LOADS_BAUD_CHANGE
        int load_baudrate, current_baudrate;
 
        load_baudrate = current_baudrate = gd->baudrate;
@@ -70,7 +70,7 @@ int do_load_serial (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                do_echo = 0;
        }
 
-#ifdef CFG_LOADS_BAUD_CHANGE
+#ifdef CONFIG_SYS_LOADS_BAUD_CHANGE
        if (argc >= 2) {
                offset = simple_strtol(argv[1], NULL, 16);
        }
@@ -93,11 +93,11 @@ int do_load_serial (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                                break;
                }
        }
-#else  /* ! CFG_LOADS_BAUD_CHANGE */
+#else  /* ! CONFIG_SYS_LOADS_BAUD_CHANGE */
        if (argc == 2) {
                offset = simple_strtol(argv[1], NULL, 16);
        }
-#endif /* CFG_LOADS_BAUD_CHANGE */
+#endif /* CONFIG_SYS_LOADS_BAUD_CHANGE */
 
        printf ("## Ready for S-Record download ...\n");
 
@@ -123,7 +123,7 @@ int do_load_serial (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                load_addr = addr;
        }
 
-#ifdef CFG_LOADS_BAUD_CHANGE
+#ifdef CONFIG_SYS_LOADS_BAUD_CHANGE
        if (load_baudrate != current_baudrate) {
                printf ("## Switch baudrate to %d bps and press ESC ...\n",
                        current_baudrate);
@@ -167,7 +167,7 @@ load_serial (long offset)
                case SREC_DATA3:
                case SREC_DATA4:
                    store_addr = addr + offset;
-#ifndef CFG_NO_FLASH
+#ifndef CONFIG_SYS_NO_FLASH
                    if (addr2info(store_addr)) {
                        int rc;
 
@@ -259,7 +259,7 @@ int do_save_serial (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
        ulong offset = 0;
        ulong size   = 0;
-#ifdef CFG_LOADS_BAUD_CHANGE
+#ifdef CONFIG_SYS_LOADS_BAUD_CHANGE
        int save_baudrate, current_baudrate;
 
        save_baudrate = current_baudrate = gd->baudrate;
@@ -268,7 +268,7 @@ int do_save_serial (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        if (argc >= 2) {
                offset = simple_strtoul(argv[1], NULL, 16);
        }
-#ifdef CFG_LOADS_BAUD_CHANGE
+#ifdef CONFIG_SYS_LOADS_BAUD_CHANGE
        if (argc >= 3) {
                size = simple_strtoul(argv[2], NULL, 16);
        }
@@ -291,11 +291,11 @@ int do_save_serial (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                                break;
                }
        }
-#else  /* ! CFG_LOADS_BAUD_CHANGE */
+#else  /* ! CONFIG_SYS_LOADS_BAUD_CHANGE */
        if (argc == 3) {
                size = simple_strtoul(argv[2], NULL, 16);
        }
-#endif /* CFG_LOADS_BAUD_CHANGE */
+#endif /* CONFIG_SYS_LOADS_BAUD_CHANGE */
 
        printf ("## Ready for S-Record upload, press ENTER to proceed ...\n");
        for (;;) {
@@ -307,7 +307,7 @@ int do_save_serial (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        } else {
                printf ("## S-Record upload complete\n");
        }
-#ifdef CFG_LOADS_BAUD_CHANGE
+#ifdef CONFIG_SYS_LOADS_BAUD_CHANGE
        if (save_baudrate != current_baudrate) {
                printf ("## Switch baudrate to %d bps and press ESC ...\n",
                        (int)current_baudrate);
@@ -441,8 +441,8 @@ int do_load_serial_bin (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        int rcode = 0;
        char *s;
 
-       /* pre-set offset from CFG_LOAD_ADDR */
-       offset = CFG_LOAD_ADDR;
+       /* pre-set offset from CONFIG_SYS_LOAD_ADDR */
+       offset = CONFIG_SYS_LOAD_ADDR;
 
        /* pre-set offset from $loadaddr */
        if ((s = getenv("loadaddr")) != NULL) {
@@ -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
@@ -1001,7 +1002,7 @@ static ulong load_serial_ymodem (ulong offset)
                        store_addr = addr + offset;
                        size += res;
                        addr += res;
-#ifndef CFG_NO_FLASH
+#ifndef CONFIG_SYS_NO_FLASH
                        if (addr2info (store_addr)) {
                                int rc;
 
@@ -1042,23 +1043,23 @@ static ulong load_serial_ymodem (ulong offset)
 
 #if defined(CONFIG_CMD_LOADS)
 
-#ifdef CFG_LOADS_BAUD_CHANGE
+#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"
 );
 
-#else  /* ! CFG_LOADS_BAUD_CHANGE */
+#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"
 );
-#endif /* CFG_LOADS_BAUD_CHANGE */
+#endif /* CONFIG_SYS_LOADS_BAUD_CHANGE */
 
 /*
  * SAVES always requires LOADS support, but not vice versa
@@ -1066,22 +1067,22 @@ U_BOOT_CMD(
 
 
 #if defined(CONFIG_CMD_SAVES)
-#ifdef CFG_LOADS_BAUD_CHANGE
+#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"
 );
-#else  /* ! CFG_LOADS_BAUD_CHANGE */
+#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"
 );
-#endif /* CFG_LOADS_BAUD_CHANGE */
+#endif /* CONFIG_SYS_LOADS_BAUD_CHANGE */
 #endif
 #endif
 
@@ -1089,7 +1090,7 @@ 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"
@@ -1097,7 +1098,7 @@ U_BOOT_CMD(
 
 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"
@@ -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,7 +1130,7 @@ 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",
+       "turn the harwdare flow control on/off",
        "[on|off]\n - change RTS/CTS hardware flow control over serial line\n"
 );