]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
rockchip: make_fit_atf: ignore empty PT_LOAD segment
authorHeinrich Schuchardt <xypron.glpk@gmx.de>
Tue, 15 Sep 2020 01:43:29 +0000 (03:43 +0200)
committerKever Yang <kever.yang@rock-chips.com>
Wed, 16 Sep 2020 08:41:30 +0000 (16:41 +0800)
The linker sometimes creates PT_LOAD segments with length (p_filesz) zero
as described in https://man7.org/linux/man-pages/man5/elf.5.html. This
leads to build failures. We should ignore empty segments.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Tested-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
arch/arm/mach-rockchip/make_fit_atf.py

index d15c32b303297b7a10db3044898579993c5ac689..f3224d255520549671d48eca5f22b410011ede16 100755 (executable)
@@ -189,8 +189,9 @@ def unpack_elf(filename):
         p_type, p_flags, p_offset = struct.unpack_from('<LLQ', elf, offset)
         if p_type == 1: # PT_LOAD
             p_paddr, p_filesz = struct.unpack_from('<2Q', elf, offset + 0x18)
-            p_data = elf[p_offset:p_offset + p_filesz]
-            segments.append((index, e_entry, p_paddr, p_data))
+            if p_filesz > 0:
+                p_data = elf[p_offset:p_offset + p_filesz]
+                segments.append((index, e_entry, p_paddr, p_data))
     return segments
 
 def main():