diff options
Diffstat (limited to 'tools/mkimage/patches')
| -rw-r--r-- | tools/mkimage/patches/010-freebsd-ulong-fix.patch | 13 | ||||
| -rw-r--r-- | tools/mkimage/patches/030-allow-to-use-different-magic.patch | 63 | ||||
| -rw-r--r-- | tools/mkimage/patches/040-include_order.patch | 14 |
3 files changed, 90 insertions, 0 deletions
diff --git a/tools/mkimage/patches/010-freebsd-ulong-fix.patch b/tools/mkimage/patches/010-freebsd-ulong-fix.patch new file mode 100644 index 000000000..32fa07453 --- /dev/null +++ b/tools/mkimage/patches/010-freebsd-ulong-fix.patch @@ -0,0 +1,13 @@ +--- a/include/image.h ++++ b/include/image.h +@@ -50,6 +50,10 @@ + + #endif /* USE_HOSTCC */ + ++#ifndef ulong ++#define ulong unsigned long ++#endif ++ + #if defined(CONFIG_FIT) + #include <fdt.h> + #include <libfdt.h> 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..23f39ad22 --- /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 = "", + }; +@@ -186,6 +187,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 (); +@@ -596,12 +607,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 +@@ -65,6 +65,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 +@@ -111,7 +111,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); diff --git a/tools/mkimage/patches/040-include_order.patch b/tools/mkimage/patches/040-include_order.patch new file mode 100644 index 000000000..5a9d15eb7 --- /dev/null +++ b/tools/mkimage/patches/040-include_order.patch @@ -0,0 +1,14 @@ +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -159,9 +159,9 @@ NOPEDOBJS := $(addprefix $(obj),$(NOPED_ + # Use native tools and options + # Define __KERNEL_STRICT_NAMES to prevent typedef overlaps + # +-HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \ ++HOSTCPPFLAGS = -I $(SRCTREE)/include \ + -idirafter $(OBJTREE)/include2 \ +- -idirafter $(OBJTREE)/include \ ++ -I $(OBJTREE)/include \ + -I $(SRCTREE)/lib/libfdt \ + -I $(SRCTREE)/tools \ + -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ |