diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2020-04-15 16:59:17 +0900 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-04-15 11:38:38 +0200 |
| commit | 46312a239f193d41b2862a0b9e57e7bae3ec2f03 (patch) | |
| tree | b542a1a232075c971800e779cd7aef2703aa946a /include/linux | |
| parent | 8a3bd269763dc4883e63dad579613c3cbaa1a985 (diff) | |
| download | barebox-46312a239f193d41b2862a0b9e57e7bae3ec2f03.tar.gz barebox-46312a239f193d41b2862a0b9e57e7bae3ec2f03.tar.xz | |
libfdt: update <linux/libfdt.h> and <linux/libfdt_env.h> to Linux 5.7-rc1
Fix the relative include path in <linux/libfdt.h>
Including <linux/kernel.h> is too much. <linux/limits.h> is enough
for INT_MAX.
Define INT32_MAX and UINT32_MAX in the same way as Linux does.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/libfdt.h | 2 | ||||
| -rw-r--r-- | include/linux/libfdt_env.h | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/libfdt.h b/include/linux/libfdt.h index ef2467213b..90ed4ebfa6 100644 --- a/include/linux/libfdt.h +++ b/include/linux/libfdt.h @@ -3,6 +3,6 @@ #define _INCLUDE_LIBFDT_H_ #include <linux/libfdt_env.h> -#include "../scripts/dtc/libfdt/libfdt.h" +#include "../../scripts/dtc/libfdt/libfdt.h" #endif /* _INCLUDE_LIBFDT_H_ */ diff --git a/include/linux/libfdt_env.h b/include/linux/libfdt_env.h index bac4670d6d..cea8574a29 100644 --- a/include/linux/libfdt_env.h +++ b/include/linux/libfdt_env.h @@ -2,11 +2,14 @@ #ifndef LIBFDT_ENV_H #define LIBFDT_ENV_H -#include <linux/kernel.h> /* For INT_MAX */ +#include <linux/limits.h> /* For INT_MAX */ #include <linux/string.h> #include <asm/byteorder.h> +#define INT32_MAX S32_MAX +#define UINT32_MAX U32_MAX + typedef __be16 fdt16_t; typedef __be32 fdt32_t; typedef __be64 fdt64_t; @@ -16,6 +19,4 @@ typedef __be64 fdt64_t; #define fdt64_to_cpu(x) be64_to_cpu(x) #define cpu_to_fdt64(x) cpu_to_be64(x) -#define INT32_MAX 2147483647 - #endif /* LIBFDT_ENV_H */ |