X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Flibfdt_env.h;h=671c3a8981ad5071f3ec024fc97649a6ec93a7f4;hb=ee9536a28cb149bcb6c5dee9d08c62c91f4c72d2;hp=ab5c3012dbd4ac2fd6b3908a380ed271b0595b3a;hpb=4b7a6dd89633d60dc4b58476d5ce48247f82a3ca;p=oweals%2Fu-boot.git

diff --git a/include/libfdt_env.h b/include/libfdt_env.h
index ab5c3012db..671c3a8981 100644
--- a/include/libfdt_env.h
+++ b/include/libfdt_env.h
@@ -31,11 +31,23 @@
 
 #include <stddef.h>
 #include <asm/byteorder.h>
-extern struct fdt_header *fdt;  /* Pointer to the working fdt */
+extern struct fdt_header *working_fdt;  /* Pointer to the working fdt */
 
 #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)
 
+/*
+ * 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 /* _LIBFDT_ENV_H */