U-boot conflicting type error on Crust build

[drewwalters96]

When building Crust Firmware, U-boot generates an error.

Versions

• aarch64-linux-gnu-gcc (GCC) 7.3.0
• DTC 1.4.6
• or1k-linux-musl-gcc (GCC) 5.4.0

Config

#
# Copyright © 2017 Samuel Holland <[email protected]>
# SPDX-License-Identifier: BSD-3-Clause
#

  # File locations
 ATF              = arm-trusted-firmware
 ATF_URL          = https://github.com/crust-firmware/arm-trusted-firmware
 SCP              = crust
 SCP_URL          = https://github.com/crust-firmware/crust
 U-BOOT           = u-boot
 U-BOOT_URL       = https://github.com/crust-firmware/u-boot
 
 BUILDDIR        ?= build
 OUTDIR           = $(BUILDDIR)/$(BOARD)
 OUTFILE          = $(BUILDDIR)/firmware_$(BOARD).img
 
 # Cross compiler
 CROSS_aarch64    = aarch64-linux-gnu-
 CROSS_or1k       = ~/Downloads/or1k-linux-musl/bin/or1k-linux-musl-
  
 # General options
 DEBUG           ?= 0
 REPRODUCIBLE    ?= 0
 
 # Board selection
 BOARD           ?= orangepi_win
  
 # Board-specific options
 PLAT             = sun50i
 FLASH_SIZE_KB    = 2048
 SPL_SIZE_KB      = 32
  
 ###############################################################################

Output of git -C u-boot branch -av

* crust                 6996f8e782 mksunxi_fit_atf.sh: Add support for including SCP firmware                                                                                                                                                                                                                                 
  remotes/origin/HEAD   -> origin/crust
  remotes/origin/crust  6996f8e782 mksunxi_fit_atf.sh: Add support for including SCP firmware
  remotes/origin/master b2153075f4 Kconfig: usb: rockchip: Remove not needed *_defconfig USB/gadget entries

Output of git -C u-boot status

On branch crust                                                                                                                                                                                                                                                                                                               
Your branch is up to date with 'origin/crust'.                                                                                                                                                                                                                                                                                

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        scripts/dtc/pylibfdt/_libfdt.cpython-36m-x86_64-linux-gnu.so

nothing added to commit but untracked files present (use "git add" to track)

Make error output

  HOSTCC  tools/aisimage.o                                                                                                                                                                                                                                                                                                    
In file included from /usr/include/libfdt.h:54:0,                                                                                                                                                                                                                                                                             
                 from include/image.h:56,                                                                                                                                                                                                                                                                                     
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt_env.h:81:24: error: redefinition of ‘fdt16_to_cpu’                                                                                                                                                                                                                                                        
 static inline uint16_t fdt16_to_cpu(fdt16_t x)                                                                                                                                                                                                                                                                               
                        ^~~~~~~~~~~~                                                                                                                                                                                                                                                                                          
In file included from tools/../include/../scripts/dtc/libfdt/libfdt.h:54:0,                                                                                                                                                                                                                                                   
                 from tools/../include/libfdt.h:8,                                                                                                                                                                                                                                                                            
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt_env.h:81:24: note: previous definition of ‘fdt16_to_cpu’ was here                                                                                                                                                                                                               
 static inline uint16_t fdt16_to_cpu(fdt16_t x)                                                                                                                                                                                                                                                                               
                        ^~~~~~~~~~~~                                                                                                                                                                                                                                                                                          
In file included from /usr/include/libfdt.h:54:0,                                                                                                                                                                                                                                                                             
                 from include/image.h:56,                                                                                                                                                                                                                                                                                     
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt_env.h:85:23: error: redefinition of ‘cpu_to_fdt16’                                                                                                                                                                                                                                                        
 static inline fdt16_t cpu_to_fdt16(uint16_t x)                                                                                                                                                                                                                                                                               
                       ^~~~~~~~~~~~                                                                                                                                                                                                                                                                                           
