• Mark Greer's avatar
    powerpc/boot: Remove duplicate typedefs from libfdt_env.h · 14770453
    Mark Greer authored
    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: default avatarMark Greer <mgreer@animalcreek.com>
    Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
    14770453
libfdt_env.h 570 Bytes