summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAndreas Bießmann <andreas@biessmann.org>2016-05-03 15:17:03 +0200
committerTom Rini <trini@konsulko.com>2016-05-03 11:28:18 -0400
commit8edeac86db306482b9bcb860d572320a8c3ed95d (patch)
tree80b5dbb35d1d0ca5dc440fdb4bc768fb9672b947 /tools
parenta6e7b7744e158c4c02f91fcbf991845cad4dc6e3 (diff)
downloadblackbird-obmc-uboot-8edeac86db306482b9bcb860d572320a8c3ed95d.tar.gz
blackbird-obmc-uboot-8edeac86db306482b9bcb860d572320a8c3ed95d.zip
mkimage: fix generation of FIT image
Commit 7a439cadcf3192eb012a2432ca34670b676c74d2 broke generation of SPL loadable FIT images (CONFIG_SPL_LOAD_FIT). Fix it by removing the unnecessary storage of expected image type. This was a left over of the previous implementation. It is not longer necessary since the mkimage -b switch always has one parameter. Tested-by: Lokesh Vutla <lokeshvutla@ti.com> Signed-off-by: Andreas Bießmann <andreas@biessmann.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/mkimage.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/tools/mkimage.c b/tools/mkimage.c
index b407aed742..93d1c16c7c 100644
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -133,10 +133,8 @@ static void process_args(int argc, char **argv)
char *ptr;
int type = IH_TYPE_INVALID;
char *datafile = NULL;
- int expecting;
int opt;
- expecting = IH_TYPE_COUNT; /* Unknown */
while ((opt = getopt(argc, argv,
"a:A:b:cC:d:D:e:Ef:Fk:K:ln:O:rR:sT:vVx")) != -1) {
switch (opt) {
@@ -154,8 +152,7 @@ static void process_args(int argc, char **argv)
usage("Invalid architecture");
break;
case 'b':
- expecting = IH_TYPE_FLATDT;
- if (add_content(expecting, optarg)) {
+ if (add_content(IH_TYPE_FLATDT, optarg)) {
fprintf(stderr,
"%s: Out of memory adding content '%s'",
params.cmdname, optarg);
@@ -238,7 +235,6 @@ static void process_args(int argc, char **argv)
show_image_types();
usage("Invalid image type");
}
- expecting = type;
break;
case 'v':
params.vflag++;
@@ -254,7 +250,8 @@ static void process_args(int argc, char **argv)
}
}
- if (optind < argc && expecting == type)
+ /* The last parameter is expected to be the imagefile */
+ if (optind < argc)
params.imagefile = argv[optind];
/*
OpenPOWER on IntegriCloud