| Message ID | 20200107170633.2939-1-xypron.glpk@gmx.de |
|---|---|
| State | Accepted, archived |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [1/1] travis-ci: provide env__efi_fit_tftp_file | expand |
On 1/7/20 10:06 AM, Heinrich Schuchardt wrote: > Provide dictionary env__efi_fit_tftp_file describing the file used for the > UEFI FIT image test. Acked-by: Stephen Warren <swarren@nvidia.com>
On 1/8/20 2:16 AM, Stephen Warren wrote: > On 1/7/20 10:06 AM, Heinrich Schuchardt wrote: >> Provide dictionary env__efi_fit_tftp_file describing the file used for >> the >> UEFI FIT image test. > > Acked-by: Stephen Warren <swarren@nvidia.com> > Hello Stephen, this patch for has been lingering for a while waiting to be merged into https://github.com/swarren/uboot-test-hooks.git. Could you, please, give it some love. Best regards Heinrich
On 2/21/20 12:35 PM, Heinrich Schuchardt wrote: > On 1/8/20 2:16 AM, Stephen Warren wrote: >> On 1/7/20 10:06 AM, Heinrich Schuchardt wrote: >>> Provide dictionary env__efi_fit_tftp_file describing the file used for >>> the >>> UEFI FIT image test. >> >> Acked-by: Stephen Warren <swarren@nvidia.com> >> > > Hello Stephen, > > this patch for has been lingering for a while waiting to be merged into > https://github.com/swarren/uboot-test-hooks.git. > > Could you, please, give it some love. Sorry, I hadn't realized this was for that repo, since it was posted to the list which usually means the patch is for u-boot.git. If you repost it I can apply it.
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 2986115..c5fae0f 100644 --- a/py/travis-ci/u_boot_boardenv_qemu_arm64_na.py +++ b/py/travis-ci/u_boot_boardenv_qemu_arm64_na.py @@ -1,3 +1,4 @@ +import os import travis_tftp env__net_uses_pci = True @@ -6,3 +7,7 @@ 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) +env__efi_fit_tftp_file = { + 'addr' : 0x40400000, + "dn" : os.environ['UBOOT_TRAVIS_BUILD_DIR'], +} 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 391e3c4..2a1cd90 100644 --- a/py/travis-ci/u_boot_boardenv_qemu_arm_na.py +++ b/py/travis-ci/u_boot_boardenv_qemu_arm_na.py @@ -1,3 +1,4 @@ +import os import travis_tftp env__net_uses_pci = True @@ -6,3 +7,7 @@ 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) +env__efi_fit_tftp_file = { + 'addr' : 0x40400000, + "dn" : os.environ['UBOOT_TRAVIS_BUILD_DIR'], +} diff --git a/py/travis-ci/u_boot_boardenv_qemu_x86_64_na.py b/py/travis-ci/u_boot_boardenv_qemu_x86_64_na.py index 6f7c593..2e6cb94 100644 --- a/py/travis-ci/u_boot_boardenv_qemu_x86_64_na.py +++ b/py/travis-ci/u_boot_boardenv_qemu_x86_64_na.py @@ -1,3 +1,4 @@ +import os import travis_tftp env__net_uses_pci = True @@ -8,3 +9,7 @@ env__efi_loader_helloworld_file = travis_tftp.file2env('lib/efi_loader/helloworl 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/py/travis-ci/u_boot_boardenv_qemu_x86_na.py b/py/travis-ci/u_boot_boardenv_qemu_x86_na.py index 70dc0ae..b4b886c 100644 --- a/py/travis-ci/u_boot_boardenv_qemu_x86_na.py +++ b/py/travis-ci/u_boot_boardenv_qemu_x86_na.py @@ -1,3 +1,4 @@ +import os import travis_tftp env__net_uses_pci = True @@ -8,3 +9,7 @@ env__efi_loader_helloworld_file = travis_tftp.file2env('lib/efi_loader/helloworl 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/py/travis-ci/u_boot_boardenv_vexpress_ca15_tc2_qemu.py b/py/travis-ci/u_boot_boardenv_vexpress_ca15_tc2_qemu.py index 7437ae6..8b7dcc6 100644 --- a/py/travis-ci/u_boot_boardenv_vexpress_ca15_tc2_qemu.py +++ b/py/travis-ci/u_boot_boardenv_vexpress_ca15_tc2_qemu.py @@ -1,3 +1,4 @@ +import os import travis_tftp env__net_dhcp_server = True @@ -5,3 +6,6 @@ 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') +env__efi_fit_tftp_file = { + "dn" : os.environ['UBOOT_TRAVIS_BUILD_DIR'], +} diff --git a/py/travis-ci/u_boot_boardenv_vexpress_ca9x4_qemu.py b/py/travis-ci/u_boot_boardenv_vexpress_ca9x4_qemu.py index 7437ae6..8b7dcc6 100644 --- a/py/travis-ci/u_boot_boardenv_vexpress_ca9x4_qemu.py +++ b/py/travis-ci/u_boot_boardenv_vexpress_ca9x4_qemu.py @@ -1,3 +1,4 @@ +import os import travis_tftp env__net_dhcp_server = True @@ -5,3 +6,6 @@ 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') +env__efi_fit_tftp_file = { + "dn" : os.environ['UBOOT_TRAVIS_BUILD_DIR'], +}
Provide dictionary env__efi_fit_tftp_file describing the file used for the UEFI FIT image test. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> --- v3: do not supply 'fn' do not use a function to supply env__efi_fit_tftp_file v2: remove quotes around tftp_dir --- py/travis-ci/u_boot_boardenv_qemu_arm64_na.py | 5 +++++ py/travis-ci/u_boot_boardenv_qemu_arm_na.py | 5 +++++ py/travis-ci/u_boot_boardenv_qemu_x86_64_na.py | 5 +++++ py/travis-ci/u_boot_boardenv_qemu_x86_na.py | 5 +++++ py/travis-ci/u_boot_boardenv_vexpress_ca15_tc2_qemu.py | 4 ++++ py/travis-ci/u_boot_boardenv_vexpress_ca9x4_qemu.py | 4 ++++ 6 files changed, 28 insertions(+) -- 2.24.1