flash: Tidy up coding style for flash functions

[oweals/u-boot.git] / common / update.c

diff --git a/common/update.c b/common/update.c
index 457b29f42aa398a934eef4eca4c1825d8f2a2463..c8dd346a0956951a0683679bdd37d13c07383e60 100644 (file)
--- a/common/update.c
+++ b/common/update.c
@@ -7,6 +7,8 @@
  */
 
 #include <common.h>
+#include <cpu_func.h>
+#include <image.h>
 
 #if !(defined(CONFIG_FIT) && defined(CONFIG_OF_LIBFDT))
 #error "CONFIG_FIT and CONFIG_OF_LIBFDT are required for auto-update feature"
@@ -44,7 +46,6 @@
 
 extern ulong tftp_timeout_ms;
 extern int tftp_timeout_count_max;
-extern ulong load_addr;
 #ifdef CONFIG_MTD_NOR_FLASH
 extern flash_info_t flash_info[];
 static uchar *saved_prot_info;
@@ -71,7 +72,7 @@ static int update_load(char *filename, ulong msec_max, int cnt_max, ulong addr)
        env_set("netretry", "no");
 
        /* download the update file */
-       load_addr = addr;
+       image_load_addr = addr;
        copy_filename(net_boot_file_name, filename, sizeof(net_boot_file_name));
        size = net_loop(TFTPGET);