From f170eacc88b9815803d0df349ed2d29b27619627 Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Fri, 8 Aug 2014 21:03:14 +0000 Subject: [PATCH] mkimage: update to 2014.07 Signed-off-by: Luka Perkov SVN-Revision: 42082 --- tools/mkimage/Makefile | 4 ++-- tools/mkimage/patches/010-freebsd-ulong-fix.patch | 2 +- tools/mkimage/patches/040-include_order.patch | 2 +- tools/mkimage/patches/050-image_h_portability.patch | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/mkimage/Makefile b/tools/mkimage/Makefile index 47e918a5a22d..49eb26184d81 100644 --- a/tools/mkimage/Makefile +++ b/tools/mkimage/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mkimage -PKG_VERSION:=2014.04 +PKG_VERSION:=2014.07 PKG_SOURCE:=u-boot-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.denx.de/pub/u-boot -PKG_MD5SUM:=6d2116d1385a66e9a59742caa9d62a54 +PKG_MD5SUM:=36d4bad687edcafa396fee607e505d4e PKG_CAT:=bzcat HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/u-boot-$(PKG_VERSION) diff --git a/tools/mkimage/patches/010-freebsd-ulong-fix.patch b/tools/mkimage/patches/010-freebsd-ulong-fix.patch index 154346d8be80..75b9e892ad03 100644 --- a/tools/mkimage/patches/010-freebsd-ulong-fix.patch +++ b/tools/mkimage/patches/010-freebsd-ulong-fix.patch @@ -9,5 +9,5 @@ +#endif + #if defined(CONFIG_FIT) + #include #include - #include diff --git a/tools/mkimage/patches/040-include_order.patch b/tools/mkimage/patches/040-include_order.patch index f4fbbaf7578d..66f703c85554 100644 --- a/tools/mkimage/patches/040-include_order.patch +++ b/tools/mkimage/patches/040-include_order.patch @@ -1,6 +1,6 @@ --- a/tools/Makefile +++ b/tools/Makefile -@@ -173,7 +173,7 @@ +@@ -193,7 +193,7 @@ # Define _GNU_SOURCE to obtain the getline prototype from stdio.h # HOST_EXTRACFLAGS += -include $(srctree)/include/libfdt_env.h \ diff --git a/tools/mkimage/patches/050-image_h_portability.patch b/tools/mkimage/patches/050-image_h_portability.patch index 767a8b8713c4..304a7aa24765 100644 --- a/tools/mkimage/patches/050-image_h_portability.patch +++ b/tools/mkimage/patches/050-image_h_portability.patch @@ -8,7 +8,7 @@ /* Define this to avoid #ifdefs later on */ struct lmb; -@@ -240,13 +239,13 @@ +@@ -257,13 +256,13 @@ * all data in network byte order (aka natural aka bigendian). */ typedef struct image_header { -- 2.30.2