diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile | 2 | ||||
| -rw-r--r-- | tools/dtoc/dtb_platdata.py | 2 | ||||
| -rw-r--r-- | tools/dtoc/test_dtoc.py | 2 | ||||
| -rw-r--r-- | tools/env/fw_env.c | 2 | ||||
| -rw-r--r-- | tools/fdt_host.h | 2 | ||||
| -rw-r--r-- | tools/ifdtool.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/tools/Makefile b/tools/Makefile index d3387fad69..f38f68ee47 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -244,7 +244,7 @@ endif # !LOGO_BMP # HOST_EXTRACFLAGS += -include $(srctree)/include/compiler.h \ $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \ - -I$(srctree)/lib/libfdt \ + -I$(srctree)/scripts/dtc/libfdt \ -I$(srctree)/tools \ -DUSE_HOSTCC \ -D__KERNEL_STRICT_NAMES \ 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/env/fw_env.c b/tools/env/fw_env.c index 6b71acb28f..0e3e34321f 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -357,7 +357,7 @@ static int get_config (char *); static char *skip_chars(char *s) { for (; *s != '\0'; s++) { - if (isblank(*s)) + if (isblank(*s) || *s == '=') return s; } return NULL; 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 |