diff options
| author | Bartlomiej Sieka <tur@semihalf.com> | 2008-03-26 09:38:06 +0100 |
|---|---|---|
| committer | Bartlomiej Sieka <tur@semihalf.com> | 2008-03-26 09:38:06 +0100 |
| commit | 27f33e9f45ef7f9685cbdc65066a1828e85dde4f (patch) | |
| tree | 5828044d71e5caa3bec4d05c6c48793df0cd17a3 /libfdt | |
| parent | 18e69a35efbb078403db0c0063986470dad7d082 (diff) | |
| parent | 388b82fddc7c05596f3f615f190da0448227dc82 (diff) | |
| download | blackbird-obmc-uboot-27f33e9f45ef7f9685cbdc65066a1828e85dde4f.tar.gz blackbird-obmc-uboot-27f33e9f45ef7f9685cbdc65066a1828e85dde4f.zip | |
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.c | 4 | ||||
| -rw-r--r-- | libfdt/fdt_ro.c | 4 | ||||
| -rw-r--r-- | libfdt/fdt_rw.c | 4 | ||||
| -rw-r--r-- | libfdt/fdt_strerror.c | 4 | ||||
| -rw-r--r-- | libfdt/fdt_wip.c | 4 |
5 files changed, 20 insertions, 0 deletions
diff --git a/libfdt/fdt.c b/libfdt/fdt.c index bd91712378..cfa1989d8e 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 63fa1290be..11d80d2fa2 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 0df472bc5e..8609fa7d76 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 f9d32ef536..abf792e7de 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 88e24b8318..24e172495a 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" |
