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

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

diff --git a/cmd/unzip.c b/cmd/unzip.c
index 0686be68ce0a857ead08ff840a23c444284f30fb..94f883f92a356cc7ff774192075ef0a7709de171 100644 (file)
--- a/cmd/unzip.c
+++ b/cmd/unzip.c
@@ -29,7 +29,7 @@ static int do_unzip(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                return 1;
 
        printf("Uncompressed size: %ld = 0x%lX\n", src_len, src_len);
-       setenv_hex("filesize", src_len);
+       env_set_hex("filesize", src_len);
 
        return 0;
 }
@@ -43,7 +43,7 @@ U_BOOT_CMD(
 static int do_gzwrite(cmd_tbl_t *cmdtp, int flag,
                      int argc, char * const argv[])
 {
-       block_dev_desc_t *bdev;
+       struct blk_desc *bdev;
        int ret;
        unsigned char *addr;
        unsigned long length;
@@ -53,7 +53,7 @@ static int do_gzwrite(cmd_tbl_t *cmdtp, int flag,
 
        if (argc < 5)
                return CMD_RET_USAGE;
-       ret = get_device(argv[1], argv[2], &bdev);
+       ret = blk_get_device_by_str(argv[1], argv[2], &bdev);
        if (ret < 0)
                return CMD_RET_FAILURE;