mtd: nand: spi: Support GigaDevice GD5F1GQ5UExxG

[pandora-u-boot.git] / cmd / load.c

diff --git a/cmd/load.c b/cmd/load.c
index 9a3a169..5bbc39b 100644 (file)
--- a/cmd/load.c
+++ b/cmd/load.c
@@ -20,6 +20,7 @@
 #include <serial.h>
 #include <xyzModem.h>
 #include <asm/cache.h>
+#include <asm/global_data.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -228,12 +229,11 @@ static int read_record(char *buf, ulong len)
                        *p = c;
                }
 
-           /* Check for the console hangup (if any different from serial) */
-           if (gd->jt->getc != getchar) {
-               if (ctrlc()) {
-                   return (-1);
+               /* Check for the console hangup (if any different from serial) */
+               if (gd->jt->getc != getchar) {
+                       if (ctrlc())
+                               return (-1);
                }
-           }
        }
 
        /* line too long - truncate */
@@ -1066,25 +1066,25 @@ U_BOOT_CMD(
 U_BOOT_CMD(
        loadb, 3, 0,    do_load_serial_bin,
        "load binary file over serial line (kermit mode)",
-       "[ off ] [ baud ]\n"
+       "[ addr [ baud ] ]\n"
        "    - load binary file over serial line"
-       " with offset 'off' and baudrate 'baud'"
+       " at address 'addr' with baudrate 'baud'"
 );
 
 U_BOOT_CMD(
        loadx, 3, 0,    do_load_serial_bin,
        "load binary file over serial line (xmodem mode)",
-       "[ off ] [ baud ]\n"
+       "[ addr [ baud ] ]\n"
        "    - load binary file over serial line"
-       " with offset 'off' and baudrate 'baud'"
+       " at address 'addr' with baudrate 'baud'"
 );
 
 U_BOOT_CMD(
        loady, 3, 0,    do_load_serial_bin,
        "load binary file over serial line (ymodem mode)",
-       "[ off ] [ baud ]\n"
+       "[ addr [ baud ] ]\n"
        "    - load binary file over serial line"
-       " with offset 'off' and baudrate 'baud'"
+       " at address 'addr' with baudrate 'baud'"
 );
 
 #endif /* CONFIG_CMD_LOADB */