From c17e8cf262a16f6038cd6f76f58de031f2317171 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 22 Apr 2016 09:02:02 +0200 Subject: ubiformat: use default values for ubi_ver and image_seq Signed-off-by: Sascha Hauer --- commands/ubiformat.c | 2 -- common/ubiformat.c | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/commands/ubiformat.c b/commands/ubiformat.c index f4982c8eef..a88672d6c2 100644 --- a/commands/ubiformat.c +++ b/commands/ubiformat.c @@ -60,8 +60,6 @@ static int parse_opt(int argc, char *argv[], struct ubiformat_args *args, { srand(get_time_ns()); memset(args, 0, sizeof(*args)); - args->ubi_ver = 1; - args->image_seq = rand(); while (1) { int key; diff --git a/common/ubiformat.c b/common/ubiformat.c index e4f569b4ec..aaa1f5d6bc 100644 --- a/common/ubiformat.c +++ b/common/ubiformat.c @@ -451,6 +451,12 @@ int ubiformat(struct mtd_info *mtd, struct ubiformat_args *args) struct ubi_scan_info *si; int ubi_num; + if (!args->ubi_ver) + args->ubi_ver = 1; + + if (!args->image_seq) + args->image_seq = rand(); + if (!is_power_of_2(mtd->writesize)) { errmsg("min. I/O size is %d, but should be power of 2", mtd->writesize); -- cgit v1.2.3