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 d6542e50f2e916c95cdfa41702d568f07b6fe9c9..4de6892a01b845262aefe40cfea0da550b7e8f5c 100644 (file)
--- a/cmd/nand.c
+++ b/cmd/nand.c
@@ -20,20 +20,23 @@
  */
 
 #include <common.h>
+#include <image.h>
 #include <linux/mtd/mtd.h>
 #include <command.h>
 #include <console.h>
+#include <env.h>
 #include <watchdog.h>
 #include <malloc.h>
 #include <asm/byteorder.h>
 #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
@@ -128,7 +131,7 @@ static int set_dev(int dev)
        nand_curr_device = dev;
 
 #ifdef CONFIG_SYS_NAND_SELECT_DEVICE
-       board_nand_select_device(mtd->priv, dev);
+       board_nand_select_device(mtd_to_nand(mtd), dev);
 #endif
 
        return 0;
@@ -305,9 +308,9 @@ static void nand_print_and_set_info(int idx)
        printf("  bbt options 0x%08x\n", chip->bbt_options);
 
        /* Set geometry info */
-       setenv_hex("nand_writesize", mtd->writesize);
-       setenv_hex("nand_oobsize", mtd->oobsize);
-       setenv_hex("nand_erasesize", mtd->erasesize);
+       env_set_hex("nand_writesize", mtd->writesize);
+       env_set_hex("nand_oobsize", mtd->oobsize);
+       env_set_hex("nand_erasesize", mtd->erasesize);
 }
 
 static int raw_access(struct mtd_info *mtd, ulong addr, loff_t off,
@@ -383,7 +386,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #else
        int quiet = 0;
 #endif
-       const char *quiet_str = getenv("quiet");
+       const char *quiet_str = env_get("quiet");
        int dev = nand_curr_device;
        int repeat = flag & CMD_FLAG_REPEAT;
 
@@ -846,7 +849,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, struct mtd_info *mtd,
        int r;
        char *s;
        size_t cnt;
-#if defined(CONFIG_IMAGE_FORMAT_LEGACY)
+#if defined(CONFIG_LEGACY_IMAGE_FORMAT)
        image_header_t *hdr;
 #endif
 #if defined(CONFIG_FIT)
@@ -874,7 +877,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, struct mtd_info *mtd,
        bootstage_mark(BOOTSTAGE_ID_NAND_HDR_READ);
 
        switch (genimg_get_format ((void *)addr)) {
-#if defined(CONFIG_IMAGE_FORMAT_LEGACY)
+#if defined(CONFIG_LEGACY_IMAGE_FORMAT)
        case IMAGE_FORMAT_LEGACY:
                hdr = (image_header_t *)addr;
 
@@ -923,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);
 }
@@ -966,11 +969,11 @@ static int do_nandboot(cmd_tbl_t *cmdtp, int flag, int argc,
        switch (argc) {
        case 1:
                addr = CONFIG_SYS_LOAD_ADDR;
-               boot_device = getenv("bootdevice");
+               boot_device = env_get("bootdevice");
                break;
        case 2:
                addr = simple_strtoul(argv[1], NULL, 16);
-               boot_device = getenv("bootdevice");
+               boot_device = env_get("bootdevice");
                break;
        case 3:
                addr = simple_strtoul(argv[1], NULL, 16);