tools: mkimage: provide dtc path during build

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

diff --git a/tools/mkimage/Makefile b/tools/mkimage/Makefile
index 4aa822d606a08075e71b1c54dfe1f8076c5a9556..d0ff5f7e3701d5dd08e6f05ee896d356d5c3c96e 100644 (file)
--- a/tools/mkimage/Makefile
+++ b/tools/mkimage/Makefile
@@ -7,14 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mkimage
-PKG_VERSION:=2014.10
+PKG_VERSION:=2018.03
 
 PKG_SOURCE:=u-boot-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=\
        http://mirror2.openwrt.org/sources \
        ftp://ftp.denx.de/pub/u-boot
-PKG_HASH:=d3b132a7a9b3f3182b7aad71c2dfbd4fc15bea83e12c76134eb3ffefc07d1c71
-PKG_CAT:=bzcat
+PKG_HASH:=7e7477534409d5368eb1371ffde6820f0f79780a1a1f676161c48442cb303dfd
 
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/u-boot-$(PKG_VERSION)
 
@@ -22,25 +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 \
-               $(HOST_BUILD_DIR)/tools/.depend
-       touch $(HOST_BUILD_DIR)/include/config.mk
-       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) defconfig   HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" HOSTLDFLAGS="$(HOST_LDFLAGS) $$$$(pkg-config --static --libs libcrypto)"
-       $(MAKE) -C $(HOST_BUILD_DIR) tools-only  HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" HOSTLDFLAGS="$(HOST_LDFLAGS) $$$$(pkg-config --static --libs libcrypto)"
+       $(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))