diff options
author | Luka Perkov <luka@openwrt.org> | 2013-05-05 20:11:04 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2013-05-05 20:11:04 +0000 |
commit | b693bfc710ef59f4b3564ea221f34a0317afefe3 (patch) | |
tree | 80214a074ea1e8d8bf03c60223329c8353373e8c /tools/mkimage/patches/030-allow-to-use-different-magic.patch | |
parent | c7c243669c324b6b2592d397153a258c86efed5c (diff) | |
download | upstream-b693bfc710ef59f4b3564ea221f34a0317afefe3.tar.gz upstream-b693bfc710ef59f4b3564ea221f34a0317afefe3.tar.bz2 upstream-b693bfc710ef59f4b3564ea221f34a0317afefe3.zip |
mkimage: update to 2013.04
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 36550
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 | 10 |
1 files changed, 5 insertions, 5 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 305b8342b3..14397964b6 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 @@ +@@ -37,6 +37,7 @@ struct mkimage_params params = { .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 @@ +@@ -189,6 +190,16 @@ main (int argc, char **argv) genimg_get_comp_id (*++argv)) < 0) usage (); goto NXTARG; @@ -25,7 +25,7 @@ case 'D': if (--argc <= 0) usage (); -@@ -613,12 +624,13 @@ +@@ -613,12 +624,13 @@ usage () fprintf (stderr, "Usage: %s -l image\n" " -l ==> list image header information\n", params.cmdname); @@ -42,7 +42,7 @@ " -n ==> set image name to 'name'\n" --- a/tools/mkimage.h +++ b/tools/mkimage.h -@@ -65,6 +65,7 @@ +@@ -65,6 +65,7 @@ struct mkimage_params { int arch; int type; int comp; @@ -52,7 +52,7 @@ unsigned int ep; --- a/tools/default_image.c +++ b/tools/default_image.c -@@ -111,7 +111,7 @@ +@@ -111,7 +111,7 @@ static void image_set_header(void *ptr, sbuf->st_size - sizeof(image_header_t)); /* Build new header */ |