summaryrefslogtreecommitdiff
path: root/common
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 /common
parent6487d88aaa034e78e9882f7856ba670a8de88b41 (diff)
downloadu-boot-imx-12e06fe03fdcd9cb9e9805ff78d1027377a1416d.zip
u-boot-imx-12e06fe03fdcd9cb9e9805ff78d1027377a1416d.tar.gz
u-boot-imx-12e06fe03fdcd9cb9e9805ff78d1027377a1416d.tar.bz2
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 'common')
-rw-r--r--common/cmd_bootm.c1
-rw-r--r--common/cmd_fdt.c1
-rw-r--r--common/fdt_support.c1
-rw-r--r--common/image.c1
4 files changed, 0 insertions, 4 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 7ae5d5b..f0338ba 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