mkimage: update to 2014.04

[openwrt/openwrt.git] / tools / mkimage / patches / 030-allow-to-use-different-magic.patch

diff --git a/tools/mkimage/patches/030-allow-to-use-different-magic.patch b/tools/mkimage/patches/030-allow-to-use-different-magic.patch
index 14397964b6d86904d074c1e2c522463eb6243adb..d5afdd35b291b209e5b2f6e4e358f70a83e22f81 100644 (file)
--- a/tools/mkimage/patches/030-allow-to-use-different-magic.patch
+++ b/tools/mkimage/patches/030-allow-to-use-different-magic.patch
@@ -1,6 +1,6 @@
 --- a/tools/mkimage.c
 +++ b/tools/mkimage.c
-@@ -37,6 +37,7 @@ struct mkimage_params params = {
+@@ -24,6 +24,7 @@
        .arch = IH_ARCH_PPC,
        .type = IH_TYPE_KERNEL,
        .comp = IH_COMP_GZIP,
@@ -8,7 +8,7 @@
        .dtc = MKIMAGE_DEFAULT_DTC_OPTIONS,
        .imagename = "",
        .imagename2 = "",
-@@ -189,6 +190,16 @@ main (int argc, char **argv)
+@@ -168,6 +169,16 @@
                                        genimg_get_comp_id (*++argv)) < 0)
                                        usage ();
                                goto NXTARG;
@@ -25,7 +25,7 @@
                        case 'D':
                                if (--argc <= 0)
                                        usage ();
-@@ -613,12 +624,13 @@ usage ()
+@@ -623,12 +634,13 @@
        fprintf (stderr, "Usage: %s -l image\n"
                         "          -l ==> list image header information\n",
                params.cmdname);
@@ -40,19 +40,9 @@
                         "          -a ==> set load address to 'addr' (hex)\n"
                         "          -e ==> set entry point to 'ep' (hex)\n"
                         "          -n ==> set image name to 'name'\n"
---- a/tools/mkimage.h
-+++ b/tools/mkimage.h
-@@ -65,6 +65,7 @@ struct mkimage_params {
-       int arch;
-       int type;
-       int comp;
-+      unsigned int magic;
-       char *dtc;
-       unsigned int addr;
-       unsigned int ep;
 --- a/tools/default_image.c
 +++ b/tools/default_image.c
-@@ -111,7 +111,7 @@ static void image_set_header(void *ptr,
+@@ -98,7 +98,7 @@
                        sbuf->st_size - sizeof(image_header_t));
  
        /* Build new header */
@@ -61,3 +51,13 @@
        image_set_time(hdr, sbuf->st_mtime);
        image_set_size(hdr, sbuf->st_size - sizeof(image_header_t));
        image_set_load(hdr, params->addr);
+--- a/tools/imagetool.h
++++ b/tools/imagetool.h
+@@ -44,6 +44,7 @@
+       int arch;
+       int type;
+       int comp;
++      unsigned int magic;
+       char *dtc;
+       unsigned int addr;
+       unsigned int ep;