arm: mx6: fix NFC clock get/set routines for i.MX6QP,i.MX6UL

[karo-tx-uboot.git] / common / cmd_part.c

diff --git a/common/cmd_part.c b/common/cmd_part.c
index c99f52735f057c92b556bf49a7c0559f1ef66575..b860624d939cad2d6b364e4af544112f56a7203c 100644 (file)
--- a/common/cmd_part.c
+++ b/common/cmd_part.c
@@ -53,29 +53,57 @@ static int do_part_list(int argc, char * const argv[])
 {
        int ret;
        block_dev_desc_t *desc;
+       char *var = NULL;
+       bool bootable = false;
+       int i;
 
-       if (argc < 2 || argc > 3)
+       if (argc < 2)
                return CMD_RET_USAGE;
 
+       if (argc > 2) {
+               for (i = 2; i < argc ; i++) {
+                       if (argv[i][0] == '-') {
+                               if (!strcmp(argv[i], "-bootable")) {
+                                       bootable = true;
+                               } else {
+                                       printf("Unknown option %s\n", argv[i]);
+                                       return CMD_RET_USAGE;
+                               }
+                       } else {
+                               var = argv[i];
+                               break;
+                       }
+               }
+
+               /* Loops should have been exited at the last argument, which
+                * as it contained the variable */
+               if (argc != i + 1)
+                       return CMD_RET_USAGE;
+       }
+
        ret = get_device(argv[0], argv[1], &desc);
        if (ret < 0)
                return 1;
 
-       if (argc == 3) {
+       if (var != NULL) {
                int p;
-               char str[512] = { 0, };
-         disk_partition_t info;
+               char str[512] = { '\0', };
+               disk_partition_t info;
 
                for (p = 1; p < 128; p++) {
+                       char t[5];
                        int r = get_partition_info(desc, p, &info);
 
-                       if (r == 0) {
-                               char t[5];
-                               sprintf(t, "%s%d", str[0] ? " " : "", p);
-                               strcat(str, t);
-                       }
+                       if (r != 0)
+                               continue;
+
+                       if (bootable && !info.bootable)
+                               continue;
+
+                       sprintf(t, "%s%d", str[0] ? " " : "", p);
+                       strcat(str, t);
                }
-               setenv(argv[2], str);
+               setenv(var, str);
                return 0;
        }
 
@@ -84,6 +112,74 @@ static int do_part_list(int argc, char * const argv[])
        return 0;
 }
 
+static int do_part_start(int argc, char * const argv[])
+{
+       block_dev_desc_t *desc;
+       disk_partition_t info;
+       char buf[512] = { 0 };
+       int part;
+       int err;
+       int ret;
+
+       if (argc < 3)
+               return CMD_RET_USAGE;
+       if (argc > 4)
+               return CMD_RET_USAGE;
+
+       part = simple_strtoul(argv[2], NULL, 0);
+
+       ret = get_device(argv[0], argv[1], &desc);
+       if (ret < 0)
+               return 1;
+
+       err = get_partition_info(desc, part, &info);
+       if (err)
+               return 1;
+
+       snprintf(buf, sizeof(buf), LBAF, info.start);
+
+       if (argc > 3)
+               setenv(argv[3], buf);
+       else
+               printf("%s\n", buf);
+
+       return 0;
+}
+
+static int do_part_size(int argc, char * const argv[])
+{
+       block_dev_desc_t *desc;
+       disk_partition_t info;
+       char buf[512] = { 0 };
+       int part;
+       int err;
+       int ret;
+
+       if (argc < 3)
+               return CMD_RET_USAGE;
+       if (argc > 4)
+               return CMD_RET_USAGE;
+
+       part = simple_strtoul(argv[2], NULL, 0);
+
+       ret = get_device(argv[0], argv[1], &desc);
+       if (ret < 0)
+               return 1;
+
+       err = get_partition_info(desc, part, &info);
+       if (err)
+               return 1;
+
+       snprintf(buf, sizeof(buf), LBAF, info.size);
+
+       if (argc > 3)
+               setenv(argv[3], buf);
+       else
+               printf("%s\n", buf);
+
+       return 0;
+}
+
 static int do_part(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        if (argc < 2)
@@ -93,19 +189,28 @@ static int do_part(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                return do_part_uuid(argc - 2, argv + 2);
        else if (!strcmp(argv[1], "list"))
                return do_part_list(argc - 2, argv + 2);
+       else if (!strcmp(argv[1], "start"))
+               return do_part_start(argc - 2, argv + 2);
+       else if (!strcmp(argv[1], "size"))
+               return do_part_size(argc - 2, argv + 2);
 
        return CMD_RET_USAGE;
 }
 
 U_BOOT_CMD(
-       part,   5,      1,      do_part,
+       part,   CONFIG_SYS_MAXARGS,     1,      do_part,
        "disk partition related commands",
-       "part uuid <interface> <dev>:<part>\n"
+       "uuid <interface> <dev>:<part>\n"
        "    - print partition UUID\n"
        "part uuid <interface> <dev>:<part> <varname>\n"
        "    - set environment variable to partition UUID\n"
        "part list <interface> <dev>\n"
        "    - print a device's partition table\n"
-       "part list <interface> <dev> <varname>\n"
-       "    - set environment variable to the list of partitions"
+       "part list <interface> <dev> [flags] <varname>\n"
+       "    - set environment variable to the list of partitions\n"
+       "      flags can be -bootable (list only bootable partitions)\n"
+       "part start <interface> <dev> <part> <varname>\n"
+       "    - set environment variable to the start of the partition (in blocks)\n"
+       "part size <interface> <dev> <part> <varname>\n"
+       "    - set environment variable to the size of the partition (in blocks)"
 );