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

[oweals/u-boot.git] / cmd / part.c

diff --git a/cmd/part.c b/cmd/part.c
index ec791fdc5d4cfb0f7017be9686055c24d07017c9..216f14bf5d7844cb5b247f7b87cebc165c351dba 100644 (file)
--- a/cmd/part.c
+++ b/cmd/part.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
  *
@@ -12,26 +13,26 @@
  * (C) Copyright 2003 - 2004
  * Sysgo Real-Time Solutions, AG <www.elinos.com>
  * Pavel Bartusek <pba@sysgo.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <config.h>
 #include <command.h>
+#include <env.h>
 #include <part.h>
 #include <vsprintf.h>
 
 enum cmd_part_info {
        CMD_PART_INFO_START = 0,
        CMD_PART_INFO_SIZE,
+       CMD_PART_INFO_NUMBER
 };
 
-static int do_part_uuid(int argc, char * const argv[])
+static int do_part_uuid(int argc, char *const argv[])
 {
        int part;
        struct blk_desc *dev_desc;
-       disk_partition_t info;
+       struct disk_partition info;
 
        if (argc < 2)
                return CMD_RET_USAGE;
@@ -50,7 +51,7 @@ static int do_part_uuid(int argc, char * const argv[])
        return 0;
 }
 
-static int do_part_list(int argc, char * const argv[])
+static int do_part_list(int argc, char *const argv[])
 {
        int ret;
        struct blk_desc *desc;
@@ -89,9 +90,9 @@ static int do_part_list(int argc, char * const argv[])
        if (var != NULL) {
                int p;
                char str[512] = { '\0', };
-               disk_partition_t info;
+               struct disk_partition info;
 
-               for (p = 1; p < 128; p++) {
+               for (p = 1; p < MAX_SEARCH_PARTITIONS; p++) {
                        char t[5];
                        int r = part_get_info(desc, p, &info);
 
@@ -113,10 +114,10 @@ static int do_part_list(int argc, char * const argv[])
        return 0;
 }
 
-static int do_part_info(int argc, char * const argv[], enum cmd_part_info param)
+static int do_part_info(int argc, char *const argv[], enum cmd_part_info param)
 {
        struct blk_desc *desc;
-       disk_partition_t info;
+       struct disk_partition info;
        char buf[512] = { 0 };
        char *endp;
        int part;
@@ -150,6 +151,9 @@ static int do_part_info(int argc, char * const argv[], enum cmd_part_info param)
        case CMD_PART_INFO_SIZE:
                snprintf(buf, sizeof(buf), LBAF, info.size);
                break;
+       case CMD_PART_INFO_NUMBER:
+               snprintf(buf, sizeof(buf), "0x%x", part);
+               break;
        default:
                printf("** Unknown cmd_part_info value: %d\n", param);
                return 1;
@@ -163,17 +167,23 @@ static int do_part_info(int argc, char * const argv[], enum cmd_part_info param)
        return 0;
 }
 
-static int do_part_start(int argc, char * const argv[])
+static int do_part_start(int argc, char *const argv[])
 {
        return do_part_info(argc, argv, CMD_PART_INFO_START);
 }
 
-static int do_part_size(int argc, char * const argv[])
+static int do_part_size(int argc, char *const argv[])
 {
        return do_part_info(argc, argv, CMD_PART_INFO_SIZE);
 }
 
-static int do_part(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_part_number(int argc, char *const argv[])
+{
+       return do_part_info(argc, argv, CMD_PART_INFO_NUMBER);
+}
+
+static int do_part(struct cmd_tbl *cmdtp, int flag, int argc,
+                  char *const argv[])
 {
        if (argc < 2)
                return CMD_RET_USAGE;
@@ -186,6 +196,8 @@ static int do_part(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                return do_part_start(argc - 2, argv + 2);
        else if (!strcmp(argv[1], "size"))
                return do_part_size(argc - 2, argv + 2);
+       else if (!strcmp(argv[1], "number"))
+               return do_part_number(argc - 2, argv + 2);
 
        return CMD_RET_USAGE;
 }
@@ -207,5 +219,8 @@ U_BOOT_CMD(
        "      part can be either partition number or partition name\n"
        "part size <interface> <dev> <part> <varname>\n"
        "    - set environment variable to the size of the partition (in blocks)\n"
-       "      part can be either partition number or partition name"
+       "      part can be either partition number or partition name\n"
+       "part number <interface> <dev> <part> <varname>\n"
+       "    - set environment variable to the partition number using the partition name\n"
+       "      part must be specified as partition name"
 );