diff --git a/test/hooks/py/travis-ci/u_boot_boardenv_evb-ast2500_qemu.py b/test/hooks/py/travis-ci/u_boot_boardenv_evb-ast2500_qemu.py index 9a10a56e15d..f4b6b2728b3 100644 --- a/test/hooks/py/travis-ci/u_boot_boardenv_evb-ast2500_qemu.py +++ b/test/hooks/py/travis-ci/u_boot_boardenv_evb-ast2500_qemu.py @@ -1,7 +1,5 @@ import travis_tftp env__spl_skipped = True - env__net_dhcp_server = True - env__net_tftp_readable_file = travis_tftp.file2env('u-boot') diff --git a/test/hooks/py/travis-ci/u_boot_boardenv_qemu-ae3xx_na.py b/test/hooks/py/travis-ci/u_boot_boardenv_qemu-ae3xx_na.py index 70738ead37e..97272d548fb 100644 --- a/test/hooks/py/travis-ci/u_boot_boardenv_qemu-ae3xx_na.py +++ b/test/hooks/py/travis-ci/u_boot_boardenv_qemu-ae3xx_na.py @@ -2,6 +2,5 @@ import travis_tftp env__net_uses_pci = True env__net_dhcp_server = True - env__net_tftp_readable_file = travis_tftp.file2env('u-boot') env__efi_loader_helloworld_file = travis_tftp.file2env('lib/efi_loader/helloworld.efi') diff --git a/test/hooks/py/travis-ci/u_boot_boardenv_qemu-ax25_na.py b/test/hooks/py/travis-ci/u_boot_boardenv_qemu-ax25_na.py index 70738ead37e..97272d548fb 100644 --- a/test/hooks/py/travis-ci/u_boot_boardenv_qemu-ax25_na.py +++ b/test/hooks/py/travis-ci/u_boot_boardenv_qemu-ax25_na.py @@ -2,6 +2,5 @@ import travis_tftp env__net_uses_pci = True env__net_dhcp_server = True - env__net_tftp_readable_file = travis_tftp.file2env('u-boot') env__efi_loader_helloworld_file = travis_tftp.file2env('lib/efi_loader/helloworld.efi') diff --git a/test/hooks/py/travis-ci/u_boot_boardenv_qemu_arm64_na.py b/test/hooks/py/travis-ci/u_boot_boardenv_qemu_arm64_na.py index c5fae0f5e3e..8e1a7709ec8 100644 --- a/test/hooks/py/travis-ci/u_boot_boardenv_qemu_arm64_na.py +++ b/test/hooks/py/travis-ci/u_boot_boardenv_qemu_arm64_na.py @@ -3,7 +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', 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/test/hooks/py/travis-ci/u_boot_boardenv_qemu_arm_na.py b/test/hooks/py/travis-ci/u_boot_boardenv_qemu_arm_na.py index 2a1cd90bf02..718c87bbe14 100644 --- a/test/hooks/py/travis-ci/u_boot_boardenv_qemu_arm_na.py +++ b/test/hooks/py/travis-ci/u_boot_boardenv_qemu_arm_na.py @@ -3,7 +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', 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) diff --git a/test/hooks/py/travis-ci/u_boot_boardenv_qemu_riscv64_na.py b/test/hooks/py/travis-ci/u_boot_boardenv_qemu_riscv64_na.py index 0a4287297ba..9ad819ce6c0 100644 --- a/test/hooks/py/travis-ci/u_boot_boardenv_qemu_riscv64_na.py +++ b/test/hooks/py/travis-ci/u_boot_boardenv_qemu_riscv64_na.py @@ -1,6 +1,5 @@ import travis_tftp env__net_dhcp_server = True - env__net_tftp_readable_file = travis_tftp.file2env('u-boot') env__efi_loader_helloworld_file = travis_tftp.file2env('lib/efi_loader/helloworld.efi') diff --git a/test/hooks/py/travis-ci/u_boot_boardenv_qemu_x86_64_na.py b/test/hooks/py/travis-ci/u_boot_boardenv_qemu_x86_64_na.py index 2e6cb94e700..a50d60d9b4c 100644 --- a/test/hooks/py/travis-ci/u_boot_boardenv_qemu_x86_64_na.py +++ b/test/hooks/py/travis-ci/u_boot_boardenv_qemu_x86_64_na.py @@ -3,13 +3,10 @@ import travis_tftp env__net_uses_pci = True env__net_dhcp_server = True - env__net_tftp_readable_file = travis_tftp.file2env('u-boot') env__efi_loader_helloworld_file = travis_tftp.file2env('lib/efi_loader/helloworld.efi') - env__efi_loader_check_smbios = True env__efi_loader_grub_file = travis_tftp.file2env('grub_x64.efi') - env__efi_fit_tftp_file = { "dn" : os.environ['UBOOT_TRAVIS_BUILD_DIR'], } diff --git a/test/hooks/py/travis-ci/u_boot_boardenv_qemu_x86_na.py b/test/hooks/py/travis-ci/u_boot_boardenv_qemu_x86_na.py index b4b886c883c..e2e795b1c10 100644 --- a/test/hooks/py/travis-ci/u_boot_boardenv_qemu_x86_na.py +++ b/test/hooks/py/travis-ci/u_boot_boardenv_qemu_x86_na.py @@ -3,13 +3,10 @@ import travis_tftp env__net_uses_pci = True env__net_dhcp_server = True - env__net_tftp_readable_file = travis_tftp.file2env('u-boot') env__efi_loader_helloworld_file = travis_tftp.file2env('lib/efi_loader/helloworld.efi') - env__efi_loader_check_smbios = True env__efi_loader_grub_file = travis_tftp.file2env('grub_x86.efi') - env__efi_fit_tftp_file = { "dn" : os.environ['UBOOT_TRAVIS_BUILD_DIR'], } diff --git a/test/hooks/py/travis-ci/u_boot_boardenv_vexpress_ca15_tc2_qemu.py b/test/hooks/py/travis-ci/u_boot_boardenv_vexpress_ca15_tc2_qemu.py index 8b7dcc6f92c..ffb84d6a242 100644 --- a/test/hooks/py/travis-ci/u_boot_boardenv_vexpress_ca15_tc2_qemu.py +++ b/test/hooks/py/travis-ci/u_boot_boardenv_vexpress_ca15_tc2_qemu.py @@ -2,7 +2,6 @@ import os import travis_tftp env__net_dhcp_server = True - env__net_tftp_readable_file = travis_tftp.file2env('u-boot') env__efi_loader_helloworld_file = travis_tftp.file2env('lib/efi_loader/helloworld.efi') env__efi_loader_grub_file = travis_tftp.file2env('grub_arm.efi') diff --git a/test/hooks/py/travis-ci/u_boot_boardenv_vexpress_ca9x4_qemu.py b/test/hooks/py/travis-ci/u_boot_boardenv_vexpress_ca9x4_qemu.py index 8b7dcc6f92c..ffb84d6a242 100644 --- a/test/hooks/py/travis-ci/u_boot_boardenv_vexpress_ca9x4_qemu.py +++ b/test/hooks/py/travis-ci/u_boot_boardenv_vexpress_ca9x4_qemu.py @@ -2,7 +2,6 @@ import os import travis_tftp env__net_dhcp_server = True - env__net_tftp_readable_file = travis_tftp.file2env('u-boot') env__efi_loader_helloworld_file = travis_tftp.file2env('lib/efi_loader/helloworld.efi') env__efi_loader_grub_file = travis_tftp.file2env('grub_arm.efi')