Fixes the problem, occuring when dtc is installed on the host.
The patch is upstream.

Signed-off-by: Clemens Gruber <clemens.gru...@pqgruber.com>
---
 ...-not-attempt-to-use-the-systemwide-libfdt.patch | 52 ++++++++++++++++++++++
 patches/u-boot-2017.09/series                      |  5 +++
 2 files changed, 57 insertions(+)
 create mode 100644 
patches/u-boot-2017.09/0001-Do-not-attempt-to-use-the-systemwide-libfdt.patch
 create mode 100644 patches/u-boot-2017.09/series

diff --git 
a/patches/u-boot-2017.09/0001-Do-not-attempt-to-use-the-systemwide-libfdt.patch 
b/patches/u-boot-2017.09/0001-Do-not-attempt-to-use-the-systemwide-libfdt.patch
new file mode 100644
index 000000000..94aee2413
--- /dev/null
+++ 
b/patches/u-boot-2017.09/0001-Do-not-attempt-to-use-the-systemwide-libfdt.patch
@@ -0,0 +1,52 @@
+From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jan.kund...@cesnet.cz>
+Date: Fri, 3 Nov 2017 03:06:35 +0100
+Subject: [PATCH] Do not attempt to use the systemwide libfdt
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+U-Boot bundles a patched copy of libfdt, so it's wrong to attempt to
+include it <like/this>. This breaks the build for me when I have dtc
+fully installed in my host -- as happened earlier tonight with
+Buildroot, for example.
+
+There are several other occurrences throughout the code where '<libfdt'
+matches. I'm not modifying these because I have no clue why the
+<systemwide> include style is being used -- IMHO wrongly.
+
+Signed-off-by: Jan Kundrát <jan.kund...@cesnet.cz>
+---
+ include/fdt.h    | 2 +-
+ include/libfdt.h | 2 +-
+ tools/fdtgrep.c  | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/include/fdt.h b/include/fdt.h
+index 7ead62e77715..f40b56c75545 100644
+--- a/include/fdt.h
++++ b/include/fdt.h
+@@ -1 +1 @@
+-#include <../lib/libfdt/fdt.h>
++#include "../lib/libfdt/fdt.h"
+diff --git a/include/libfdt.h b/include/libfdt.h
+index 10296a21addf..7ba13e634b65 100644
+--- a/include/libfdt.h
++++ b/include/libfdt.h
+@@ -1 +1 @@
+-#include <../lib/libfdt/libfdt.h>
++#include "../lib/libfdt/libfdt.h"
+diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c
+index f51f5f15f549..5897b6d5f780 100644
+--- a/tools/fdtgrep.c
++++ b/tools/fdtgrep.c
+@@ -16,8 +16,8 @@
+ #include <string.h>
+ #include <unistd.h>
+ 
+-#include <../include/libfdt.h>
+-#include <libfdt_internal.h>
++#include "../include/libfdt.h"
++#include "libfdt_internal.h"
+ 
+ /* Define DEBUG to get some debugging output on stderr */
+ #ifdef DEBUG
diff --git a/patches/u-boot-2017.09/series b/patches/u-boot-2017.09/series
new file mode 100644
index 000000000..49260d81a
--- /dev/null
+++ b/patches/u-boot-2017.09/series
@@ -0,0 +1,5 @@
+# generated by git-ptx-patches
+#tag:base --start-number 0
+#tag:upstream --start-number 1
+0001-Do-not-attempt-to-use-the-systemwide-libfdt.patch
+# a8e035bf38bdaf0a13114ea507417c0d  - git-ptx-patches magic
-- 
2.15.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Reply via email to