aboutsummaryrefslogtreecommitdiffstats
path: root/tools/mkimage/Makefile
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-04-14 23:00:12 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2018-04-18 23:59:32 +0200
commitb13e981d72c14ba4c39f85f0d24a8f7947a1b2c4 (patch)
tree71760edb1ae1c3c1d704461e405d6fced0c4e206 /tools/mkimage/Makefile
parent68150d3125447a40cf103aeefd9bcb6c874e6769 (diff)
downloadupstream-b13e981d72c14ba4c39f85f0d24a8f7947a1b2c4.tar.gz
upstream-b13e981d72c14ba4c39f85f0d24a8f7947a1b2c4.tar.bz2
upstream-b13e981d72c14ba4c39f85f0d24a8f7947a1b2c4.zip
tools/mkimage: update to version 2018.03
This activates support for fit images and some other new mkimage features. Some of the patches were applied upstream and could be removed. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'tools/mkimage/Makefile')
-rw-r--r--tools/mkimage/Makefile21
1 files changed, 10 insertions, 11 deletions
diff --git a/tools/mkimage/Makefile b/tools/mkimage/Makefile
index 00f85ae272..c7e1dfd672 100644
--- 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,17 +21,17 @@ 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)" HOST_LOADLIBES="$$$$(pkg-config --static --libs libcrypto)"
- $(MAKE) -C $(HOST_BUILD_DIR) tools-only HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" HOSTLDFLAGS="$(HOST_LDFLAGS)" HOST_LOADLIBES="$$$$(pkg-config --static --libs libcrypto)"
+ $(MAKE) -C $(HOST_BUILD_DIR) \
+ HOSTCFLAGS="$(HOST_CFLAGS)" \
+ HOSTLDFLAGS="$(HOST_LDFLAGS)" \
+ no-dot-config-targets=tools-only \
+ CONFIG_FIT_SIGNATURE=y \
+ tools-only
endef
define Host/Install