Commit 14770453 authored Mar 16, 2018 by Mark Greer Committed by Michael Ellerman Apr 01, 2018

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 656ad58e (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>

parent 8c1c7fb0

arch/powerpc/boot/libfdt_env.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -7,8 +7,6 @@

		#include "of.h"

		typedef u32 uint32_t;
		typedef u64 uint64_t;
		typedef unsigned long uintptr_t;

		typedef __be16 fdt16_t;