projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next
[platform/kernel/u-boot.git]
/
include
/
libfdt_env.h
diff --git
a/include/libfdt_env.h
b/include/libfdt_env.h
index
e746314
..
a7fd2f8
100644
(file)
--- a/
include/libfdt_env.h
+++ b/
include/libfdt_env.h
@@
-21,12
+21,17
@@
#ifndef _LIBFDT_ENV_H
#define _LIBFDT_ENV_H
#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/string.h>
+#include <linux/types.h>
+#endif /* USE_HOSTCC */
-struct fdt_header *fdt; /* Pointer to the working fdt */
+#include <stddef.h>
+#include <asm/byteorder.h>
+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 fdt32_to_cpu(x) __be32_to_cpu(x)
#define cpu_to_fdt32(x) __cpu_to_be32(x)