diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-03-05 01:20:11 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-03-05 10:16:28 -0500 |
| commit | b08c8c4870831c9315dcae237772238e80035bd5 (patch) | |
| tree | c884e2e58c20806a730f9b462ef705d4c258b88c /include/linux/libfdt_env.h | |
| parent | e0d20dc1521e74b82dbd69be53a048847798a90a (diff) | |
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 'include/linux/libfdt_env.h')
| -rw-r--r-- | include/linux/libfdt_env.h | 9 |
1 files changed, 9 insertions, 0 deletions
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 |