In file included from tools/../include/../scripts/dtc/libfdt/libfdt.h:54:0,                                                                                                                                                                                                                                                   
                 from tools/../include/libfdt.h:8,                                                                                                                                                                                                                                                                            
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt_env.h:85:23: note: previous definition of ‘cpu_to_fdt16’ was here                                                                                                                                                                                                               
 static inline fdt16_t cpu_to_fdt16(uint16_t x)                                                                                                                                                                                                                                                                               
                       ^~~~~~~~~~~~                                                                                                                                                                                                                                                                                           
In file included from /usr/include/libfdt.h:54:0,                                                                                                                                                                                                                                                                             
                 from include/image.h:56,                                                                                                                                                                                                                                                                                     
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt_env.h:90:24: error: redefinition of ‘fdt32_to_cpu’                                                                                                                                                                                                                                                        
 static inline uint32_t fdt32_to_cpu(fdt32_t x)                                                                                                                                                                                                                                                                               
                        ^~~~~~~~~~~~                                                                                                                                                                                                                                                                                          
In file included from tools/../include/../scripts/dtc/libfdt/libfdt.h:54:0,                                                                                                                                                                                                                                                   
                 from tools/../include/libfdt.h:8,                                                                                                                                                                                                                                                                            
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt_env.h:90:24: note: previous definition of ‘fdt32_to_cpu’ was here                                                                                                                                                                                                               
 static inline uint32_t fdt32_to_cpu(fdt32_t x)                                                                                                                                                                                                                                                                               
                        ^~~~~~~~~~~~                                                                                                                                                                                                                                                                                          
In file included from /usr/include/libfdt.h:54:0,                                                                                                                                                                                                                                                                             
                 from include/image.h:56,                                                                                                                                                                                                                                                                                     
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt_env.h:94:23: error: redefinition of ‘cpu_to_fdt32’                                                                                                                                                                                                                                                        
 static inline fdt32_t cpu_to_fdt32(uint32_t x)                                                                                                                                                                                                                                                                               
                       ^~~~~~~~~~~~                                                                                                                                                                                                                                                                                           
In file included from tools/../include/../scripts/dtc/libfdt/libfdt.h:54:0,                                                                                                                                                                                                                                                   
                 from tools/../include/libfdt.h:8,                                                                                                                                                                                                                                                                            
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt_env.h:94:23: note: previous definition of ‘cpu_to_fdt32’ was here                                                                                                                                                                                                               
 static inline fdt32_t cpu_to_fdt32(uint32_t x)                                                                                                                                                                                                                                                                               
                       ^~~~~~~~~~~~                                                                                                                                                                                                                                                                                           
In file included from /usr/include/libfdt.h:54:0,                                                                                                                                                                                                                                                                             
                 from include/image.h:56,                                                                                                                                                                                                                                                                                     
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt_env.h:99:24: error: redefinition of ‘fdt64_to_cpu’                                                                                                                                                                                                                                                        
 static inline uint64_t fdt64_to_cpu(fdt64_t x)                                                                                                                                                                                                                                                                               
                        ^~~~~~~~~~~~                                                                                                                                                                                                                                                                                          
In file included from tools/../include/../scripts/dtc/libfdt/libfdt.h:54:0,                                                                                                                                                                                                                                                   
                 from tools/../include/libfdt.h:8,                                                                                                                                                                                                                                                                            
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt_env.h:99:24: note: previous definition of ‘fdt64_to_cpu’ was here                                                                                                                                                                                                               
 static inline uint64_t fdt64_to_cpu(fdt64_t x)                                                                                                                                                                                                                                                                               
                        ^~~~~~~~~~~~                                                                                                                                                                                                                                                                                          
In file included from /usr/include/libfdt.h:54:0,                                                                                                                                                                                                                                                                             
                 from include/image.h:56,                                                                                                                                                                                                                                                                                     
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt_env.h:103:23: error: redefinition of ‘cpu_to_fdt64’                                                                                                                                                                                                                                                       
 static inline fdt64_t cpu_to_fdt64(uint64_t x)                                                                                                                                                                                                                                                                               
                       ^~~~~~~~~~~~                                                                                                                                                                                                                                                                                           
