[PATCH 0/2] travis-ci: provide 'addr' in file2env()

[Heinrich Schuchardt]

Function fetch_tftp_file() in test/py/tests/test_efi_loader.py expects that
the dictionary describing a file contains an entry 'addr' specifying the
loading address. Otherwise it defaults to the start of RAM. On
qemu_arm64_defconfig and qemu_arm_defconfig this collides with the hardware
supplied device tree.

Add an optional parameter in function file2env() to set the 'addr' entry.

Set the load address for files to the value of $kernel_addr_r for the
qemu_arm64_defconfig and qemu_arm_defconfig boards to avoid collisions with
the device tree.

Heinrich Schuchardt (2):
  travis-ci: provide 'addr' in file2env()
  travis-ci: set load address for files

 py/travis-ci/travis_tftp.py                   | 18 ++++++++++++++++--
 py/travis-ci/u_boot_boardenv_qemu_arm64_na.py |  6 +++---
 py/travis-ci/u_boot_boardenv_qemu_arm_na.py   |  6 +++---
 3 files changed, 22 insertions(+), 8 deletions(-)

--
2.24.0