Merge git://git.denx.de/u-boot-mmc

[people/ms/u-boot.git] / cmd / nand.c

diff --git a/cmd/nand.c b/cmd/nand.c
index a2152ec8260e0546a5a19dbfd9bec8d0201ac7a3..a22945d144b32b9a8f37f734b837ffb34ab81629 100644 (file)
--- a/cmd/nand.c
+++ b/cmd/nand.c
@@ -305,9 +305,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 +383,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;
 
@@ -966,11 +966,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);