tools: mkimage: provide dtc path during build

[openwrt/staging/jogo.git] / tools / mkimage / Makefile

diff --git a/tools/mkimage/Makefile b/tools/mkimage/Makefile
index 149aaa6f12aa3bd22f046f4e9d3a9e5a5c2e3ddd..d0ff5f7e3701d5dd08e6f05ee896d356d5c3c96e 100644 (file)
--- a/tools/mkimage/Makefile
+++ b/tools/mkimage/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2012 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,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mkimage
-PKG_VERSION:=2012.04.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:=192bb231082d9159fb6e16de3039b6b2
-PKG_CAT:=bzcat
+PKG_SOURCE_URL:=\
+       http://mirror2.openwrt.org/sources \
+       ftp://ftp.denx.de/pub/u-boot
+PKG_HASH:=7e7477534409d5368eb1371ffde6820f0f79780a1a1f676161c48442cb303dfd
 
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/u-boot-$(PKG_VERSION)
 
@@ -20,23 +21,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
+       mkdir -p $(HOST_BUILD_DIR)/include/config
+       touch $(HOST_BUILD_DIR)/include/config/auto.conf
 endef
 
 define Host/Compile
-       rm -f $(HOST_BUILD_DIR)/tools/.depend
-       touch $(HOST_BUILD_DIR)/include/config.h
-       $(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))