[5/7] libfdt: move working_fdt and FDT_RAMDISK_OVERHEAD to include/libfdt.h

Message ID 1515490492-29434-5-git-send-email-yamada.masahiro@socionext.com
State New
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.
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>
---

 include/libfdt.h     | 5 +++++
 include/libfdt_env.h | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

Comments

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

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

Patch

diff --git a/include/libfdt.h b/include/libfdt.h
index 4e2c841..59da5bc 100644
--- a/include/libfdt.h
+++ b/include/libfdt.h
@@ -2150,4 +2150,9 @@  int fdt_add_alias_regions(const void *fdt, struct fdt_region *region, int count,
 			  int max_regions, struct fdt_region_state *info);
 #endif /* SWIG */
 
+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 /* _LIBFDT_H */
diff --git a/include/libfdt_env.h b/include/libfdt_env.h
index 273b5d3..ea26979 100644
--- 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 */