diff mbox series

[v3,2/6] libfdt: fix <linux/libfdt.h>

Message ID 1516529958-16441-2-git-send-email-yamada.masahiro@socionext.com
State Accepted
Commit b0bd96c858afc273b6030a4c19c5074e6163b6f8
Headers show
Series [v3,1/6] libfdt: migrate fdt_rw.c to a wrapper of scripts/dtc/libfdt/fdt_rw.c | expand

Commit Message

Masahiro Yamada Jan. 21, 2018, 10:19 a.m. UTC 
I do not remember why, but this is apparently a file-copy mistake.
The file name is libfdt.h, but its content is that of libfdt_env.h

Re-import it from upstream Linux.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

Changes in v3:
  - Re-import from linux-next

 include/linux/libfdt.h | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

Comments

Tom Rini Jan. 28, 2018, 6:53 p.m. UTC | #1 
On Sun, Jan 21, 2018 at 07:19:14PM +0900, Masahiro Yamada wrote:

> I do not remember why, but this is apparently a file-copy mistake.

> The file name is libfdt.h, but its content is that of libfdt_env.h

> 

> Re-import it from upstream Linux.

> 

> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

> Reviewed-by: Simon Glass <sjg@chromium.org>


Applied to u-boot/master, thanks!

-- 
Tom
diff mbox series

Patch

diff --git a/include/linux/libfdt.h b/include/linux/libfdt.h
index 2a663c6..90ed4eb 100644
--- a/include/linux/libfdt.h
+++ b/include/linux/libfdt.h
@@ -1,17 +1,8 @@ 
-#ifndef _LIBFDT_ENV_H
-#define _LIBFDT_ENV_H
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _INCLUDE_LIBFDT_H_
+#define _INCLUDE_LIBFDT_H_
 
-#include <linux/string.h>
+#include <linux/libfdt_env.h>
+#include "../../scripts/dtc/libfdt/libfdt.h"
 
-#include <asm/byteorder.h>
-
-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 */
+#endif /* _INCLUDE_LIBFDT_H_ */