On Fri, 2018-03-16 at 21:54:43 UTC, Mark Greer wrote: > When building a uImage or zImage using ppc6xx_defconfig and some other > defconfigs, the following error occurs: > > BOOTCC arch/powerpc/boot/fdt.o > In file included from arch/powerpc/boot/fdt.c:51:0: > ../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 > ../arch/powerpc/boot/Makefile:210: recipe for target > 'arch/powerpc/boot/fdt.o' failed > make[2]: *** [arch/powerpc/boot/fdt.o] Error 1 > > 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 duplicat typedefs from > libfdt_env.h > > CC: David Gibson <da...@gibson.dropbear.id.au> > CC: Oliver O'Halloran <ooh...@gmail.com> > Signed-off-by: Mark Greer <mgr...@animalcreek.com>
Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/147704534e2de30dd47171d55240c3 cheers
