X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Flibfdt_env.h;h=3e3defc76ca36068a297dab17623d9525e288ec4;hb=25aca0fbb5e965566931e01f6d2d6a1bcbe09c6f;hp=78f725830da8b1a22b9682355df9ec320617f1b0;hpb=8e2dd87eee01bb1b83beab7caf22b851c5cafb2c;p=u-boot

diff --git a/include/libfdt_env.h b/include/libfdt_env.h
index 78f725830d..3e3defc76c 100644
--- a/include/libfdt_env.h
+++ b/include/libfdt_env.h
@@ -21,16 +21,18 @@
 #ifndef _LIBFDT_ENV_H
 #define _LIBFDT_ENV_H
 
-#include <stddef.h>
-#include <linux/types.h>
-#include <asm/byteorder.h>
-#include <linux/string.h>
+#include "compiler.h"
+#include "linux/types.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)
+typedef __be16 fdt16_t;
+typedef __be32 fdt32_t;
+typedef __be64 fdt64_t;
+
+#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)
 
 #endif /* _LIBFDT_ENV_H */