diff options
| author | Luka Perkov <luka@openwrt.org> | 2013-03-08 20:16:11 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2013-03-08 20:16:11 +0000 |
| commit | 9c8ee9c2642555637eb7f12a72c3aea1ad5e62d6 (patch) | |
| tree | 0bca50f87ea85cd0d62346af73ce6345f3c25ac9 /tools/mkimage/patches/030-allow-to-use-different-magic.patch | |
| parent | e259ecad7ed76b0300b5ad3418b6895f1f45c59e (diff) | |
| download | upstream-9c8ee9c2642555637eb7f12a72c3aea1ad5e62d6.tar.gz upstream-9c8ee9c2642555637eb7f12a72c3aea1ad5e62d6.tar.bz2 upstream-9c8ee9c2642555637eb7f12a72c3aea1ad5e62d6.zip | |
mkimage: upgrade to version 2013.01.01
SVN-Revision: 35905
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 | 12 |
1 files changed, 6 insertions, 6 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 23f39ad22c..305b8342b3 100644 --- a/tools/mkimage/patches/030-allow-to-use-different-magic.patch +++ b/tools/mkimage/patches/030-allow-to-use-different-magic.patch @@ -1,14 +1,14 @@ --- a/tools/mkimage.c +++ b/tools/mkimage.c -@@ -37,6 +37,7 @@ struct mkimage_params params = { +@@ -37,6 +37,7 @@ .arch = IH_ARCH_PPC, .type = IH_TYPE_KERNEL, .comp = IH_COMP_GZIP, + .magic = IH_MAGIC, .dtc = MKIMAGE_DEFAULT_DTC_OPTIONS, .imagename = "", - }; -@@ -186,6 +187,16 @@ main (int argc, char **argv) + .imagename2 = "", +@@ -189,6 +190,16 @@ genimg_get_comp_id (*++argv)) < 0) usage (); goto NXTARG; @@ -25,7 +25,7 @@ case 'D': if (--argc <= 0) usage (); -@@ -596,12 +607,13 @@ usage () +@@ -613,12 +624,13 @@ 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 @@ struct mkimage_params { +@@ -65,6 +65,7 @@ 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 @@ static void image_set_header(void *ptr, +@@ -111,7 +111,7 @@ sbuf->st_size - sizeof(image_header_t)); /* Build new header */ |