| Message ID | c34c0061c35fdb8b905c43ef01ca98b0c2e57382.1509675580.git.jan.kundrat@cesnet.cz |
|---|---|
| State | Accepted |
| Commit | b95a5190ba9284a06f9d0c56589bcb4080b4710a |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot] Do not attempt to use the systemwide libfdt | expand |
On Fri, Nov 03, 2017 at 03:06:35AM +0100, Jan Kundrát wrote: > 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> Applied to u-boot/master, thanks!
diff --git a/include/fdt.h b/include/fdt.h index 7ead62e777..f40b56c755 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 10296a21ad..7ba13e634b 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 f51f5f15f5..5897b6d5f7 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
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(-)