[PATCH 1/2] imd command: Bail out when crc generation/check fails

[PATCH 1/2] imd command: Bail out when crc generation/check fails

[Sascha Hauer]

Generating a IMD crc can fail, so bail out with an error when it fails.
Also, when checking a IMD crc the result should be told to the caller.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 common/imd.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/common/imd.c b/common/imd.c
index 4fd4431aa9..4aca8ea78f 100644
--- a/common/imd.c
+++ b/common/imd.c
@@ -489,10 +489,15 @@ int imd_command(int argc, char *argv[])
 		goto out;
 	}
 
-	if (checksum)
-		imd_write_crc32(buf, imd_start, filename, size);
-	if (verify)
-		imd_verify_crc32(buf, size);
+	if (checksum) {
+		ret = imd_write_crc32(buf, imd_start, filename, size);
+		goto out;
+	}
+
+	if (verify) {
+		ret = imd_verify_crc32(buf, size);
+		goto out;
+	}
 
 	if (type == IMD_TYPE_INVALID) {
 		imd_for_each(imd_start, imd) {
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/2] imd command: Document verbose option

[Sascha Hauer]

imd understands -v for verbose mode, document it in the options list.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 commands/imd.c       | 1 +
 scripts/bareboximd.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/commands/imd.c b/commands/imd.c
index 912f065c9e..9f7ac79f8f 100644
--- a/commands/imd.c
+++ b/commands/imd.c
@@ -31,6 +31,7 @@ BAREBOX_CMD_HELP_TEXT("Options:")
 BAREBOX_CMD_HELP_OPT ("-t <type>", "only show information of <type>")
 BAREBOX_CMD_HELP_OPT ("-n <no>", "for tags with multiple strings only show string <no>")
 BAREBOX_CMD_HELP_OPT ("-s VARNAME",  "set variable VARNAME instead of showing information")
+BAREBOX_CMD_HELP_OPT ("-v", "Be verbose")
 BAREBOX_CMD_HELP_OPT ("-V",  "Verify checksum of FILE")
 BAREBOX_CMD_HELP_OPT ("-c", "Create checksum for FILE and write it to the crc32 tag.")
 BAREBOX_CMD_HELP_TEXT("")
diff --git a/scripts/bareboximd.c b/scripts/bareboximd.c
index 48c3e8ab3f..0500e01cc2 100644
--- a/scripts/bareboximd.c
+++ b/scripts/bareboximd.c
@@ -161,6 +161,7 @@ static void usage(const char *prgname)
 "Options:\n"
 "-t <type>    only show information of <type>\n"
 "-n <no>      for tags with multiple strings only show string <no>\n"
+"-v           Be verbose\n"
 "-V           Verify checksum of FILE\n"
 "-c           Create checksum for FILE and write it to the crc32 tag\n"
 "\n"
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox