and, if including libfdt.h which includes libfdt_env.h in the correct order, don't include fdt.h before libfdt.h.
this is needed to get the fdt type definitions set from the project environment before fdt.h uses them.
Signed-off-by: Kim Phillips kim.phillips@freescale.com Cc: Jerry Van Baren gvb.uboot@gmail.com --- arch/arm/lib/bootm.c | 1 - arch/powerpc/lib/bootm.c | 1 - arch/x86/include/asm/arch-coreboot/sysinfo.h | 1 + common/cmd_bootm.c | 1 - common/cmd_fdt.c | 1 - common/fdt_support.c | 1 - common/image.c | 1 - include/fdt_support.h | 1 + include/image.h | 1 - tools/fdt_host.h | 1 - tools/imls/imls.c | 1 - 11 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 1bd2730..f3b30c5 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -30,7 +30,6 @@ #include <image.h> #include <u-boot/zlib.h> #include <asm/byteorder.h> -#include <fdt.h> #include <libfdt.h> #include <fdt_support.h> #include <asm/bootm.h> diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c index 7088293..33d013f 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -36,7 +36,6 @@ #include <asm/mp.h>
#if defined(CONFIG_OF_LIBFDT) -#include <fdt.h> #include <libfdt.h> #include <fdt_support.h>
diff --git a/arch/x86/include/asm/arch-coreboot/sysinfo.h b/arch/x86/include/asm/arch-coreboot/sysinfo.h index 77ae304..bd88eb5 100644 --- a/arch/x86/include/asm/arch-coreboot/sysinfo.h +++ b/arch/x86/include/asm/arch-coreboot/sysinfo.h @@ -32,6 +32,7 @@
#include <common.h> #include <compiler.h> +#include <libfdt_env.h> #include <fdt.h> #include <asm/arch/tables.h>
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 1b8a8c1..e886c4a 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -47,7 +47,6 @@ #endif
#if defined(CONFIG_OF_LIBFDT) -#include <fdt.h> #include <libfdt.h> #include <fdt_support.h> #endif diff --git a/common/cmd_fdt.c b/common/cmd_fdt.c index 9e2de34..6eec947 100644 --- a/common/cmd_fdt.c +++ b/common/cmd_fdt.c @@ -29,7 +29,6 @@ #include <linux/ctype.h> #include <linux/types.h> #include <asm/global_data.h> -#include <fdt.h> #include <libfdt.h> #include <fdt_support.h>
diff --git a/common/fdt_support.c b/common/fdt_support.c index 6b9fa05..7a3fee4 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -28,7 +28,6 @@ #include <linux/ctype.h> #include <linux/types.h> #include <asm/global_data.h> -#include <fdt.h> #include <libfdt.h> #include <fdt_support.h> #include <exports.h> diff --git a/common/image.c b/common/image.c index 95498e6..ae1a9d3 100644 --- a/common/image.c +++ b/common/image.c @@ -47,7 +47,6 @@ #include <image.h>
#if defined(CONFIG_FIT) || defined(CONFIG_OF_LIBFDT) -#include <fdt.h> #include <libfdt.h> #include <fdt_support.h> #endif diff --git a/include/fdt_support.h b/include/fdt_support.h index 4b9f84a..a08c90b 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -26,6 +26,7 @@
#ifdef CONFIG_OF_LIBFDT
+#include <libfdt_env.h> #include <fdt.h>
u32 fdt_getprop_u32_default(const void *fdt, const char *path, diff --git a/include/image.h b/include/image.h index f5adc50..8e285f9 100644 --- a/include/image.h +++ b/include/image.h @@ -52,7 +52,6 @@ #endif /* USE_HOSTCC */
#if defined(CONFIG_FIT) -#include <fdt.h> #include <libfdt.h> #include <fdt_support.h> #define CONFIG_MD5 /* FIT images need MD5 support */ diff --git a/tools/fdt_host.h b/tools/fdt_host.h index 085013e..b08bf86 100644 --- a/tools/fdt_host.h +++ b/tools/fdt_host.h @@ -21,7 +21,6 @@ #define __FDT_HOST_H__
/* Make sure to include u-boot version of libfdt include files */ -#include "../include/fdt.h" #include "../include/libfdt.h" #include "../include/fdt_support.h"
diff --git a/tools/imls/imls.c b/tools/imls/imls.c index b21c505..a982a13 100644 --- a/tools/imls/imls.c +++ b/tools/imls/imls.c @@ -38,7 +38,6 @@ #endif
#include <sha1.h> -#include <fdt.h> #include <libfdt.h> #include <fdt_support.h> #include <image.h>