summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Pouzenc <ludovic@pouzenc.fr>2018-09-15 00:08:46 +0200
committerLudovic Pouzenc <ludovic@pouzenc.fr>2018-09-15 00:08:46 +0200
commit2739d7c5e8a59f4d60581f9627208b87bb284258 (patch)
tree070aafc931ccc6654d5a6b29ea662f2df1efd5a4
parentbb31b38ee3573e53d70a6e0ca874aedbf52179d3 (diff)
downloadmtk-20170518-2739d7c5e8a59f4d60581f9627208b87bb284258.zip
mtk-20170518-2739d7c5e8a59f4d60581f9627208b87bb284258.tar.gz
mtk-20170518-2739d7c5e8a59f4d60581f9627208b87bb284258.tar.bz2
tools/mkimage: #include <fdt_support.h> and patch refresh
-rw-r--r--tools/mkimage/patches/010-freebsd-ulong-fix.patch2
-rw-r--r--tools/mkimage/patches/040-include_order.patch2
-rw-r--r--tools/mkimage/patches/050-image_h_portability.patch2
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/mkimage/patches/010-freebsd-ulong-fix.patch b/tools/mkimage/patches/010-freebsd-ulong-fix.patch
index 75b9e89..154346d 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 66f703c..f4fbbaf 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
-@@ -193,7 +193,7 @@
+@@ -173,7 +173,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 304a7aa..767a8b8 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;
-@@ -257,13 +256,13 @@
+@@ -240,13 +239,13 @@
* all data in network byte order (aka natural aka bigendian).
*/
typedef struct image_header {