common: Move and rename CONFIG_SYS_SUPPORT_64BIT_DATA

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

diff --git a/cmd/nand.c b/cmd/nand.c
index 27efef20bc95c0962a62c473521b9cb861fd2166..4de6892a01b845262aefe40cfea0da550b7e8f5c 100644 (file)
--- a/cmd/nand.c
+++ b/cmd/nand.c
@@ -20,6 +20,7 @@
  */
 
 #include <common.h>
+#include <image.h>
 #include <linux/mtd/mtd.h>
 #include <command.h>
 #include <console.h>
@@ -30,11 +31,12 @@
 #include <jffs2/jffs2.h>
 #include <nand.h>
 
+#include "legacy-mtd-utils.h"
+
 #if defined(CONFIG_CMD_MTDPARTS)
 
 /* partition handling routines */
 int mtdparts_init(void);
-int id_parse(const char *id, const char **ret_id, u8 *dev_type, u8 *dev_num);
 int find_dev_and_part(const char *id, struct mtd_device **dev,
                      u8 *part_num, struct part_info **part);
 #endif
@@ -924,7 +926,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, struct mtd_info *mtd,
 
        /* Loading ok, update default load address */
 
-       load_addr = addr;
+       image_load_addr = addr;
 
        return bootm_maybe_autostart(cmdtp, cmd);
 }