In file included from tools/../include/../scripts/dtc/libfdt/libfdt.h:54:0,                                                                                                                                                                                                                                                   
                 from tools/../include/libfdt.h:8,                                                                                                                                                                                                                                                                            
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt_env.h:103:23: note: previous definition of ‘cpu_to_fdt64’ was here                                                                                                                                                                                                              
 static inline fdt64_t cpu_to_fdt64(uint64_t x)                                                                                                                                                                                                                                                                               
                       ^~~~~~~~~~~~                                                                                                                                                                                                                                                                                           
In file included from /usr/include/libfdt.h:55:0,                                                                                                                                                                                                                                                                             
                 from include/image.h:56,                                                                                                                                                                                                                                                                                     
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/fdt.h:57:8: error: redefinition of ‘struct fdt_header’                                                                                                                                                                                                                                                           
 struct fdt_header {                                                                                                                                                                                                                                                                                                          
        ^~~~~~~~~~                                                                                                                                                                                                                                                                                                            
In file included from tools/../include/../scripts/dtc/libfdt/libfdt.h:55:0,                                                                                                                                                                                                                                                   
                 from tools/../include/libfdt.h:8,                                                                                                                                                                                                                                                                            
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/fdt.h:57:8: note: originally defined here                                                                                                                                                                                                                                              
 struct fdt_header {                                                                                                                                                                                                                                                                                                          
        ^~~~~~~~~~                                                                                                                                                                                                                                                                                                            
In file included from /usr/include/libfdt.h:55:0,                                                                                                                                                                                                                                                                             
                 from include/image.h:56,                                                                                                                                                                                                                                                                                     
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/fdt.h:76:8: error: redefinition of ‘struct fdt_reserve_entry’                                                                                                                                                                                                                                                    
 struct fdt_reserve_entry {                                                                                                                                                                                                                                                                                                   
        ^~~~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                                                     
In file included from tools/../include/../scripts/dtc/libfdt/libfdt.h:55:0,                                                                                                                                                                                                                                                   
                 from tools/../include/libfdt.h:8,                                                                                                                                                                                                                                                                            
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/fdt.h:76:8: note: originally defined here                                                                                                                                                                                                                                              
 struct fdt_reserve_entry {                                                                                                                                                                                                                                                                                                   
        ^~~~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                                                     
In file included from /usr/include/libfdt.h:55:0,                                                                                                                                                                                                                                                                             
                 from include/image.h:56,                                                                                                                                                                                                                                                                                     
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/fdt.h:81:8: error: redefinition of ‘struct fdt_node_header’                                                                                                                                                                                                                                                      
 struct fdt_node_header {                                                                                                                                                                                                                                                                                                     
        ^~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                                                       
In file included from tools/../include/../scripts/dtc/libfdt/libfdt.h:55:0,                                                                                                                                                                                                                                                   
                 from tools/../include/libfdt.h:8,                                                                                                                                                                                                                                                                            
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/fdt.h:81:8: note: originally defined here                                                                                                                                                                                                                                              
 struct fdt_node_header {                                                                                                                                                                                                                                                                                                     
        ^~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                                                       
In file included from /usr/include/libfdt.h:55:0,                                                                                                                                                                                                                                                                             
                 from include/image.h:56,                                                                                                                                                                                                                                                                                     
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/fdt.h:86:8: error: redefinition of ‘struct fdt_property’                                                                                                                                                                                                                                                         
 struct fdt_property {                                                                                                                                                                                                                                                                                                        
        ^~~~~~~~~~~~                                                                                                                                                                                                                                                                                                          
In file included from tools/../include/../scripts/dtc/libfdt/libfdt.h:55:0,                                                                                                                                                                                                                                                   
                 from tools/../include/libfdt.h:8,                                                                                                                                                                                                                                                                            
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/fdt.h:86:8: note: originally defined here                                                                                                                                                                                                                                              
 struct fdt_property {                                                                                                                                                                                                                                                                                                        
        ^~~~~~~~~~~~                                                                                                                                                                                                                                                                                                          
In file included from include/image.h:56:0,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt.h:149:21: error: redefinition of ‘fdt_offset_ptr_w’                                                                                                                                                                                                                                                       
 static inline void *fdt_offset_ptr_w(void *fdt, int offset, int checklen)                                                                                                                                                                                                                                                    
                     ^~~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                                         
In file included from tools/../include/libfdt.h:8:0,                                                                                                                                                                                                                                                                          
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt.h:149:21: note: previous definition of ‘fdt_offset_ptr_w’ was here                                                                                                                                                                                                              
 static inline void *fdt_offset_ptr_w(void *fdt, int offset, int checklen)                                                                                                                                                                                                                                                    
                     ^~~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                                         
In file included from include/image.h:56:0,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt.h:234:1: error: redefinition of ‘fdt_set_magic’                                                                                                                                                                                                                                                           
 fdt_set_hdr_(magic);                                                                                                                                                                                                                                                                                                         
 ^                                                                                                                                                                                                                                                                                                                            
In file included from tools/../include/libfdt.h:8:0,                                                                                                                                                                                                                                                                          
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt.h:229:21: note: previous definition of ‘fdt_set_magic’ was here                                                                                                                                                                                                                 
  static inline void fdt_set_##name(void *fdt, uint32_t val) \                                                                                                                                                                                                                                                                
                     ^                                                                                                                                                                                                                                                                                                        
tools/../include/../scripts/dtc/libfdt/libfdt.h:234:1: note: in expansion of macro ‘__fdt_set_hdr’                                                                                                                                                                                                                            
 __fdt_set_hdr(magic);                                                                                                                                                                                                                                                                                                        
 ^~~~~~~~~~~~~                                                                                                                                                                                                                                                                                                                
In file included from include/image.h:56:0,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt.h:235:1: error: redefinition of ‘fdt_set_totalsize’                                                                                                                                                                                                                                                       
 fdt_set_hdr_(totalsize);                                                                                                                                                                                                                                                                                                     
 ^                                                                                                                                                                                                                                                                                                                            
In file included from tools/../include/libfdt.h:8:0,                                                                                                                                                                                                                                                                          
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt.h:229:21: note: previous definition of ‘fdt_set_totalsize’ was here                                                                                                                                                                                                             
  static inline void fdt_set_##name(void *fdt, uint32_t val) \                                                                                                                                                                                                                                                                
                     ^                                                                                                                                                                                                                                                                                                        
tools/../include/../scripts/dtc/libfdt/libfdt.h:235:1: note: in expansion of macro ‘__fdt_set_hdr’                                                                                                                                                                                                                            
 __fdt_set_hdr(totalsize);                                                                                                                                                                                                                                                                                                    
 ^~~~~~~~~~~~~                                                                                                                                                                                                                                                                                                                
In file included from include/image.h:56:0,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt.h:236:1: error: redefinition of ‘fdt_set_off_dt_struct’                                                                                                                                                                                                                                                   
 fdt_set_hdr_(off_dt_struct);                                                                                                                                                                                                                                                                                                 
 ^                                                                                                                                                                                                                                                                                                                            
In file included from tools/../include/libfdt.h:8:0,                                                                                                                                                                                                                                                                          
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt.h:229:21: note: previous definition of ‘fdt_set_off_dt_struct’ was here                                                                                                                                                                                                         
  static inline void fdt_set_##name(void *fdt, uint32_t val) \                                                                                                                                                                                                                                                                
                     ^                                                                                                                                                                                                                                                                                                        
tools/../include/../scripts/dtc/libfdt/libfdt.h:236:1: note: in expansion of macro ‘__fdt_set_hdr’                                                                                                                                                                                                                            
 __fdt_set_hdr(off_dt_struct);                                                                                                                                                                                                                                                                                                
 ^~~~~~~~~~~~~                                                                                                                                                                                                                                                                                                                
In file included from include/image.h:56:0,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt.h:237:1: error: redefinition of ‘fdt_set_off_dt_strings’                                                                                                                                                                                                                                                  
 fdt_set_hdr_(off_dt_strings);                                                                                                                                                                                                                                                                                                
 ^                                                                                                                                                                                                                                                                                                                            
In file included from tools/../include/libfdt.h:8:0,                                                                                                                                                                                                                                                                          
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt.h:229:21: note: previous definition of ‘fdt_set_off_dt_strings’ was here                                                                                                                                                                                                        
  static inline void fdt_set_##name(void *fdt, uint32_t val) \                                                                                                                                                                                                                                                                
                     ^                                                                                                                                                                                                                                                                                                        
tools/../include/../scripts/dtc/libfdt/libfdt.h:237:1: note: in expansion of macro ‘__fdt_set_hdr’                                                                                                                                                                                                                            
 __fdt_set_hdr(off_dt_strings);                                                                                                                                                                                                                                                                                               
 ^~~~~~~~~~~~~                                                                                                                                                                                                                                                                                                                
In file included from include/image.h:56:0,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt.h:238:1: error: redefinition of ‘fdt_set_off_mem_rsvmap’                                                                                                                                                                                                                                                  
 fdt_set_hdr_(off_mem_rsvmap);                                                                                                                                                                                                                                                                                                
 ^                                                                                                                                                                                                                                                                                                                            
In file included from tools/../include/libfdt.h:8:0,                                                                                                                                                                                                                                                                          
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt.h:229:21: note: previous definition of ‘fdt_set_off_mem_rsvmap’ was here                                                                                                                                                                                                        
  static inline void fdt_set_##name(void *fdt, uint32_t val) \                                                                                                                                                                                                                                                                
                     ^                                                                                                                                                                                                                                                                                                        
tools/../include/../scripts/dtc/libfdt/libfdt.h:238:1: note: in expansion of macro ‘__fdt_set_hdr’                                                                                                                                                                                                                            
 __fdt_set_hdr(off_mem_rsvmap);                                                                                                                                                                                                                                                                                               
 ^~~~~~~~~~~~~                                                                                                                                                                                                                                                                                                                
In file included from include/image.h:56:0,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt.h:239:1: error: redefinition of ‘fdt_set_version’                                                                                                                                                                                                                                                         
 fdt_set_hdr_(version);                                                                                                                                                                                                                                                                                                       
 ^                                                                                                                                                                                                                                                                                                                            
In file included from tools/../include/libfdt.h:8:0,                                                                                                                                                                                                                                                                          
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt.h:229:21: note: previous definition of ‘fdt_set_version’ was here                                                                                                                                                                                                               
  static inline void fdt_set_##name(void *fdt, uint32_t val) \                                                                                                                                                                                                                                                                
                     ^                                                                                                                                                                                                                                                                                                        
tools/../include/../scripts/dtc/libfdt/libfdt.h:239:1: note: in expansion of macro ‘__fdt_set_hdr’                                                                                                                                                                                                                            
 __fdt_set_hdr(version);                                                                                                                                                                                                                                                                                                      
 ^~~~~~~~~~~~~                                                                                                                                                                                                                                                                                                                
In file included from include/image.h:56:0,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt.h:240:1: error: redefinition of ‘fdt_set_last_comp_version’                                                                                                                                                                                                                                               
 fdt_set_hdr_(last_comp_version);                                                                                                                                                                                                                                                                                             
 ^                                                                                                                                                                                                                                                                                                                            
In file included from tools/../include/libfdt.h:8:0,                                                                                                                                                                                                                                                                          
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt.h:229:21: note: previous definition of ‘fdt_set_last_comp_version’ was here                                                                                                                                                                                                     
  static inline void fdt_set_##name(void *fdt, uint32_t val) \                                                                                                                                                                                                                                                                
                     ^                                                                                                                                                                                                                                                                                                        
tools/../include/../scripts/dtc/libfdt/libfdt.h:240:1: note: in expansion of macro ‘__fdt_set_hdr’                                                                                                                                                                                                                            
 __fdt_set_hdr(last_comp_version);                                                                                                                                                                                                                                                                                            
 ^~~~~~~~~~~~~                                                                                                                                                                                                                                                                                                                
In file included from include/image.h:56:0,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt.h:241:1: error: redefinition of ‘fdt_set_boot_cpuid_phys’                                                                                                                                                                                                                                                 
 fdt_set_hdr_(boot_cpuid_phys);                                                                                                                                                                                                                                                                                               
 ^                                                                                                                                                                                                                                                                                                                            
In file included from tools/../include/libfdt.h:8:0,                                                                                                                                                                                                                                                                          
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt.h:229:21: note: previous definition of ‘fdt_set_boot_cpuid_phys’ was here                                                                                                                                                                                                       
  static inline void fdt_set_##name(void *fdt, uint32_t val) \                                                                                                                                                                                                                                                                
                     ^                                                                                                                                                                                                                                                                                                        
tools/../include/../scripts/dtc/libfdt/libfdt.h:241:1: note: in expansion of macro ‘__fdt_set_hdr’                                                                                                                                                                                                                            
 __fdt_set_hdr(boot_cpuid_phys);                                                                                                                                                                                                                                                                                              
 ^~~~~~~~~~~~~                                                                                                                                                                                                                                                                                                                
In file included from include/image.h:56:0,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt.h:242:1: error: redefinition of ‘fdt_set_size_dt_strings’                                                                                                                                                                                                                                                 
 fdt_set_hdr_(size_dt_strings);                                                                                                                                                                                                                                                                                               
 ^                                                                                                                                                                                                                                                                                                                            
In file included from tools/../include/libfdt.h:8:0,                                                                                                                                                                                                                                                                          
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt.h:229:21: note: previous definition of ‘fdt_set_size_dt_strings’ was here                                                                                                                                                                                                       
  static inline void fdt_set_##name(void *fdt, uint32_t val) \                                                                                                                                                                                                                                                                
                     ^                                                                                                                                                                                                                                                                                                        
tools/../include/../scripts/dtc/libfdt/libfdt.h:242:1: note: in expansion of macro ‘__fdt_set_hdr’                                                                                                                                                                                                                            
 __fdt_set_hdr(size_dt_strings);                                                                                                                                                                                                                                                                                              
 ^~~~~~~~~~~~~                                                                                                                                                                                                                                                                                                                
In file included from include/image.h:56:0,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt.h:243:1: error: redefinition of ‘fdt_set_size_dt_struct’                                                                                                                                                                                                                                                  
 fdt_set_hdr_(size_dt_struct);                                                                                                                                                                                                                                                                                                
 ^                                                                                                                                                                                                                                                                                                                            
In file included from tools/../include/libfdt.h:8:0,                                                                                                                                                                                                                                                                          
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt.h:229:21: note: previous definition of ‘fdt_set_size_dt_struct’ was here                                                                                                                                                                                                        
  static inline void fdt_set_##name(void *fdt, uint32_t val) \                                                                                                                                                                                                                                                                
                     ^                                                                                                                                                                                                                                                                                                        
tools/../include/../scripts/dtc/libfdt/libfdt.h:243:1: note: in expansion of macro ‘__fdt_set_hdr’                                                                                                                                                                                                                            
 __fdt_set_hdr(size_dt_struct);                                                                                                                                                                                                                                                                                               
 ^~~~~~~~~~~~~                                                                                                                                                                                                                                                                                                                
In file included from include/image.h:56:0,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt.h:543:28: error: conflicting types for ‘fdt_get_property_by_offset’                                                                                                                                                                                                                                       
 const struct fdt_property *fdt_get_property_by_offset(const void *fdt,                                                                                                                                                                                                                                                       
                            ^~~~~~~~~~~~~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                        
In file included from tools/../include/libfdt.h:8:0,                                                                                                                                                                                                                                                                          
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt.h:543:28: note: previous declaration of ‘fdt_get_property_by_offset’ was here                                                                                                                                                                                                   
 const struct fdt_property *fdt_get_property_by_offset(const void *fdt,                                                                                                                                                                                                                                                       
                            ^~~~~~~~~~~~~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                        
In file included from include/image.h:56:0,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt.h:559:28: error: conflicting types for ‘fdt_get_property_namelen’                                                                                                                                                                                                                                         
 const struct fdt_property *fdt_get_property_namelen(const void *fdt,                                                                                                                                                                                                                                                         
                            ^~~~~~~~~~~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                          
In file included from tools/../include/libfdt.h:8:0,                                                                                                                                                                                                                                                                          
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt.h:559:28: note: previous declaration of ‘fdt_get_property_namelen’ was here                                                                                                                                                                                                     
 const struct fdt_property *fdt_get_property_namelen(const void *fdt,                                                                                                                                                                                                                                                         
                            ^~~~~~~~~~~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                          
In file included from include/image.h:56:0,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt.h:593:28: error: conflicting types for ‘fdt_get_property’                                                                                                                                                                                                                                                 
 const struct fdt_property *fdt_get_property(const void *fdt, int nodeoffset,                                                                                                                                                                                                                                                 
                            ^~~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                                  
In file included from tools/../include/libfdt.h:8:0,                                                                                                                                                                                                                                                                          
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt.h:593:28: note: previous declaration of ‘fdt_get_property’ was here                                                                                                                                                                                                             
 const struct fdt_property *fdt_get_property(const void *fdt, int nodeoffset,                                                                                                                                                                                                                                                 
                            ^~~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                                  
In file included from include/image.h:56:0,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt.h:595:36: error: conflicting types for ‘fdt_get_property_w’                                                                                                                                                                                                                                               
 static inline struct fdt_property *fdt_get_property_w(void *fdt, int nodeoffset,                                                                                                                                                                                                                                             
                                    ^~~~~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                        
In file included from tools/../include/libfdt.h:8:0,                                                                                                                                                                                                                                                                          
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt.h:595:36: note: previous definition of ‘fdt_get_property_w’ was here                                                                                                                                                                                                            
 static inline struct fdt_property *fdt_get_property_w(void *fdt, int nodeoffset,                                                                                                                                                                                                                                             
                                    ^~~~~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                        
In file included from include/image.h:56:0,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt.h:653:21: error: redefinition of ‘fdt_getprop_namelen_w’                                                                                                                                                                                                                                                  
 static inline void *fdt_getprop_namelen_w(void *fdt, int nodeoffset,                                                                                                                                                                                                                                                         
                     ^~~~~~~~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                                    
In file included from tools/../include/libfdt.h:8:0,                                                                                                                                                                                                                                                                          
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt.h:653:21: note: previous definition of ‘fdt_getprop_namelen_w’ was here                                                                                                                                                                                                         
 static inline void *fdt_getprop_namelen_w(void *fdt, int nodeoffset,                                                                                                                                                                                                                                                         
                     ^~~~~~~~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                                    
In file included from include/image.h:56:0,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt.h:692:21: error: redefinition of ‘fdt_getprop_w’                                                                                                                                                                                                                                                          
 static inline void *fdt_getprop_w(void *fdt, int nodeoffset,                                                                                                                                                                                                                                                                 
                     ^~~~~~~~~~~~~                                                                                                                                                                                                                                                                                            
In file included from tools/../include/libfdt.h:8:0,                                                                                                                                                                                                                                                                          
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt.h:692:21: note: previous definition of ‘fdt_getprop_w’ was here                                                                                                                                                                                                                 
 static inline void *fdt_getprop_w(void *fdt, int nodeoffset,                                                                                                                                                                                                                                                                 
                     ^~~~~~~~~~~~~                                                                                                                                                                                                                                                                                            
In file included from include/image.h:56:0,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt.h:1190:19: error: redefinition of ‘fdt_setprop_inplace_u32’                                                                                                                                                                                                                                               
 static inline int fdt_setprop_inplace_u32(void *fdt, int nodeoffset,                                                                                                                                                                                                                                                         
                   ^~~~~~~~~~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                                    
In file included from tools/../include/libfdt.h:8:0,                                                                                                                                                                                                                                                                          
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt.h:1190:19: note: previous definition of ‘fdt_setprop_inplace_u32’ was here                                                                                                                                                                                                      
 static inline int fdt_setprop_inplace_u32(void *fdt, int nodeoffset,                                                                                                                                                                                                                                                         
                   ^~~~~~~~~~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                                    
In file included from include/image.h:56:0,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt.h:1225:19: error: redefinition of ‘fdt_setprop_inplace_u64’                                                                                                                                                                                                                                               
 static inline int fdt_setprop_inplace_u64(void *fdt, int nodeoffset,                                                                                                                                                                                                                                                         
                   ^~~~~~~~~~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                                    
In file included from tools/../include/libfdt.h:8:0,                                                                                                                                                                                                                                                                          
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt.h:1225:19: note: previous definition of ‘fdt_setprop_inplace_u64’ was here                                                                                                                                                                                                      
 static inline int fdt_setprop_inplace_u64(void *fdt, int nodeoffset,                                                                                                                                                                                                                                                         
                   ^~~~~~~~~~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                                    
In file included from include/image.h:56:0,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt.h:1237:19: error: redefinition of ‘fdt_setprop_inplace_cell’                                                                                                                                                                                                                                              
 static inline int fdt_setprop_inplace_cell(void *fdt, int nodeoffset,                                                                                                                                                                                                                                                        
                   ^~~~~~~~~~~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                                   
In file included from tools/../include/libfdt.h:8:0,                                                                                                                                                                                                                                                                          
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt.h:1237:19: note: previous definition of ‘fdt_setprop_inplace_cell’ was here                                                                                                                                                                                                     
 static inline int fdt_setprop_inplace_cell(void *fdt, int nodeoffset,                                                                                                                                                                                                                                                        
                   ^~~~~~~~~~~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                                   
In file included from include/image.h:56:0,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt.h:1303:19: error: redefinition of ‘fdt_property_u32’                                                                                                                                                                                                                                                      
 static inline int fdt_property_u32(void *fdt, const char *name, uint32_t val)                                                                                                                                                                                                                                                
                   ^~~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                                           
In file included from tools/../include/libfdt.h:8:0,                                                                                                                                                                                                                                                                          
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt.h:1303:19: note: previous definition of ‘fdt_property_u32’ was here                                                                                                                                                                                                             
 static inline int fdt_property_u32(void *fdt, const char *name, uint32_t val)                                                                                                                                                                                                                                                
                   ^~~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                                           
In file included from include/image.h:56:0,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt.h:1308:19: error: redefinition of ‘fdt_property_u64’                                                                                                                                                                                                                                                      
 static inline int fdt_property_u64(void *fdt, const char *name, uint64_t val)                                                                                                                                                                                                                                                
                   ^~~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                                           
In file included from tools/../include/libfdt.h:8:0,                                                                                                                                                                                                                                                                          
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt.h:1308:19: note: previous definition of ‘fdt_property_u64’ was here                                                                                                                                                                                                             
 static inline int fdt_property_u64(void *fdt, const char *name, uint64_t val)                                                                                                                                                                                                                                                
                   ^~~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                                           
In file included from include/image.h:56:0,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:10:                                                                                                                                                                                                                                                                                    
/usr/include/libfdt.h:1313:19: error: redefinition of ‘fdt_property_cell’                                                                                                                                                                                                                                                     
 static inline int fdt_property_cell(void *fdt, const char *name, uint32_t val)                                                                                                                                                                                                                                               
                   ^~~~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                                          
In file included from tools/../include/libfdt.h:8:0,                                                                                                                                                                                                                                                                          
                 from tools/fdt_host.h:11,                                                                                                                                                                                                                                                                                    
                 from tools/imagetool.h:25,                                                                                                                                                                                                                                                                                   
                 from tools/aisimage.c:8:                                                                                                                                                                                                                                                                                     
tools/../include/../scripts/dtc/libfdt/libfdt.h:1313:19: note: previous definition of ‘fdt_property_cell’ was here                                                                                                                                                                                                            
 static inline int fdt_property_cell(void *fdt, const char *name, uint32_t val)

[smaeul]

Workaround until u-boot fixes their stuff:

find -name 'libfdt*.h' -exec sed -i 's/ _LIBFDT_/ LIBFDT_/g' {} +
find -name 'fdt.h' -exec sed -i 's/ _FDT_H/ FDT_H/g' {} +