Commit a8de1304 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Rob Herring

libfdt: define INT32_MAX and UINT32_MAX in libfdt_env.h

The DTC v1.5.1 added references to (U)INT32_MAX.

This is no problem for user-space programs since <stdint.h> defines
(U)INT32_MAX along with (u)int32_t.

For the kernel space, libfdt_env.h needs to be adjusted before we
pull in the changes.

In the kernel, we usually use s/u32 instead of (u)int32_t for the
fixed-width types.

Accordingly, we already have S/U32_MAX for their max values.
So, we should not add (U)INT32_MAX to <linux/limits.h> any more.

Instead, add them to the in-kernel libfdt_env.h to compile the
latest libfdt.
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 30a3e01d
...@@ -2,11 +2,13 @@ ...@@ -2,11 +2,13 @@
#ifndef _ARM_LIBFDT_ENV_H #ifndef _ARM_LIBFDT_ENV_H
#define _ARM_LIBFDT_ENV_H #define _ARM_LIBFDT_ENV_H
#include <linux/limits.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/string.h> #include <linux/string.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#define INT_MAX ((int)(~0U>>1)) #define INT32_MAX S32_MAX
#define UINT32_MAX U32_MAX
typedef __be16 fdt16_t; typedef __be16 fdt16_t;
typedef __be32 fdt32_t; typedef __be32 fdt32_t;
......
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
#include <string.h> #include <string.h>
#define INT_MAX ((int)(~0U>>1)) #define INT_MAX ((int)(~0U>>1))
#define UINT32_MAX ((u32)~0U)
#define INT32_MAX ((s32)(UINT32_MAX >> 1))
#include "of.h" #include "of.h"
......
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
#include <asm/byteorder.h> #include <asm/byteorder.h>
#define INT32_MAX S32_MAX
#define UINT32_MAX U32_MAX
typedef __be16 fdt16_t; typedef __be16 fdt16_t;
typedef __be32 fdt32_t; typedef __be32 fdt32_t;
typedef __be64 fdt64_t; typedef __be64 fdt64_t;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment