From 2c80865bc1d2b12b74b0546fb1062faafeda85c3 Mon Sep 17 00:00:00 2001 From: Teresa Remmet Date: Mon, 27 Jun 2016 13:42:17 +0200 Subject: commands: ubimkvol: Add option for static volumes Creating static volumes in barebox already works, only the option was missing. Signed-off-by: Teresa Remmet Signed-off-by: Sascha Hauer --- commands/ubi.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) (limited to 'commands') diff --git a/commands/ubi.c b/commands/ubi.c index 844d75dcb8..dc2b4b502d 100644 --- a/commands/ubi.c +++ b/commands/ubi.c @@ -13,24 +13,41 @@ static int do_ubimkvol(int argc, char *argv[]) { + int opt; struct ubi_mkvol_req req; int fd, ret; uint64_t size; - if (argc != 4) + req.vol_type = UBI_DYNAMIC_VOLUME; + + while ((opt = getopt(argc, argv, "t:")) > 0) { + switch (opt) { + case 't': + if (!strcmp(optarg, "dynamic")) + req.vol_type = UBI_DYNAMIC_VOLUME; + else if (!strcmp(optarg, "static")) + req.vol_type = UBI_STATIC_VOLUME; + else + return COMMAND_ERROR_USAGE; + break; + default: + return COMMAND_ERROR_USAGE; + } + } + + if (argc - optind != 3) return COMMAND_ERROR_USAGE; - size = strtoull_suffix(argv[3], NULL, 0); - req.name_len = min_t(int, strlen(argv[2]), UBI_VOL_NAME_MAX); - strncpy(req.name, argv[2], req.name_len); + size = strtoull_suffix(argv[optind+2], NULL, 0); + req.name_len = min_t(int, strlen(argv[optind+1]), UBI_VOL_NAME_MAX); + strncpy(req.name, argv[optind+1], req.name_len); req.name[req.name_len] = 0; - req.vol_type = UBI_DYNAMIC_VOLUME; req.bytes = size; req.vol_id = UBI_VOL_NUM_AUTO; req.alignment = 1; - fd = open(argv[1], O_WRONLY); + fd = open(argv[optind], O_WRONLY); if (fd < 0) { perror("open"); return 1; @@ -48,12 +65,13 @@ static int do_ubimkvol(int argc, char *argv[]) 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 ", "volume type, default is dynamic") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(ubimkvol) .cmd = do_ubimkvol, BAREBOX_CMD_DESC("create an UBI volume") - BAREBOX_CMD_OPTS("UBIDEV NAME SIZE") + BAREBOX_CMD_OPTS("[-t] UBIDEV NAME SIZE") BAREBOX_CMD_GROUP(CMD_GRP_PART) BAREBOX_CMD_HELP(cmd_ubimkvol_help) BAREBOX_CMD_END -- cgit v1.2.3 From f5205bd0922c579959353a56e8e522d40377f74d Mon Sep 17 00:00:00 2001 From: Teresa Remmet Date: Mon, 27 Jun 2016 13:42:19 +0200 Subject: commands: ubi: Add ubiupdatevol command Add ubiupdatevol command. This is to update static and dynamic volumes. Signed-off-by: Teresa Remmet Signed-off-by: Sascha Hauer --- commands/ubi.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) (limited to 'commands') diff --git a/commands/ubi.c b/commands/ubi.c index dc2b4b502d..65d2d256a8 100644 --- a/commands/ubi.c +++ b/commands/ubi.c @@ -7,10 +7,97 @@ #include #include #include +#include #include #include #include +static int do_ubiupdatevol(int argc, char *argv[]) +{ + int fd_img, fd_vol, ret = 0; + uint64_t size = 0; + struct stat st; + unsigned int count; + void *buf; + + if (argc - optind < 2) + return COMMAND_ERROR_USAGE; + + if (stat(argv[optind + 1], &st)) { + perror("stat image"); + return 1; + } + + size = st.st_size; + + if (size == FILESIZE_MAX) { + printf("%s has unknown filesize, this is not supported\n", + argv[optind + 1]); + return 1; + } + + fd_img = open(argv[optind + 1], O_RDONLY); + if (fd_img < 0) { + perror("open image"); + return 1; + } + + fd_vol = open(argv[optind], O_WRONLY); + if (fd_vol < 0) { + perror("open volume"); + ret = 1; + goto error_img; + } + + ret = ioctl(fd_vol, UBI_IOCVOLUP, &size); + if (ret) { + printf("failed to start update: %s\n", strerror(-ret)); + goto error; + } + + buf = xmalloc(RW_BUF_SIZE); + + while (size) { + + count = read(fd_img, buf, RW_BUF_SIZE); + if (count < 0) { + perror("read"); + ret = 1; + break; + } + + ret = write(fd_vol, buf, count); + if (ret < 0) { + perror("write"); + break; + } + + size -= count; + } + + free(buf); + +error: + close(fd_vol); +error_img: + close(fd_img); + return ret; +} + + +BAREBOX_CMD_HELP_START(ubiupdatevol) +BAREBOX_CMD_HELP_TEXT("Update UBI volume with an image.") +BAREBOX_CMD_HELP_END + +BAREBOX_CMD_START(ubiupdatevol) + .cmd = do_ubiupdatevol, + BAREBOX_CMD_DESC("Update an UBI volume") + BAREBOX_CMD_OPTS("UBIVOL IMAGE") + BAREBOX_CMD_GROUP(CMD_GRP_PART) + BAREBOX_CMD_HELP(cmd_ubiupdatevol_help) +BAREBOX_CMD_END + + static int do_ubimkvol(int argc, char *argv[]) { int opt; -- cgit v1.2.3