OMAP3: Change devkit8000 maintainer

[karo-tx-uboot.git] / tools / mkimage.c

diff --git a/tools/mkimage.c b/tools/mkimage.c
index 2f3310175489a2d55894b0d5a2c2252b233262d7..36e28ec923492ddc1495a66021e5e4b2e2f258ea 100644 (file)
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -162,6 +162,8 @@ main (int argc, char **argv)
        init_default_image_type ();
        /* Init Davinci UBL support */
        init_ubl_image_type();
+       /* Init Davinci AIS support */
+       init_ais_image_type();
 
        params.cmdname = *argv;
        params.addr = params.ep = 0;
@@ -248,6 +250,9 @@ main (int argc, char **argv)
                                        usage ();
                                params.imagename = *++argv;
                                goto NXTARG;
+                       case 's':
+                               params.skipcpy = 1;
+                               break;
                        case 'v':
                                params.vflag++;
                                break;
@@ -361,11 +366,15 @@ NXTARG:           ;
        }
 
        /*
-        * Must be -w then:
-        *
-        * write dummy header, to be fixed later
+        * In case there an header with a variable
+        * length will be added, the corresponding
+        * function is called. This is responsible to
+        * allocate memory for the header itself.
         */
-       memset (tparams->hdr, 0, tparams->header_size);
+       if (tparams->vrec_header)
+               tparams->vrec_header(&params, tparams);
+       else
+               memset(tparams->hdr, 0, tparams->header_size);
 
        if (write(ifd, tparams->hdr, tparams->header_size)
                                        != tparams->header_size) {
@@ -374,7 +383,9 @@ NXTARG:             ;
                exit (EXIT_FAILURE);
        }
 
-       if (params.type == IH_TYPE_MULTI || params.type == IH_TYPE_SCRIPT) {
+       if (!params.skipcpy &&
+               (params.type == IH_TYPE_MULTI ||
+                       params.type == IH_TYPE_SCRIPT)) {
                char *file = params.datafile;
                uint32_t size;