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.
Signed-off-by: Heinrich Schuchardt xypron.glpk@gmx.de --- py/travis-ci/u_boot_boardenv_qemu_arm64_na.py | 6 +++--- py/travis-ci/u_boot_boardenv_qemu_arm_na.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/py/travis-ci/u_boot_boardenv_qemu_arm64_na.py b/py/travis-ci/u_boot_boardenv_qemu_arm64_na.py index 80cba23..2986115 100644 --- a/py/travis-ci/u_boot_boardenv_qemu_arm64_na.py +++ b/py/travis-ci/u_boot_boardenv_qemu_arm64_na.py @@ -3,6 +3,6 @@ import travis_tftp env__net_uses_pci = True env__net_dhcp_server = True
-env__net_tftp_readable_file = travis_tftp.file2env('u-boot.bin') -env__efi_loader_helloworld_file = travis_tftp.file2env('lib/efi_loader/helloworld.efi') -env__efi_loader_grub_file = travis_tftp.file2env('grub_arm64.efi') +env__net_tftp_readable_file = travis_tftp.file2env('u-boot.bin', 0x40400000) +env__efi_loader_helloworld_file = travis_tftp.file2env('lib/efi_loader/helloworld.efi', 0x40400000) +env__efi_loader_grub_file = travis_tftp.file2env('grub_arm64.efi', 0x40400000) diff --git a/py/travis-ci/u_boot_boardenv_qemu_arm_na.py b/py/travis-ci/u_boot_boardenv_qemu_arm_na.py index 834edd0..391e3c4 100644 --- a/py/travis-ci/u_boot_boardenv_qemu_arm_na.py +++ b/py/travis-ci/u_boot_boardenv_qemu_arm_na.py @@ -3,6 +3,6 @@ import travis_tftp env__net_uses_pci = True env__net_dhcp_server = True
-env__net_tftp_readable_file = travis_tftp.file2env('u-boot.bin') -env__efi_loader_helloworld_file = travis_tftp.file2env('lib/efi_loader/helloworld.efi') -env__efi_loader_grub_file = travis_tftp.file2env('grub_arm.efi') +env__net_tftp_readable_file = travis_tftp.file2env('u-boot.bin', 0x40400000) +env__efi_loader_helloworld_file = travis_tftp.file2env('lib/efi_loader/helloworld.efi', 0x40400000) +env__efi_loader_grub_file = travis_tftp.file2env('grub_arm.efi', 0x40400000) -- 2.24.0