From 0798d6fd4191f5ea2e53496d57db482529364d2d Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Wed, 25 Feb 2015 23:23:50 +0100 Subject: part: Add support for list filtering on bootable partitions Add an optional -bootable parameter to the part list commands to only put the list of bootable partitions in the environment variable Signed-off-by: Sjoerd Simons Reviewed-by: Stephen Warren --- common/cmd_part.c | 53 +++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 12 deletions(-) (limited to 'common/cmd_part.c') diff --git a/common/cmd_part.c b/common/cmd_part.c index c99f52735f0..d04588ec22c 100644 --- 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, }; + 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; } @@ -98,7 +126,7 @@ static int do_part(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } U_BOOT_CMD( - part, 5, 1, do_part, + part, CONFIG_SYS_MAXARGS, 1, do_part, "disk partition related commands", "part uuid :\n" " - print partition UUID\n" @@ -106,6 +134,7 @@ U_BOOT_CMD( " - set environment variable to partition UUID\n" "part list \n" " - print a device's partition table\n" - "part list \n" - " - set environment variable to the list of partitions" + "part list [flags] \n" + " - set environment variable to the list of partitions\n" + " flags can be -bootable (list only bootable partitions)" ); -- cgit v1.2.3