OSDN Git Service

powerpc/boot: Remove duplicate typedefs from libfdt_env.h
authorMark Greer <mgreer@animalcreek.com>
Fri, 16 Mar 2018 21:54:43 +0000 (14:54 -0700)
committerMichael Ellerman <mpe@ellerman.id.au>
Sat, 31 Mar 2018 13:47:47 +0000 (00:47 +1100)
commit147704534e2de30dd47171d55240c394b24f4053
tree2a9b3f44bbff125a3f67e1218aee3a939e5f422b
parent8c1c7fb0b5ec95c392e9b585a6cf8cde254308d3
powerpc/boot: Remove duplicate typedefs from libfdt_env.h

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 656ad58ef19e (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>
arch/powerpc/boot/libfdt_env.h