[2/7] libfdt: fix <linux/libfdt.h>

Message ID 1515490492-29434-2-git-send-email-yamada.masahiro@socionext.com
State Superseded
Headers show
Series
  • [1/7] libfdt: migrate fdt_rw.c to a wrapper of scripts/dtc/libfdt/fdt_rw.c
Related show

Commit Message

Masahiro Yamada Jan. 9, 2018, 9:34 a.m.
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>
---

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

Comments

Simon Glass Jan. 16, 2018, 2:50 p.m. | #1
On 9 January 2018 at 01:34, Masahiro Yamada
<yamada.masahiro@socionext.com> 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>
> ---
>
>  include/linux/libfdt.h | 22 +++++++---------------
>  1 file changed, 7 insertions(+), 15 deletions(-)

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

Or we could just delete this file, since it doesn't seem to be used.

Regards,
Simon

Patch

diff --git a/include/linux/libfdt.h b/include/linux/libfdt.h
index 2a663c6..27ba06e 100644
--- a/include/linux/libfdt.h
+++ b/include/linux/libfdt.h
@@ -1,17 +1,9 @@ 
-#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/fdt.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_ */