qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mkimage: fix display of image types list 

Since commit 5b9d44df23 (mkimage: Display a better list of available image
types) mkimage usage text suggest to "use -T to see a list of available image
types". Unfortunately, commit 02221f29deb8 (mkimage: Convert to use getopt())
broke that feature, because getopt() fails when -T has no option argument.

Add a pseudo image type name 'list' that lists all image types. Update the
usage text accordingly.

Cc: Simon Glass <sjg@chromium.org>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
This commit is contained in:
Baruch Siach 2017-06-29 20:37:08 +03:00 committed by Tom Rini
parent 3690cbd65e
commit 79aa33cdb3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/mkimage.c
View File

@ -113,7 +113,7 @@ static void usage(const char *msg)
#endif #endif
fprintf(stderr, " %s -V ==> print version information and exit\n", fprintf(stderr, " %s -V ==> print version information and exit\n",
params.cmdname); params.cmdname);
fprintf(stderr, "Use -T to see a list of available image types\n"); fprintf(stderr, "Use '-T list' to see a list of available image types\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -260,6 +260,10 @@ static void process_args(int argc, char **argv)
params.skipcpy = 1; params.skipcpy = 1;
break; break;
case 'T': case 'T':
if (strcmp(optarg, "list") == 0) {
show_valid_options(IH_TYPE);
exit(EXIT_SUCCESS);
}
type = genimg_get_type_id(optarg); type = genimg_get_type_id(optarg);
if (type < 0) { if (type < 0) {
show_valid_options(IH_TYPE); show_valid_options(IH_TYPE);