Merge branch 'master' of /home/wd/git/u-boot/custodians

[u-boot] / include / libfdt_env.h

diff --git a/include/libfdt_env.h b/include/libfdt_env.h
index 355ebf27b2b6b9263c48a10d4ac1aab7d67814f0..1c67015a4a9a349a9301084fa32dae98e09421db 100644 (file)
--- a/include/libfdt_env.h
+++ b/include/libfdt_env.h
@@ -24,8 +24,13 @@
 #ifdef USE_HOSTCC
 #include <stdint.h>
 #include <string.h>
+#ifdef __MINGW32__
+#include <linux/types.h>
+#include <linux/byteorder/swab.h>
+#else
 #include <endian.h>
 #include <byteswap.h>
+#endif /* __MINGW32__ */
 #else
 #include <linux/string.h>
 #include <linux/types.h>
@@ -36,10 +41,17 @@
 extern struct fdt_header *working_fdt;  /* Pointer to the working fdt */
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
+#ifdef __MINGW32__
+#define fdt32_to_cpu(x)                ___swab32(x)
+#define cpu_to_fdt32(x)                ___swab32(x)
+#define fdt64_to_cpu(x)                ___swab64(x)
+#define cpu_to_fdt64(x)                ___swab64(x)
+#else
 #define fdt32_to_cpu(x)                bswap_32(x)
 #define cpu_to_fdt32(x)                bswap_32(x)
 #define fdt64_to_cpu(x)                bswap_64(x)
 #define cpu_to_fdt64(x)                bswap_64(x)
+#endif
 #else
 #define fdt32_to_cpu(x)                (x)
 #define cpu_to_fdt32(x)                (x)
@@ -47,6 +59,7 @@ extern struct fdt_header *working_fdt;  /* Pointer to the working fdt */
 #define cpu_to_fdt64(x)                (x)
 #endif
 
+#ifndef USE_HOSTCC
 /*
  * Types for `void *' pointers.
  *
@@ -58,5 +71,6 @@ typedef unsigned long int       uintptr_t;
 #else
 typedef unsigned int            uintptr_t;
 #endif
+#endif /* not USE_HOSTCC */
 
 #endif /* _LIBFDT_ENV_H */