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 /arch | |
parent | 6487d88aaa034e78e9882f7856ba670a8de88b41 (diff) |
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>
Diffstat (limited to 'arch')
-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 |
3 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 1bd27308568..f3b30c57a37 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 7088293a364..33d013fcea0 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 77ae304969c..bd88eb588ff 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> |