diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-08-08 21:03:14 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-08-08 21:03:14 +0000 |
| commit | 0b329786582410e2463cfaf10d83323bb5fd0bae (patch) | |
| tree | e3b610b7b57f3c6eb38a05593ba1324d721c6dc9 /tools/mkimage | |
| parent | 5822a21b55e4c0def29f1acf5053217f709d5361 (diff) | |
| download | upstream-0b329786582410e2463cfaf10d83323bb5fd0bae.tar.gz upstream-0b329786582410e2463cfaf10d83323bb5fd0bae.tar.bz2 upstream-0b329786582410e2463cfaf10d83323bb5fd0bae.zip | |
[tools] mkimage: update to 2014.07
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42082 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/mkimage')
| -rw-r--r-- | tools/mkimage/Makefile | 4 | ||||
| -rw-r--r-- | tools/mkimage/patches/010-freebsd-ulong-fix.patch | 2 | ||||
| -rw-r--r-- | tools/mkimage/patches/040-include_order.patch | 2 | ||||
| -rw-r--r-- | 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 47e918a5a2..49eb26184d 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 154346d8be..75b9e892ad 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 <hash.h> #include <libfdt.h> - #include <fdt_support.h> diff --git a/tools/mkimage/patches/040-include_order.patch b/tools/mkimage/patches/040-include_order.patch index f4fbbaf757..66f703c855 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 767a8b8713..304a7aa247 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 { |