diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-03-04 19:20:11 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2018-03-05 18:16:28 +0300 |
commit | b08c8c4870831c9315dcae237772238e80035bd5 (patch) | |
tree | c884e2e58c20806a730f9b462ef705d4c258b88c /lib | |
parent | e0d20dc1521e74b82dbd69be53a048847798a90a (diff) | |
download | u-boot-b08c8c4870831c9315dcae237772238e80035bd5.tar.xz |
libfdt: move headers to <linux/libfdt.h> and <linux/libfdt_env.h>
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 <libfdt.h> -> #include <linux/libfdt.h>
#include <libfdt_env.h> -> #include <linux/libfdt_env.h>
Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/efi_loader/efi_boottime.c | 2 | ||||
-rw-r--r-- | lib/efi_loader/efi_memory.c | 2 | ||||
-rw-r--r-- | lib/fdtdec.c | 2 | ||||
-rw-r--r-- | lib/fdtdec_common.c | 2 | ||||
-rw-r--r-- | lib/fdtdec_test.c | 2 | ||||
-rw-r--r-- | lib/libfdt/Makefile | 2 | ||||
-rw-r--r-- | lib/libfdt/fdt_region.c | 4 | ||||
-rw-r--r-- | lib/libfdt/fdt_ro.c | 4 | ||||
-rw-r--r-- | lib/of_live.c | 2 |
9 files changed, 12 insertions, 10 deletions
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 6eea2395c7..66e26fd63a 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -12,7 +12,7 @@ #include <environment.h> #include <malloc.h> #include <asm/global_data.h> -#include <libfdt_env.h> +#include <linux/libfdt_env.h> #include <u-boot/crc.h> #include <bootm.h> #include <inttypes.h> diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index aaf64421a3..ff0edf30ff 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -10,7 +10,7 @@ #include <efi_loader.h> #include <malloc.h> #include <asm/global_data.h> -#include <libfdt_env.h> +#include <linux/libfdt_env.h> #include <linux/list_sort.h> #include <inttypes.h> #include <watchdog.h> diff --git a/lib/fdtdec.c b/lib/fdtdec.c index df9d9ae433..320ee1dc56 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -11,7 +11,7 @@ #include <errno.h> #include <fdtdec.h> #include <fdt_support.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <serial.h> #include <asm/sections.h> #include <linux/ctype.h> diff --git a/lib/fdtdec_common.c b/lib/fdtdec_common.c index 63b704a3d7..2d083418e0 100644 --- a/lib/fdtdec_common.c +++ b/lib/fdtdec_common.c @@ -10,7 +10,7 @@ #ifndef USE_HOSTCC #include <common.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <fdtdec.h> #else #include "libfdt.h" diff --git a/lib/fdtdec_test.c b/lib/fdtdec_test.c index cc8b918f64..c51ffd7ecf 100644 --- a/lib/fdtdec_test.c +++ b/lib/fdtdec_test.c @@ -8,7 +8,7 @@ #include <common.h> #include <fdtdec.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <malloc.h> #include <os.h> 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 <libfdt_env.h> +#include <linux/libfdt_env.h> #ifndef USE_HOSTCC #include <fdt.h> -#include <libfdt.h> +#include <linux/libfdt.h> #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 <libfdt_env.h> +#include <linux/libfdt_env.h> #ifndef USE_HOSTCC #include <fdt.h> -#include <libfdt.h> +#include <linux/libfdt.h> #else #include "fdt_host.h" #endif diff --git a/lib/of_live.c b/lib/of_live.c index f351483387..148865c967 100644 --- a/lib/of_live.c +++ b/lib/of_live.c @@ -10,7 +10,7 @@ */ #include <common.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <of_live.h> #include <malloc.h> #include <dm/of_access.h> |