From f5ac3a13ec9b452ed357ef95299f26549945d1c7 Mon Sep 17 00:00:00 2001
From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 5 Dec 2011 14:52:22 +0000
Subject: [PATCH] tools/mkimage: allow to use different magic in uImages

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29442 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../030-allow-to-use-different-magic.patch    | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 tools/mkimage/patches/030-allow-to-use-different-magic.patch

diff --git a/tools/mkimage/patches/030-allow-to-use-different-magic.patch b/tools/mkimage/patches/030-allow-to-use-different-magic.patch
new file mode 100644
index 000000000..31a9065f3
--- /dev/null
+++ b/tools/mkimage/patches/030-allow-to-use-different-magic.patch
@@ -0,0 +1,63 @@
+--- a/tools/mkimage.c
++++ b/tools/mkimage.c
+@@ -37,6 +37,7 @@ struct mkimage_params params = {
+ 	.arch = IH_ARCH_PPC,
+ 	.type = IH_TYPE_KERNEL,
+ 	.comp = IH_COMP_GZIP,
++	.magic = IH_MAGIC,
+ 	.dtc = MKIMAGE_DEFAULT_DTC_OPTIONS,
+ 	.imagename = "",
+ };
+@@ -180,6 +181,16 @@ main (int argc, char **argv)
+ 					genimg_get_comp_id (*++argv)) < 0)
+ 					usage ();
+ 				goto NXTARG;
++			case 'M':
++				if (--argc <=0)
++					usage ();
++				params.magic = strtoul (*++argv, &ptr, 16);
++				if (*ptr) {
++					fprintf (stderr,
++						"%s: invalid magic %s\n",
++						params.cmdname, *argv);
++				}
++				goto NXTARG;
+ 			case 'D':
+ 				if (--argc <= 0)
+ 					usage ();
+@@ -580,12 +591,13 @@ usage ()
+ 	fprintf (stderr, "Usage: %s -l image\n"
+ 			 "          -l ==> list image header information\n",
+ 		params.cmdname);
+-	fprintf (stderr, "       %s [-x] -A arch -O os -T type -C comp "
++	fprintf (stderr, "       %s [-x] -A arch -O os -T type -C comp -M magic "
+ 			 "-a addr -e ep -n name -d data_file[:data_file...] image\n"
+ 			 "          -A ==> set architecture to 'arch'\n"
+ 			 "          -O ==> set operating system to 'os'\n"
+ 			 "          -T ==> set image type to 'type'\n"
+ 			 "          -C ==> set compression type 'comp'\n"
++			 "          -M ==> set image magic to 'magic'\n"
+ 			 "          -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
+@@ -64,6 +64,7 @@ struct mkimage_params {
+ 	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
+@@ -110,7 +110,7 @@ static void image_set_header (void *ptr,
+ 			sbuf->st_size - sizeof(image_header_t));
+ 
+ 	/* Build new header */
+-	image_set_magic (hdr, IH_MAGIC);
++	image_set_magic (hdr, params->magic);
+ 	image_set_time (hdr, sbuf->st_mtime);
+ 	image_set_size (hdr, sbuf->st_size - sizeof(image_header_t));
+ 	image_set_load (hdr, params->addr);
-- 
2.20.1