diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-04-16 18:40:42 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-04-16 18:40:42 +0200 |
| commit | 049a1415c609a1134a15c5f8c4b0a4fe09514f10 (patch) | |
| tree | db5de9a483a2a421d3604e1e8b183b05252cfd24 /include | |
| parent | a142fa62b8d3c82f8da95dfb136ca986e7d31dd4 (diff) | |
| parent | 46312a239f193d41b2862a0b9e57e7bae3ec2f03 (diff) | |
| download | barebox-049a1415c609a1134a15c5f8c4b0a4fe09514f10.tar.gz barebox-049a1415c609a1134a15c5f8c4b0a4fe09514f10.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'include')
| -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 */ |