aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-05-01 13:55:38 -0600
committerTom Rini <trini@konsulko.com>2016-05-23 11:50:19 -0400
commitbd6e14209445853f9024574b756bba3184bc215c (patch)
tree5ae7e99f0388a3ff2a8b8819886540cb7dbc520b
parent8df81e17f81ba0542f6dbb7636db64fa56c12d8a (diff)
downloadu-boot-bd6e14209445853f9024574b756bba3184bc215c.zip
u-boot-bd6e14209445853f9024574b756bba3184bc215c.tar.gz
u-boot-bd6e14209445853f9024574b756bba3184bc215c.tar.bz2
mkimage: Add a quiet mode
Some build systems want to be quiet unless there is a problem. At present mkimage displays quite a bit of information when generating a FIT file. Add a '-q' flag to silence this. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
-rw-r--r--tools/imagetool.c3
-rw-r--r--tools/imagetool.h1
-rw-r--r--tools/mkimage.c5
3 files changed, 7 insertions, 2 deletions
diff --git a/tools/imagetool.c b/tools/imagetool.c
index 916ab96..08d191d 100644
--- a/tools/imagetool.c
+++ b/tools/imagetool.c
@@ -51,7 +51,8 @@ int imagetool_verify_print_header(
* successful
*/
if ((*curr)->print_header) {
- (*curr)->print_header(ptr);
+ if (!params->quiet)
+ (*curr)->print_header(ptr);
} else {
fprintf(stderr,
"%s: print_header undefined for %s\n",
diff --git a/tools/imagetool.h b/tools/imagetool.h
index 24f8f4b..a3ed0f4 100644
--- a/tools/imagetool.h
+++ b/tools/imagetool.h
@@ -73,6 +73,7 @@ struct image_tool_params {
struct content_info *content_head; /* List of files to include */
struct content_info *content_tail;
bool external_data; /* Store data outside the FIT */
+ bool quiet; /* Don't output text in normal operation */
};
/*
diff --git a/tools/mkimage.c b/tools/mkimage.c
index 93d1c16..aefe22f 100644
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -136,7 +136,7 @@ static void process_args(int argc, char **argv)
int opt;
while ((opt = getopt(argc, argv,
- "a:A:b:cC:d:D:e:Ef:Fk:K:ln:O:rR:sT:vVx")) != -1) {
+ "a:A:b:cC:d:D:e:Ef:Fk:K:ln:O:rR:qsT:vVx")) != -1) {
switch (opt) {
case 'a':
params.addr = strtoull(optarg, &ptr, 16);
@@ -216,6 +216,9 @@ static void process_args(int argc, char **argv)
if (params.os < 0)
usage("Invalid operating system");
break;
+ case 'q':
+ params.quiet = 1;
+ break;
case 'r':
params.require_keys = 1;
break;