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

[u-boot] / tools / mkimage.c

diff --git a/tools/mkimage.c b/tools/mkimage.c
index bcf227272dd1fc8c35d39cb1a050bd57197f9bfc..aefe22f19b219a7d339dbfdc6f92ca1afe8b1831 100644 (file)
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -15,7 +15,7 @@
 static void copy_file(int, const char *, int);
 
 /* parameters initialized by core will be used by the image type code */
-struct image_tool_params params = {
+static struct image_tool_params params = {
        .os = IH_OS_LINUX,
        .arch = IH_ARCH_PPC,
        .type = IH_TYPE_KERNEL,
@@ -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,13 +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 opt;
 
        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:qsT:vVx")) != -1) {
                switch (opt) {
                case 'a':
                        params.addr = strtoull(optarg, &ptr, 16);
@@ -130,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;
@@ -154,14 +183,19 @@ 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':
                        /*
                         * The flattened image tree (FIT) format
                         * requires a flattened device tree image type
                         */
+                       params.fit_image_type = params.type;
                        params.type = IH_TYPE_FLATDT;
                        params.fflag = 1;
                        break;
@@ -182,6 +216,9 @@ static void process_args(int argc, char **argv)
                        if (params.os < 0)
                                usage("Invalid operating system");
                        break;
+               case 'q':
+                       params.quiet = 1;
+                       break;
                case 'r':
                        params.require_keys = 1;
                        break;
@@ -196,8 +233,8 @@ static void process_args(int argc, char **argv)
                        params.skipcpy = 1;
                        break;
                case 'T':
-                       params.type = genimg_get_type_id(optarg);
-                       if (params.type < 0) {
+                       type = genimg_get_type_id(optarg);
+                       if (type < 0) {
                                show_image_types();
                                usage("Invalid image type");
                        }
@@ -216,9 +253,25 @@ static void process_args(int argc, char **argv)
                }
        }
 
-       if (optind >= argc)
+       /* 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
+        * will always be IH_TYPE_FLATDT in this case).
+        */
+       if (params.type == IH_TYPE_FLATDT) {
+               params.fit_image_type = type;
+               if (!params.auto_its)
+                       params.datafile = datafile;
+       } else if (type != IH_TYPE_INVALID) {
+               params.type = type;
+       }
+
+       if (!params.imagefile)
                usage("Missing output filename");
-       params.imagefile = argv[optind];
 }