57 lines
1.7 KiB
Diff
57 lines
1.7 KiB
Diff
|
From 477ecb8d9ffa7b90d8bec0d8317b7e464e906f7c Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jan.kundrat@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.kundrat@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 7ead62e..f40b56c 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 10296a2..7ba13e6 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 f51f5f1..5897b6d 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
|
||
|
|
--
|
||
|
|
2.14.2
|
||
|
|
|