aboutsummaryrefslogtreecommitdiffstats
path: root/tools/mkimage
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2010-12-23 00:07:58 +0000
committerImre Kaloz <kaloz@openwrt.org>2010-12-23 00:07:58 +0000
commit93ecf94d98f03d1d51a19f665148ddb8e3760518 (patch)
tree1ee62f1f789ee5b1f836ad20b227a572f41b5a11 /tools/mkimage
parent9aaf9aadb83bbb367e802e4def368fe51e3e72cd (diff)
downloadmaster-187ad058-93ecf94d98f03d1d51a19f665148ddb8e3760518.tar.gz
master-187ad058-93ecf94d98f03d1d51a19f665148ddb8e3760518.tar.bz2
master-187ad058-93ecf94d98f03d1d51a19f665148ddb8e3760518.zip
[tools/mkimage]: use u-boot v2010.12
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24809 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/mkimage')
-rw-r--r--tools/mkimage/Makefile8
-rw-r--r--tools/mkimage/patches/100-portability.patch6
2 files changed, 7 insertions, 7 deletions
diff --git a/tools/mkimage/Makefile b/tools/mkimage/Makefile
index beeecb85c5..48cf04547a 100644
--- a/tools/mkimage/Makefile
+++ b/tools/mkimage/Makefile
@@ -7,11 +7,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=mkimage
-PKG_VERSION:=2009.11
+PKG_VERSION:=2010.12
PKG_SOURCE:=u-boot-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=ftp://ftp.denx.de/pub/u-boot
-PKG_MD5SUM:=d94700614225f53c853dfe714eb5fa47
+PKG_MD5SUM:=9024bbceabd176ae1d52df6db2e84bda
PKG_CAT:=bzcat
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/u-boot-$(PKG_VERSION)
@@ -20,8 +20,8 @@ include $(INCLUDE_DIR)/host-build.mk
define Host/Compile
rm -f $(HOST_BUILD_DIR)/tools/.depend
- touch $(HOST_BUILD_DIR)/include/config.{h,mk} $(HOST_BUILD_DIR)/include/autoconf.mk{.dep,}
- $(MAKE) -C $(HOST_BUILD_DIR) BUILD_DIR= SUBDIRS=tools BIN_FILES-y="mkimage" tools
+ touch $(HOST_BUILD_DIR)/include/config.h
+ $(MAKE) -C $(HOST_BUILD_DIR) BUILD_DIR= BIN_FILES-y="mkimage" tools
endef
define Host/Install
diff --git a/tools/mkimage/patches/100-portability.patch b/tools/mkimage/patches/100-portability.patch
index 1b65e20084..052a584cbb 100644
--- a/tools/mkimage/patches/100-portability.patch
+++ b/tools/mkimage/patches/100-portability.patch
@@ -33,7 +33,7 @@
* 1. Abstracting input command line arguments data
--- a/include/image.h
+++ b/include/image.h
-@@ -49,6 +49,10 @@
+@@ -50,6 +50,10 @@
#endif /* USE_HOSTCC */
@@ -41,6 +41,6 @@
+#define ulong unsigned long
+#endif
+
- #include <command.h>
-
#if defined(CONFIG_FIT)
+ #include <fdt.h>
+ #include <libfdt.h>