diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-01-21 19:19:16 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-01-28 12:27:31 -0500 |
| commit | 25ad202dd3268c3bda692de83485ca7649f2a57c (patch) | |
| tree | 842e0d2f74dfd6cc3730dbd56ba5a371271dd119 /include | |
| parent | d2bf1152c078e7db7ffade193da8cfb1b8430ce0 (diff) | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/libfdt.h | 13 | ||||
| -rw-r--r-- | include/libfdt_env.h | 5 |
2 files changed, 13 insertions, 5 deletions
diff --git a/include/libfdt.h b/include/libfdt.h index 7ba13e634b..dbc56ec62e 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 273b5d30f8..ea26979fc2 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 */ |