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 /tools | |
| parent | e0d20dc1521e74b82dbd69be53a048847798a90a (diff) | |
| download | u-boot-b08c8c4870831c9315dcae237772238e80035bd5.tar.gz | |
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 'tools')
| -rw-r--r-- | tools/dtoc/dtb_platdata.py | 2 | ||||
| -rw-r--r-- | tools/dtoc/test_dtoc.py | 2 | ||||
| -rw-r--r-- | tools/fdt_host.h | 2 | ||||
| -rw-r--r-- | tools/ifdtool.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tools/dtoc/dtb_platdata.py b/tools/dtoc/dtb_platdata.py index dc9c0d9f45..c5767e5fb4 100644 --- a/tools/dtoc/dtb_platdata.py +++ b/tools/dtoc/dtb_platdata.py @@ -422,7 +422,7 @@ class DtbPlatdata(object): """ self.out_header() self.out('#include <stdbool.h>\n') - self.out('#include <libfdt.h>\n') + self.out('#include <linux/libfdt.h>\n') # Output the struct definition for name in sorted(structs): diff --git a/tools/dtoc/test_dtoc.py b/tools/dtoc/test_dtoc.py index 41ed80e6da..0553b5cdf9 100644 --- a/tools/dtoc/test_dtoc.py +++ b/tools/dtoc/test_dtoc.py @@ -33,7 +33,7 @@ HEADER = '''/* */ #include <stdbool.h> -#include <libfdt.h>''' +#include <linux/libfdt.h>''' C_HEADER = '''/* * DO NOT MODIFY diff --git a/tools/fdt_host.h b/tools/fdt_host.h index 8d4aa066bb..98acf278a3 100644 --- a/tools/fdt_host.h +++ b/tools/fdt_host.h @@ -8,7 +8,7 @@ #define __FDT_HOST_H__ /* Make sure to include u-boot version of libfdt include files */ -#include "../include/libfdt.h" +#include "../include/linux/libfdt.h" #include "../include/fdt_support.h" /** diff --git a/tools/ifdtool.c b/tools/ifdtool.c index 729991ee33..e4c2f82c4a 100644 --- a/tools/ifdtool.c +++ b/tools/ifdtool.c @@ -19,7 +19,7 @@ #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include "ifdtool.h" #undef DEBUG |