Fix host tool build breakage, take two

Revert commit 87c8431f and fix build breakage so that the build continues
to work on FC systems.

Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>

diff --git a/include/fdt.h b/include/fdt.h
index 39beada63019016c83310dfc03002e3214585b7d..48ccfd9100002deb3aff35ee4f17bc7d232b25b2 100644 (file)
--- a/include/fdt.h
+++ b/include/fdt.h
@@ -3,10 +3,6 @@
 
 #ifndef __ASSEMBLY__
 
-#ifdef USE_HOSTCC
-#include <stdint.h>
-#endif
-
 struct fdt_header {
        uint32_t magic;                  /* magic word FDT_MAGIC */
        uint32_t totalsize;              /* total size of DT block */

diff --git a/include/libfdt_env.h b/include/libfdt_env.h
index 98c522ae42af7a5984d644548017576def326d2b..ab5c3012dbd4ac2fd6b3908a380ed271b0595b3a 100644 (file)
--- a/include/libfdt_env.h
+++ b/include/libfdt_env.h
@@ -21,15 +21,16 @@
 #ifndef _LIBFDT_ENV_H
 #define _LIBFDT_ENV_H
 
-#include <stddef.h>
-#include <linux/types.h>
-#include <asm/byteorder.h>
 #ifdef USE_HOSTCC
+#include <stdint.h>
 #include <string.h>
 #else
 #include <linux/string.h>
+#include <linux/types.h>
 #endif /* USE_HOSTCC */
 
+#include <stddef.h>
+#include <asm/byteorder.h>
 extern struct fdt_header *fdt;  /* Pointer to the working fdt */
 
 #define fdt32_to_cpu(x)                __be32_to_cpu(x)