From: Imre Kaloz <kaloz@openwrt.org>
Date: Thu, 23 Dec 2010 00:07:58 +0000 (+0000)
Subject: use u-boot v2010.12
X-Git-Tag: reboot~17973
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3d501f9403ab6ceb80cb6fac9d64f13306c1e6cd;p=openwrt%2Fstaging%2Fxback.git

use u-boot v2010.12

SVN-Revision: 24809
---

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>