Merge branch 'new-image' of git://www.denx.de/git/u-boot-testing

[u-boot] / libfdt / fdt.c

diff --git a/libfdt/fdt.c b/libfdt/fdt.c
index c61fb531b3ccf09270621eb3b1baea3278e4eeb4..cfa1989d8e544c53cb87f67d4a953b545cf2bf3e 100644 (file)
--- 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"
 
@@ -184,10 +188,7 @@ const char *_fdt_find_string(const char *strtab, int tabsize, const char *s)
 
 int fdt_move(const void *fdt, void *buf, int bufsize)
 {
-       int err = fdt_check_header(fdt);
-
-       if (err)
-               return err;
+       CHECK_HEADER(fdt);
 
        if (fdt_totalsize(fdt) > bufsize)
                return -FDT_ERR_NOSPACE;