diff mbox series

[v3,4/6] libfdt: move working_fdt and FDT_RAMDISK_OVERHEAD to include/libfdt.h

Message ID 1516529958-16441-4-git-send-email-yamada.masahiro@socionext.com
State Accepted
Commit 25ad202dd3268c3bda692de83485ca7649f2a57c
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 
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>
---

Changes in v3: None

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

Comments

Tom Rini Jan. 28, 2018, 6:54 p.m. UTC | #1 
On Sun, Jan 21, 2018 at 07:19:16PM +0900, Masahiro Yamada 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>

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


Applied to u-boot/master, thanks!

-- 
Tom
diff mbox series

Patch

diff --git a/include/libfdt.h b/include/libfdt.h
index 7ba13e6..dbc56ec 100644
--- 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 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 */