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 | 8a2373d3cc7696219f8d8b3dc4ac22844edf43c6 (patch) | |
| tree | 51b1815f1540cd384667c2030e45219785db13db /tools/mkimage/patches/030-allow-to-use-different-magic.patch | |
| parent | 15816c9ccebfd6b774cc85b7038ac4f4aefeb55d (diff) | |
| download | master-187ad058-8a2373d3cc7696219f8d8b3dc4ac22844edf43c6.tar.gz master-187ad058-8a2373d3cc7696219f8d8b3dc4ac22844edf43c6.tar.bz2 master-187ad058-8a2373d3cc7696219f8d8b3dc4ac22844edf43c6.zip | |
[tools] mkimage: update to 2013.04
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36550 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 */ |