Merge branch 'mimc200' into next

[oweals/u-boot.git] / include / libfdt_env.h

diff --git a/include/libfdt_env.h b/include/libfdt_env.h
index 98c522ae42af7a5984d644548017576def326d2b..ea474a56b1299e46f3948835fbcab1e2786c65ae 100644 (file)
--- a/include/libfdt_env.h
+++ b/include/libfdt_env.h
@@ -21,20 +21,44 @@
 #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>
+#include <endian.h>
+#include <byteswap.h>
 #else
 #include <linux/string.h>
+#include <linux/types.h>
+#include <asm/byteorder.h>
 #endif /* USE_HOSTCC */
 
-extern struct fdt_header *fdt;  /* Pointer to the working fdt */
+#include <stddef.h>
+extern struct fdt_header *working_fdt;  /* Pointer to the working fdt */
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#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)
+#else
+#define fdt32_to_cpu(x)                (x)
+#define cpu_to_fdt32(x)                (x)
+#define fdt64_to_cpu(x)                (x)
+#define cpu_to_fdt64(x)                (x)
+#endif
 
-#define fdt32_to_cpu(x)                __be32_to_cpu(x)
-#define cpu_to_fdt32(x)                __cpu_to_be32(x)
-#define fdt64_to_cpu(x)                __be64_to_cpu(x)
-#define cpu_to_fdt64(x)                __cpu_to_be64(x)
+#ifndef USE_HOSTCC
+/*
+ * Types for `void *' pointers.
+ *
+ * Note: libfdt uses this definition from /usr/include/stdint.h.
+ * Define it here rather than pulling in all of stdint.h.
+ */
+#if __WORDSIZE == 64
+typedef unsigned long int       uintptr_t;
+#else
+typedef unsigned int            uintptr_t;
+#endif
+#endif /* not USE_HOSTCC */
 
 #endif /* _LIBFDT_ENV_H */