diff options
| author | Kim Phillips <kim.phillips@freescale.com> | 2013-01-16 13:59:04 +0000 |
|---|---|---|
| committer | Gerald Van Baren <gvb@unssw.com> | 2013-02-07 20:38:55 -0500 |
| commit | 12e06fe03fdcd9cb9e9805ff78d1027377a1416d (patch) | |
| tree | a383e2e08aa9aab0f39ac23a88b5f2a81561a043 | |
| parent | 6487d88aaa034e78e9882f7856ba670a8de88b41 (diff) | |
| download | u-boot-12e06fe03fdcd9cb9e9805ff78d1027377a1416d.tar.gz u-boot-12e06fe03fdcd9cb9e9805ff78d1027377a1416d.tar.xz u-boot-12e06fe03fdcd9cb9e9805ff78d1027377a1416d.zip | |
treewide: include libfdt_env.h before fdt.h
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>
| -rw-r--r-- | arch/arm/lib/bootm.c | 1 | ||||
| -rw-r--r-- | arch/powerpc/lib/bootm.c | 1 | ||||
| -rw-r--r-- | arch/x86/include/asm/arch-coreboot/sysinfo.h | 1 | ||||
| -rw-r--r-- | common/cmd_bootm.c | 1 | ||||
| -rw-r--r-- | common/cmd_fdt.c | 1 | ||||
| -rw-r--r-- | common/fdt_support.c | 1 | ||||
| -rw-r--r-- | common/image.c | 1 | ||||
| -rw-r--r-- | include/fdt_support.h | 1 | ||||
| -rw-r--r-- | include/image.h | 1 | ||||
| -rw-r--r-- | tools/fdt_host.h | 1 | ||||
| -rw-r--r-- | 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 1bd2730856..f3b30c57a3 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 7088293a36..33d013fcea 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 77ae304969..bd88eb588f 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 7ae5d5b294..f0338babeb 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 9e2de34737..6eec947fcb 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 6b9fa0550f..7a3fee4f4e 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 95498e6186..ae1a9d3bd1 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 4b9f84a24a..a08c90bb32 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 f5adc50353..8e285f9b9f 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 085013e02e..b08bf866ee 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 b21c505d48..a982a1378a 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> |