X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=tools%2Fmkimage%2Fpatches%2F030-allow-to-use-different-magic.patch;fp=tools%2Fmkimage%2Fpatches%2F030-allow-to-use-different-magic.patch;h=dcab48894c0fb5a0cc2308fa64a6996e9d16833e;hp=d5afdd35b291b209e5b2f6e4e358f70a83e22f81;hb=37f09b8129aadb8cba52c15446a31dfb59328e16;hpb=b3f7902a0687dced523f49a0430757ac68f6467d

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 d5afdd35b2..dcab48894c 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
-@@ -24,6 +24,7 @@
+@@ -24,6 +24,7 @@ struct image_tool_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 = "",
-@@ -168,6 +169,16 @@
+@@ -168,6 +169,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 ();
-@@ -623,12 +634,13 @@
+@@ -623,12 +634,13 @@ static void usage(void)
  	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/default_image.c
 +++ b/tools/default_image.c
-@@ -98,7 +98,7 @@
+@@ -98,7 +98,7 @@ static void image_set_header(void *ptr,
  			sbuf->st_size - sizeof(image_header_t));
  
  	/* Build new header */
@@ -53,7 +53,7 @@
  	image_set_load(hdr, params->addr);
 --- a/tools/imagetool.h
 +++ b/tools/imagetool.h
-@@ -44,6 +44,7 @@
+@@ -44,6 +44,7 @@ struct image_tool_params {
  	int arch;
  	int type;
  	int comp;