diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-12-07 08:12:41 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-12-07 08:12:41 +0100 |
| commit | 1546948231677ad1e5acb83e7c60270f5ac28127 (patch) | |
| tree | 6c803db57f6545a511cf561e53396bc3a97445f0 | |
| parent | 886989b2eb7cd6af4d6a35993ea9dec2faee34e2 (diff) | |
| parent | 34d598023e22aacdbec4fbff9a7f0bf4759fce9d (diff) | |
| download | barebox-1546948231677ad1e5acb83e7c60270f5ac28127.tar.gz barebox-1546948231677ad1e5acb83e7c60270f5ac28127.tar.xz | |
Merge branch 'for-next/ubimkvol_add_volume_id_parameter'
| -rw-r--r-- | commands/ubi.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/commands/ubi.c b/commands/ubi.c index de5633c458..f37684102d 100644 --- a/commands/ubi.c +++ b/commands/ubi.c @@ -108,8 +108,9 @@ static int do_ubimkvol(int argc, char *argv[]) uint32_t ubinum; req.vol_type = UBI_DYNAMIC_VOLUME; + req.vol_id = UBI_VOL_NUM_AUTO; - while ((opt = getopt(argc, argv, "t:")) > 0) { + while ((opt = getopt(argc, argv, "t:n:")) > 0) { switch (opt) { case 't': if (!strcmp(optarg, "dynamic")) @@ -119,6 +120,9 @@ static int do_ubimkvol(int argc, char *argv[]) else return COMMAND_ERROR_USAGE; break; + case 'n': + req.vol_id = simple_strtoul(optarg, NULL, 0); + break; default: return COMMAND_ERROR_USAGE; } @@ -133,7 +137,6 @@ static int do_ubimkvol(int argc, char *argv[]) req.name[req.name_len] = 0; req.bytes = size; - req.vol_id = UBI_VOL_NUM_AUTO; req.alignment = 1; fd = open(argv[optind], O_WRONLY); @@ -160,12 +163,13 @@ BAREBOX_CMD_HELP_START(ubimkvol) BAREBOX_CMD_HELP_TEXT("Create an UBI volume on UBIDEV with NAME and SIZE.") BAREBOX_CMD_HELP_TEXT("If SIZE is 0 all available space is used for the volume.") BAREBOX_CMD_HELP_OPT("-t <static|dynamic>", "volume type, default is dynamic") +BAREBOX_CMD_HELP_OPT("-n <vol_id>", "volume ID, default is dynamically assigned") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(ubimkvol) .cmd = do_ubimkvol, BAREBOX_CMD_DESC("create an UBI volume") - BAREBOX_CMD_OPTS("[-t] UBIDEV NAME SIZE") + BAREBOX_CMD_OPTS("[-tn] UBIDEV NAME SIZE") BAREBOX_CMD_GROUP(CMD_GRP_PART) BAREBOX_CMD_HELP(cmd_ubimkvol_help) BAREBOX_CMD_END |