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 --- include/linux/libfdt_env.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'include/linux/libfdt_env.h') diff --git a/include/linux/libfdt_env.h b/include/linux/libfdt_env.h index 8178f9174bf..0d209a64928 100644 --- a/include/linux/libfdt_env.h +++ b/include/linux/libfdt_env.h @@ -1,3 +1,11 @@ +#ifdef USE_HOSTCC +#include "../scripts/dtc/libfdt/libfdt_env.h" +#else +/* + * This position of the include guard is intentional. + * Using the same guard name as that of scripts/dtc/libfdt/libfdt_env.h + * prevents it from being included. + */ #ifndef _LIBFDT_ENV_H #define _LIBFDT_ENV_H @@ -20,3 +28,4 @@ typedef __be64 fdt64_t; #define strtoul(cp, endp, base) simple_strtoul(cp, endp, base) #endif /* _LIBFDT_ENV_H */ +#endif -- cgit v1.2.3