efi_loader: Add exit support

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

diff --git a/cmd/gpt.c b/cmd/gpt.c
index d94d5530bc6fab6194a92cdd4b089dbbcf1f24af..8ffaef30f568bd807669b93090eb8b3a802aa891 100644 (file)
--- a/cmd/gpt.c
+++ b/cmd/gpt.c
@@ -168,7 +168,7 @@ static bool found_key(const char *str, const char *key)
  * @return - zero on success, otherwise error
  *
  */
-static int set_gpt_info(block_dev_desc_t *dev_desc,
+static int set_gpt_info(struct blk_desc *dev_desc,
                        const char *str_part,
                        char **str_disk_guid,
                        disk_partition_t **partitions,
@@ -328,7 +328,7 @@ err:
        return errno;
 }
 
-static int gpt_default(block_dev_desc_t *blk_dev_desc, const char *str_part)
+static int gpt_default(struct blk_desc *blk_dev_desc, const char *str_part)
 {
        int ret;
        char *str_disk_guid;
@@ -356,7 +356,7 @@ static int gpt_default(block_dev_desc_t *blk_dev_desc, const char *str_part)
        return ret;
 }
 
-static int gpt_verify(block_dev_desc_t *blk_dev_desc, const char *str_part)
+static int gpt_verify(struct blk_desc *blk_dev_desc, const char *str_part)
 {
        ALLOC_CACHE_ALIGN_BUFFER_PAD(gpt_header, gpt_head, 1,
                                     blk_dev_desc->blksz);
@@ -408,7 +408,7 @@ static int do_gpt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        int ret = CMD_RET_SUCCESS;
        int dev = 0;
        char *ep;
-       block_dev_desc_t *blk_dev_desc = NULL;
+       struct blk_desc *blk_dev_desc = NULL;
 
        if (argc < 4 || argc > 5)
                return CMD_RET_USAGE;
@@ -418,7 +418,7 @@ static int do_gpt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                printf("'%s' is not a number\n", argv[3]);
                return CMD_RET_USAGE;
        }
-       blk_dev_desc = get_dev(argv[2], dev);
+       blk_dev_desc = blk_get_dev(argv[2], dev);
        if (!blk_dev_desc) {
                printf("%s: %s dev %d NOT available\n",
                       __func__, argv[2], dev);