libfdt: move working_fdt and FDT_RAMDISK_OVERHEAD to include/libfdt.h

libfdt_env.h exists to contain system-dependent defines:

  - typedef of fdt*_t
  - fdt*_to_cpu(), cpu_to_fdt*

working_fdt and FDT_RAMDISK_OVERHEAD are unrelated to the environment,
so they must get out of this header.

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

diff --git a/include/libfdt.h b/include/libfdt.h
index 7ba13e634b654b2023d5bdb75b7ac927f24857f0..dbc56ec62e9f4803fe7f9cbec4e5830fd509e321 100644 (file)
--- a/include/libfdt.h
+++ b/include/libfdt.h
@@ -1 +1,14 @@
+#ifndef UBOOT_LIBFDT_H
+#define UBOOT_LIBFDT_H
+/*
+ * SPDX-License-Identifier:     GPL-2.0+ BSD-2-Clause
+ */
+
 #include "../lib/libfdt/libfdt.h"
+
+extern struct fdt_header *working_fdt; /* Pointer to the working fdt */
+
+/* adding a ramdisk needs 0x44 bytes in version 2008.10 */
+#define FDT_RAMDISK_OVERHEAD   0x80
+
+#endif /* UBOOT_LIBFDT_H */

diff --git a/include/libfdt_env.h b/include/libfdt_env.h
index 273b5d30f867265dd364a2502946661b39e64359..ea26979fc221d7eed02794af4efbf67d7c735911 100644 (file)
--- a/include/libfdt_env.h
+++ b/include/libfdt_env.h
@@ -12,8 +12,6 @@
 #include "compiler.h"
 #include "linux/types.h"
 
-extern struct fdt_header *working_fdt;  /* Pointer to the working fdt */
-
 typedef __be16 fdt16_t;
 typedef __be32 fdt32_t;
 typedef __be64 fdt64_t;
@@ -23,7 +21,4 @@ typedef __be64 fdt64_t;
 #define fdt64_to_cpu(x)                be64_to_cpu(x)
 #define cpu_to_fdt64(x)                cpu_to_be64(x)
 
-/* adding a ramdisk needs 0x44 bytes in version 2008.10 */
-#define FDT_RAMDISK_OVERHEAD   0x80
-
 #endif /* _LIBFDT_ENV_H */