]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
mkimage: fix display of image types list
authorBaruch Siach <baruch@tkos.co.il>
Thu, 29 Jun 2017 17:37:08 +0000 (20:37 +0300)
committerTom Rini <trini@konsulko.com>
Thu, 6 Jul 2017 20:17:16 +0000 (16:17 -0400)
Since commit 5b9d44df2307f (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>
tools/mkimage.c

index d982bc5665f1749c393e689d58122f3c513108ce..28ff35e670a3e37ccce21cbe16f30a2959aa35d6 100644 (file)
@@ -113,7 +113,7 @@ static void usage(const char *msg)
 #endif
        fprintf(stderr, "       %s -V ==> print version information and exit\n",
                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);
 }
@@ -260,6 +260,10 @@ static void process_args(int argc, char **argv)
                        params.skipcpy = 1;
                        break;
                case 'T':
+                       if (strcmp(optarg, "list") == 0) {
+                               show_valid_options(IH_TYPE);
+                               exit(EXIT_SUCCESS);
+                       }
                        type = genimg_get_type_id(optarg);
                        if (type < 0) {
                                show_valid_options(IH_TYPE);