summaryrefslogtreecommitdiff
path: root/libfdt
diff options
context:
space:
mode:
authorBartlomiej Sieka <tur@semihalf.com>2008-03-26 09:38:06 +0100
committerBartlomiej Sieka <tur@semihalf.com>2008-03-26 09:38:06 +0100
commit27f33e9f45ef7f9685cbdc65066a1828e85dde4f (patch)
tree5828044d71e5caa3bec4d05c6c48793df0cd17a3 /libfdt
parent18e69a35efbb078403db0c0063986470dad7d082 (diff)
parent388b82fddc7c05596f3f615f190da0448227dc82 (diff)
downloadu-boot-imx-27f33e9f45ef7f9685cbdc65066a1828e85dde4f.zip
u-boot-imx-27f33e9f45ef7f9685cbdc65066a1828e85dde4f.tar.gz
u-boot-imx-27f33e9f45ef7f9685cbdc65066a1828e85dde4f.tar.bz2
Merge branch 'new-image' of git://www.denx.de/git/u-boot-testing
Conflicts: common/cmd_bootm.c cpu/mpc8xx/cpu.c Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
Diffstat (limited to 'libfdt')
-rw-r--r--libfdt/fdt.c4
-rw-r--r--libfdt/fdt_ro.c4
-rw-r--r--libfdt/fdt_rw.c4
-rw-r--r--libfdt/fdt_strerror.c4
-rw-r--r--libfdt/fdt_wip.c4
5 files changed, 20 insertions, 0 deletions
diff --git a/libfdt/fdt.c b/libfdt/fdt.c
index bd91712..cfa1989 100644
--- a/libfdt/fdt.c
+++ b/libfdt/fdt.c
@@ -50,8 +50,12 @@
*/
#include "libfdt_env.h"
+#ifndef USE_HOSTCC
#include <fdt.h>
#include <libfdt.h>
+#else
+#include "fdt_host.h"
+#endif
#include "libfdt_internal.h"
diff --git a/libfdt/fdt_ro.c b/libfdt/fdt_ro.c
index 63fa129..11d80d2 100644
--- a/libfdt/fdt_ro.c
+++ b/libfdt/fdt_ro.c
@@ -50,8 +50,12 @@
*/
#include "libfdt_env.h"
+#ifndef USE_HOSTCC
#include <fdt.h>
#include <libfdt.h>
+#else
+#include "fdt_host.h"
+#endif
#include "libfdt_internal.h"
diff --git a/libfdt/fdt_rw.c b/libfdt/fdt_rw.c
index 0df472b..8609fa7 100644
--- a/libfdt/fdt_rw.c
+++ b/libfdt/fdt_rw.c
@@ -50,8 +50,12 @@
*/
#include "libfdt_env.h"
+#ifndef USE_HOSTCC
#include <fdt.h>
#include <libfdt.h>
+#else
+#include "fdt_host.h"
+#endif
#include "libfdt_internal.h"
diff --git a/libfdt/fdt_strerror.c b/libfdt/fdt_strerror.c
index f9d32ef..abf792e 100644
--- a/libfdt/fdt_strerror.c
+++ b/libfdt/fdt_strerror.c
@@ -50,8 +50,12 @@
*/
#include "libfdt_env.h"
+#ifndef USE_HOSTCC
#include <fdt.h>
#include <libfdt.h>
+#else
+#include "fdt_host.h"
+#endif
#include "libfdt_internal.h"
diff --git a/libfdt/fdt_wip.c b/libfdt/fdt_wip.c
index 88e24b8..24e1724 100644
--- a/libfdt/fdt_wip.c
+++ b/libfdt/fdt_wip.c
@@ -50,8 +50,12 @@
*/
#include "libfdt_env.h"
+#ifndef USE_HOSTCC
#include <fdt.h>
#include <libfdt.h>
+#else
+#include "fdt_host.h"
+#endif
#include "libfdt_internal.h"