Merge branch 'master' of git://git.denx.de/u-boot

[platform/kernel/u-boot.git] / tools / mkimage.c

diff --git a/tools/mkimage.c b/tools/mkimage.c
index 4526da2..93d1c16 100644 (file)
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -85,7 +85,8 @@ static void usage(const char *msg)
                "          -x ==> set XIP (execute in place)\n",
                params.cmdname);
        fprintf(stderr,
-               "       %s [-D dtc_options] [-f fit-image.its|-F] fit-image\n",
+               "       %s [-D dtc_options] [-f fit-image.its|-f auto|-F] [-b <dtb> [-b <dtb>]] fit-image\n"
+               "           <dtb> file is used with -f auto, it may occour multiple times.\n",
                params.cmdname);
        fprintf(stderr,
                "          -D => set all options for device tree compiler\n"
@@ -109,17 +110,33 @@ static void usage(const char *msg)
        exit(EXIT_FAILURE);
 }
 
+static int add_content(int type, const char *fname)
+{
+       struct content_info *cont;
+
+       cont = calloc(1, sizeof(*cont));
+       if (!cont)
+               return -1;
+       cont->type = type;
+       cont->fname = fname;
+       if (params.content_tail)
+               params.content_tail->next = cont;
+       else
+               params.content_head = cont;
+       params.content_tail = cont;
+
+       return 0;
+}
+
 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:cC:d:D:e:f:Fk:K:ln:O:rR:sT:vVx")) != -1) {
+                            "a:A:b:cC:d:D:e:Ef:Fk:K:ln:O:rR:sT:vVx")) != -1) {
                switch (opt) {
                case 'a':
                        params.addr = strtoull(optarg, &ptr, 16);
@@ -134,6 +151,14 @@ static void process_args(int argc, char **argv)
                        if (params.arch < 0)
                                usage("Invalid architecture");
                        break;
+               case 'b':
+                       if (add_content(IH_TYPE_FLATDT, optarg)) {
+                               fprintf(stderr,
+                                       "%s: Out of memory adding content '%s'",
+                                       params.cmdname, optarg);
+                               exit(EXIT_FAILURE);
+                       }
+                       break;
                case 'c':
                        params.comment = optarg;
                        break;
@@ -158,8 +183,12 @@ static void process_args(int argc, char **argv)
                        }
                        params.eflag = 1;
                        break;
+               case 'E':
+                       params.external_data = true;
+                       break;
                case 'f':
-                       params.datafile = optarg;
+                       datafile = optarg;
+                       params.auto_its = !strcmp(datafile, "auto");
                        /* no break */
                case 'F':
                        /*
@@ -206,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++;
@@ -217,17 +245,15 @@ static void process_args(int argc, char **argv)
                case 'x':
                        params.xflag++;
                        break;
-               case 1:
-                       if (expecting == type || optind == argc) {
-                               params.imagefile = optarg;
-                               expecting = IH_TYPE_INVALID;
-                       }
-                       break;
                default:
                        usage("Invalid option");
                }
        }
 
+       /* The last parameter is expected to be the imagefile */
+       if (optind < argc)
+               params.imagefile = argv[optind];
+
        /*
         * For auto-generated FIT images we need to know the image type to put
         * in the FIT, which is separate from the file's image type (which
@@ -235,7 +261,8 @@ static void process_args(int argc, char **argv)
         */
        if (params.type == IH_TYPE_FLATDT) {
                params.fit_image_type = type;
-               params.datafile = datafile;
+               if (!params.auto_its)
+                       params.datafile = datafile;
        } else if (type != IH_TYPE_INVALID) {
                params.type = type;
        }