leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mkimage: fix generation of FIT image

Browse Source 
Commit 7a439cadcf 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>
This commit is contained in:
Andreas Bießmann 2016-05-03 15:17:03 +02:00 committed by Tom Rini
parent a6e7b7744e
commit 8edeac86db
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/mkimage.c
View File

@ -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];
/*