mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 22:25:03 +00:00
147704534e
When building a uImage or zImage using ppc6xx_defconfig and some other
defconfigs, the following error occurs with GCC 4.5.1:
/arch/powerpc/boot/libfdt_env.h:10:13: error: redefinition of typedef 'uint32_t'
/arch/powerpc/boot/types.h:21:13: note: previous declaration of 'uint32_t' was here
/arch/powerpc/boot/libfdt_env.h:11:13: error: redefinition of typedef 'uint64_t'
/arch/powerpc/boot/types.h:22:13: note: previous declaration of 'uint64_t' was here
The problem is that commit 656ad58ef1 (powerpc/boot: Add OPAL
console to epapr wrappers) adds typedefs for uint32_t and uint64_t to
type.h but doesn't remove the pre-existing (and now duplicate)
typedefs from libfdt_env.h.
Fix the error by removing the duplicate typedefs from libfdt_env.h
Signed-off-by: Mark Greer <mgreer@animalcreek.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
23 lines
570 B
C
23 lines
570 B
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _ARCH_POWERPC_BOOT_LIBFDT_ENV_H
|
|
#define _ARCH_POWERPC_BOOT_LIBFDT_ENV_H
|
|
|
|
#include <types.h>
|
|
#include <string.h>
|
|
|
|
#include "of.h"
|
|
|
|
typedef unsigned long uintptr_t;
|
|
|
|
typedef __be16 fdt16_t;
|
|
typedef __be32 fdt32_t;
|
|
typedef __be64 fdt64_t;
|
|
|
|
#define fdt16_to_cpu(x) be16_to_cpu(x)
|
|
#define cpu_to_fdt16(x) cpu_to_be16(x)
|
|
#define fdt32_to_cpu(x) be32_to_cpu(x)
|
|
#define cpu_to_fdt32(x) cpu_to_be32(x)
|
|
#define fdt64_to_cpu(x) be64_to_cpu(x)
|
|
#define cpu_to_fdt64(x) cpu_to_be64(x)
|
|
|
|
#endif /* _ARCH_POWERPC_BOOT_LIBFDT_ENV_H */
|