From b08c8c4870831c9315dcae237772238e80035bd5 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Mon, 5 Mar 2018 01:20:11 +0900 Subject: libfdt: move headers to and Thomas reported U-Boot failed to build host tools if libfdt-devel package is installed because tools include libfdt headers from /usr/include/ instead of using internal ones. This commit moves the header code: include/libfdt.h -> include/linux/libfdt.h include/libfdt_env.h -> include/linux/libfdt_env.h and replaces include directives: #include -> #include #include -> #include Reported-by: Thomas Petazzoni Signed-off-by: Masahiro Yamada --- lib/libfdt/Makefile | 2 ++ lib/libfdt/fdt_region.c | 4 ++-- lib/libfdt/fdt_ro.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'lib/libfdt') diff --git a/lib/libfdt/Makefile b/lib/libfdt/Makefile index 4e3e12f505..edd8e64ce0 100644 --- a/lib/libfdt/Makefile +++ b/lib/libfdt/Makefile @@ -23,3 +23,5 @@ obj-y += fdt_ro.o # U-Boot own file obj-y += fdt_region.o + +ccflags-y := -I$(srctree)/scripts/dtc/libfdt diff --git a/lib/libfdt/fdt_region.c b/lib/libfdt/fdt_region.c index 5bfc4da370..70914a4e9b 100644 --- a/lib/libfdt/fdt_region.c +++ b/lib/libfdt/fdt_region.c @@ -5,11 +5,11 @@ * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause */ -#include +#include #ifndef USE_HOSTCC #include -#include +#include #else #include "fdt_host.h" #endif diff --git a/lib/libfdt/fdt_ro.c b/lib/libfdt/fdt_ro.c index 1be9538fd2..d972d031c6 100644 --- a/lib/libfdt/fdt_ro.c +++ b/lib/libfdt/fdt_ro.c @@ -3,11 +3,11 @@ * Copyright (C) 2006 David Gibson, IBM Corporation. * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause */ -#include +#include #ifndef USE_HOSTCC #include -#include +#include #else #include "fdt_host.h" #endif -- cgit v1.2.3