From: Luka Perkov <luka@openwrt.org>
Date: Sat, 9 Jun 2012 18:06:13 +0000 (+0000)
Subject: mkimage: update to 2012.04.01
X-Git-Tag: reboot~13648
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=605c741c79a43be9c48fe3f5ca96c70c40d13371;p=openwrt%2Fstaging%2Fnoltari.git

mkimage: update to 2012.04.01

SVN-Revision: 32143
---

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);