Merge branch 'next' of https://source.denx.de/u-boot/custodians/u-boot-sh into next

[platform/kernel/u-boot.git] / cmd / ab_select.c

diff --git a/cmd/ab_select.c b/cmd/ab_select.c
index 7c8f2ee..3e46663 100644 (file)
--- a/cmd/ab_select.c
+++ b/cmd/ab_select.c
@@ -3,15 +3,18 @@
  * Copyright (C) 2017 The Android Open Source Project
  */
 
+#include <common.h>
 #include <android_ab.h>
 #include <command.h>
+#include <env.h>
+#include <part.h>
 
-static int do_ab_select(cmd_tbl_t *cmdtp, int flag, int argc,
-                       char * const argv[])
+static int do_ab_select(struct cmd_tbl *cmdtp, int flag, int argc,
+                       char *const argv[])
 {
        int ret;
        struct blk_desc *dev_desc;
-       disk_partition_t part_info;
+       struct disk_partition part_info;
        char slot[2];
 
        if (argc != 4)
@@ -19,7 +22,8 @@ static int do_ab_select(cmd_tbl_t *cmdtp, int flag, int argc,
 
        /* Lookup the "misc" partition from argv[2] and argv[3] */
        if (part_get_info_by_dev_and_name_or_num(argv[2], argv[3],
-                                                &dev_desc, &part_info) < 0) {
+                                                &dev_desc, &part_info,
+                                                false) < 0) {
                return CMD_RET_FAILURE;
        }