aboutsummaryrefslogtreecommitdiffstats
path: root/tools/mkimage/patches
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2013-03-08 20:16:11 +0000
committerLuka Perkov <luka@openwrt.org>2013-03-08 20:16:11 +0000
commit9c8ee9c2642555637eb7f12a72c3aea1ad5e62d6 (patch)
tree0bca50f87ea85cd0d62346af73ce6345f3c25ac9 /tools/mkimage/patches
parente259ecad7ed76b0300b5ad3418b6895f1f45c59e (diff)
downloadupstream-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')
-rw-r--r--tools/mkimage/patches/010-freebsd-ulong-fix.patch2
-rw-r--r--tools/mkimage/patches/020-openbsd_fixes.patch9
-rw-r--r--tools/mkimage/patches/030-allow-to-use-different-magic.patch12
-rw-r--r--tools/mkimage/patches/040-include_order.patch2
4 files changed, 12 insertions, 13 deletions
diff --git a/tools/mkimage/patches/010-freebsd-ulong-fix.patch b/tools/mkimage/patches/010-freebsd-ulong-fix.patch
index 32fa074533..737291466c 100644
--- a/tools/mkimage/patches/010-freebsd-ulong-fix.patch
+++ b/tools/mkimage/patches/010-freebsd-ulong-fix.patch
@@ -1,6 +1,6 @@
--- a/include/image.h
+++ b/include/image.h
-@@ -50,6 +50,10 @@
+@@ -51,6 +51,10 @@
#endif /* USE_HOSTCC */
diff --git a/tools/mkimage/patches/020-openbsd_fixes.patch b/tools/mkimage/patches/020-openbsd_fixes.patch
index 31ee38f66e..17232360d2 100644
--- a/tools/mkimage/patches/020-openbsd_fixes.patch
+++ b/tools/mkimage/patches/020-openbsd_fixes.patch
@@ -1,7 +1,6 @@
-diff -Nur u-boot-2012.04.01.orig/tools/mkimage.c u-boot-2012.04.01/tools/mkimage.c
---- u-boot-2012.04.01.orig/tools/mkimage.c Wed Apr 25 15:22:50 2012
-+++ u-boot-2012.04.01/tools/mkimage.c Wed Mar 6 17:09:29 2013
-@@ -449,6 +449,7 @@
+--- a/tools/mkimage.c
++++ b/tools/mkimage.c
+@@ -464,6 +464,7 @@
#if defined(_POSIX_SYNCHRONIZED_IO) && \
!defined(__sun__) && \
!defined(__FreeBSD__) && \
@@ -9,7 +8,7 @@ diff -Nur u-boot-2012.04.01.orig/tools/mkimage.c u-boot-2012.04.01/tools/mkimage
!defined(__APPLE__)
(void) fdatasync (ifd);
#else
-@@ -492,6 +493,7 @@
+@@ -507,6 +508,7 @@
#if defined(_POSIX_SYNCHRONIZED_IO) && \
!defined(__sun__) && \
!defined(__FreeBSD__) && \
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 */
diff --git a/tools/mkimage/patches/040-include_order.patch b/tools/mkimage/patches/040-include_order.patch
index 5a9d15eb76..f94e91d700 100644
--- a/tools/mkimage/patches/040-include_order.patch
+++ b/tools/mkimage/patches/040-include_order.patch
@@ -1,6 +1,6 @@
--- a/tools/Makefile
+++ b/tools/Makefile
-@@ -159,9 +159,9 @@ NOPEDOBJS := $(addprefix $(obj),$(NOPED_
+@@ -162,9 +162,9 @@
# Use native tools and options
# Define __KERNEL_STRICT_NAMES to prevent typedef overlaps
#