aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2012-06-09 18:06:13 +0000
committerLuka Perkov <luka@openwrt.org>2012-06-09 18:06:13 +0000
commit679c3428c86f3041fd4283b1b0e841b6711a32c6 (patch)
tree28f21415ce7ea45833a68a1a3f307fff88fce1f8
parent57ce7e58fed136cf01c2ad7d666fd0c9c040c642 (diff)
downloadupstream-679c3428c86f3041fd4283b1b0e841b6711a32c6.tar.gz
upstream-679c3428c86f3041fd4283b1b0e841b6711a32c6.tar.bz2
upstream-679c3428c86f3041fd4283b1b0e841b6711a32c6.zip
[tools] mkimage: update to 2012.04.01
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32143 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--tools/mkimage/Makefile4
-rw-r--r--tools/mkimage/patches/030-allow-to-use-different-magic.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/mkimage/Makefile b/tools/mkimage/Makefile
index 5ed82e6fa7..d4338e591f 100644
--- a/tools/mkimage/Makefile
+++ b/tools/mkimage/Makefile
@@ -7,11 +7,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=mkimage
-PKG_VERSION:=2011.12
+PKG_VERSION:=2012.04.01
PKG_SOURCE:=u-boot-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=ftp://ftp.denx.de/pub/u-boot
-PKG_MD5SUM:=7f29b9f6da44d6e46e988e7561fd1d5f
+PKG_MD5SUM:=192bb231082d9159fb6e16de3039b6b2
PKG_CAT:=bzcat
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/u-boot-$(PKG_VERSION)
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 73a0ac4f91..23f39ad22c 100644
--- a/tools/mkimage/patches/030-allow-to-use-different-magic.patch
+++ b/tools/mkimage/patches/030-allow-to-use-different-magic.patch
@@ -25,7 +25,7 @@
case 'D':
if (--argc <= 0)
usage ();
-@@ -595,12 +606,13 @@ usage ()
+@@ -596,12 +607,13 @@ usage ()
fprintf (stderr, "Usage: %s -l image\n"
" -l ==> list image header information\n",
params.cmdname);