[tools/mkimage]: use u-boot v2010.12

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24809 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/tools/mkimage/Makefile b/tools/mkimage/Makefile
index beeecb8..48cf045 100644 (file)
--- a/tools/mkimage/Makefile
+++ b/tools/mkimage/Makefile
@@ -7,11 +7,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mkimage
 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_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)
 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
 
 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
 endef
 
 define Host/Install

diff --git a/tools/mkimage/patches/100-portability.patch b/tools/mkimage/patches/100-portability.patch
index 1b65e20..052a584 100644 (file)
--- 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
   *    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 */
  
  
  #endif /* USE_HOSTCC */
  


@@ -41,6 +41,6 @@
 +#define ulong unsigned long
 +#endif
 +
 +#define ulong unsigned long
 +#endif
 +

- #include <command.h>
- 

  #if defined(CONFIG_FIT)
  #if defined(CONFIG_FIT)

+ #include <fdt.h>
+ #include <libfdt.h>