Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / cmd / unzip.c

diff --git a/cmd/unzip.c b/cmd/unzip.c
index 0686be68ce0a857ead08ff840a23c444284f30fb..f7aabf72d1e73ae64c5255adf8299bac3aeb45da 100644 (file)
--- a/cmd/unzip.c
+++ b/cmd/unzip.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -29,7 +28,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 +42,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 +52,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;