rockchip: Remove ARCH= references from documentation

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

diff --git a/cmd/load.c b/cmd/load.c
index 3bfc1b41ecececf359ec609b57270ad3c819caca..63a94145430a8e465cff44b411e565fd8b21ccb0 100644 (file)
--- a/cmd/load.c
+++ b/cmd/load.c
@@ -12,11 +12,15 @@
 #include <console.h>
 #include <cpu_func.h>
 #include <env.h>
+#include <flash.h>
+#include <image.h>
 #include <s_record.h>
 #include <net.h>
 #include <exports.h>
 #include <serial.h>
 #include <xyzModem.h>
+#include <asm/cache.h>
+#include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -38,8 +42,8 @@ static int do_echo = 1;
 /* -------------------------------------------------------------------- */
 
 #if defined(CONFIG_CMD_LOADS)
-static int do_load_serial(cmd_tbl_t *cmdtp, int flag, int argc,
-                         char * const argv[])
+static int do_load_serial(struct cmd_tbl *cmdtp, int flag, int argc,
+                         char *const argv[])
 {
        long offset = 0;
        ulong addr;
@@ -108,7 +112,7 @@ static int do_load_serial(cmd_tbl_t *cmdtp, int flag, int argc,
                rcode = 1;
        } else {
                printf("## Start Addr      = 0x%08lX\n", addr);
-               load_addr = addr;
+               image_load_addr = addr;
        }
 
 #ifdef CONFIG_SYS_LOADS_BAUD_CHANGE
@@ -239,7 +243,8 @@ static int read_record(char *buf, ulong len)
 
 #if defined(CONFIG_CMD_SAVES)
 
-int do_save_serial (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_save_serial(struct cmd_tbl *cmdtp, int flag, int argc,
+                  char *const argv[])
 {
        ulong offset = 0;
        ulong size   = 0;
@@ -416,8 +421,8 @@ static int  his_pad_count;  /* number of pad chars he needs */
 static char his_pad_char;   /* pad chars he needs */
 static char his_quote;      /* quote chars he'll use */
 
-static int do_load_serial_bin(cmd_tbl_t *cmdtp, int flag, int argc,
-                             char * const argv[])
+static int do_load_serial_bin(struct cmd_tbl *cmdtp, int flag, int argc,
+                             char *const argv[])
 {
        ulong offset = 0;
        ulong addr;
@@ -484,12 +489,12 @@ static int do_load_serial_bin(cmd_tbl_t *cmdtp, int flag, int argc,
                addr = load_serial_bin(offset);
 
                if (addr == ~0) {
-                       load_addr = 0;
+                       image_load_addr = 0;
                        printf("## Binary (kermit) download aborted\n");
                        rcode = 1;
                } else {
                        printf("## Start Addr      = 0x%08lX\n", addr);
-                       load_addr = addr;
+                       image_load_addr = addr;
                }
        }
        if (load_baudrate != current_baudrate) {
@@ -980,7 +985,7 @@ static ulong load_serial_ymodem(ulong offset, int mode)
                                rc = flash_write((char *) ymodemBuf,
                                                  store_addr, res);
                                if (rc != 0) {
-                                       flash_perror (rc);
+                                       flash_perror(rc);
                                        return (~0);
                                }
                        } else