summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKim Phillips <kim.phillips@freescale.com>2013-01-16 13:59:04 +0000
committerGerald Van Baren <gvb@unssw.com>2013-02-07 20:38:55 -0500
commit12e06fe03fdcd9cb9e9805ff78d1027377a1416d (patch)
treea383e2e08aa9aab0f39ac23a88b5f2a81561a043 /include
parent6487d88aaa034e78e9882f7856ba670a8de88b41 (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 'include')
-rw-r--r--include/fdt_support.h1
-rw-r--r--include/image.h1
2 files changed, 1 insertions, 1 deletions
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 */