diff options
| author | Tom Rini <trini@konsulko.com> | 2020-09-16 08:07:49 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-09-16 08:07:49 -0400 |
| commit | 0487bb5ecd3f8630b86390bef5d595350b97b258 (patch) | |
| tree | b79988b57b5e8f9997d379fec36c6db0d48c60a0 /arch | |
| parent | 4dcced116976937f6f7dd9a0e39cde8120250c16 (diff) | |
| parent | 5b861eea7927da63f016b75265e454a19ab19d0b (diff) | |
Merge tag 'u-boot-rockchip-20200916' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- Fix rv1108 grf access issue
- make_fit_atf: ignore empty PT_LOAD segment
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/rv1108-u-boot.dtsi | 4 | ||||
| -rwxr-xr-x | arch/arm/mach-rockchip/make_fit_atf.py | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/dts/rv1108-u-boot.dtsi b/arch/arm/dts/rv1108-u-boot.dtsi index 41ac054b81..6a2098b8d4 100644 --- a/arch/arm/dts/rv1108-u-boot.dtsi +++ b/arch/arm/dts/rv1108-u-boot.dtsi @@ -4,3 +4,7 @@ */ #include "rockchip-u-boot.dtsi" + +&grf { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/mach-rockchip/make_fit_atf.py b/arch/arm/mach-rockchip/make_fit_atf.py index d15c32b303..f3224d2555 100755 --- a/arch/arm/mach-rockchip/make_fit_atf.py +++ b/arch/arm/mach-rockchip/make_fit_atf.py @@ -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(): |