diff options
author | Luka Perkov <luka@openwrt.org> | 2014-05-21 09:42:33 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2014-05-21 09:42:33 +0000 |
commit | 5342a1a2ea5ce8c7ece7c0f2f4fdf4c4d202f045 (patch) | |
tree | 708029231ac804143384629193929cdb0d948f5c /tools/mkimage/patches/030-allow-to-use-different-magic.patch | |
parent | b10140d8320840695e96a77b9cb1d255b22a602a (diff) | |
download | master-31e0f0ae-5342a1a2ea5ce8c7ece7c0f2f4fdf4c4d202f045.tar.gz master-31e0f0ae-5342a1a2ea5ce8c7ece7c0f2f4fdf4c4d202f045.tar.bz2 master-31e0f0ae-5342a1a2ea5ce8c7ece7c0f2f4fdf4c4d202f045.zip |
mkimage: update to 2014.04
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 40807
Diffstat (limited to 'tools/mkimage/patches/030-allow-to-use-different-magic.patch')
-rw-r--r-- | tools/mkimage/patches/030-allow-to-use-different-magic.patch | 28 |
1 files changed, 14 insertions, 14 deletions
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 afc3f21a81..d5afdd35b2 100644 --- 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 @@ +@@ -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 @@ +@@ -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 @@ +@@ -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 -@@ -79,6 +79,7 @@ - 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 @@ +@@ -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; |