X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fwigyori.git;a=blobdiff_plain;f=tools%2Fmkimage%2FMakefile;h=fbcf87cfc6fac4f149c2dc683017fb3f765bd5ce;hp=7bd7316537e2b8d03cd2397f046417a18eff160f;hb=fd8705e635a9392c51f7a644ae4211cb14cbe298;hpb=9c8ee9c2642555637eb7f12a72c3aea1ad5e62d6

diff --git a/tools/mkimage/Makefile b/tools/mkimage/Makefile
index 7bd7316537..fbcf87cfc6 100644
--- a/tools/mkimage/Makefile
+++ b/tools/mkimage/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2013 OpenWrt.org
+# Copyright (C) 2006-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,12 +7,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mkimage
-PKG_VERSION:=2013.01.01
+PKG_VERSION:=2018.03
 
 PKG_SOURCE:=u-boot-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.denx.de/pub/u-boot
-PKG_MD5SUM:=73939f78606f89a1775c7e9acb2ca617
-PKG_CAT:=bzcat
+PKG_SOURCE_URL:=http://ftp.denx.de/pub/u-boot
+PKG_HASH:=7e7477534409d5368eb1371ffde6820f0f79780a1a1f676161c48442cb303dfd
 
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/u-boot-$(PKG_VERSION)
 
@@ -20,23 +19,28 @@ include $(INCLUDE_DIR)/host-build.mk
 
 define Host/Prepare
 	$(Host/Prepare/Default)
-	rm -f \
-		$(HOST_BUILD_DIR)/include/errno.h \
-		$(HOST_BUILD_DIR)/include/malloc.h \
-		$(HOST_BUILD_DIR)/tools/.depend
-	touch $(HOST_BUILD_DIR)/include/config.h
+	mkdir -p $(HOST_BUILD_DIR)/include/config
+	touch $(HOST_BUILD_DIR)/include/config/auto.conf
 endef
 
 define Host/Compile
-	$(MAKE) -C $(HOST_BUILD_DIR) BUILD_DIR= BIN_FILES-y="mkimage" HOSTLDFLAGS="$(HOST_STATIC_LINKING)" tools
+	$(MAKE) -C $(HOST_BUILD_DIR) \
+		HOSTCFLAGS="$(HOST_CFLAGS)" \
+		HOSTLDFLAGS="$(HOST_LDFLAGS)" \
+		no-dot-config-targets=tools-only \
+		CONFIG_MKIMAGE_DTC_PATH=dtc \
+		CONFIG_FIT_SIGNATURE=y \
+		tools-only
 endef
 
 define Host/Install
 	$(CP) $(HOST_BUILD_DIR)/tools/mkimage $(STAGING_DIR_HOST)/bin/
+	$(CP) $(HOST_BUILD_DIR)/tools/mkenvimage $(STAGING_DIR_HOST)/bin/
 endef
 
 define Host/Clean
 	rm -f $(STAGING_DIR_HOST)/bin/mkimage
+	rm -f $(STAGING_DIR_HOST)/bin/mkenvimage
 endef
 
 $(eval $(call HostBuild))