diff options
| author | Tom Rini <[email protected]> | 2020-03-31 10:05:57 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-03-31 10:05:57 -0400 |
| commit | 1104dde6e89f3d3ab07284e7c871cc33037f1198 (patch) | |
| tree | c7ce7355e30a785007038924b68e7f8870b574fb /test | |
| parent | d1048a60cf874deb6cabc44f6abb4b8d71305e09 (diff) | |
| parent | 67357553ad59eb9b4f412412252e02868ceb16dc (diff) | |
Merge tag 'efi-2020-04-rc5' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-04-rc5
This series fixes:
* UEFI Python tests CONFIG_OF_CONTROL=y.
* int to pointer cast warning for cmd/efidebug.c
* memory reservation even if fdt node is disabled
Now that the Python test is fixed reintroduce the reverted patch for
vexpress_ca9x4 to enable EFI_LOADER and define the dtb file name.
Diffstat (limited to 'test')
| -rw-r--r-- | test/py/tests/test_efi_loader.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/py/tests/test_efi_loader.py b/test/py/tests/test_efi_loader.py index adf9d774529..9465c28fbc5 100644 --- a/test/py/tests/test_efi_loader.py +++ b/test/py/tests/test_efi_loader.py @@ -141,12 +141,13 @@ def fetch_tftp_file(u_boot_console, env_conf): return addr [email protected]('of_control') @pytest.mark.buildconfigspec('cmd_bootefi_hello_compile') def test_efi_helloworld_net(u_boot_console): """Run the helloworld.efi binary via TFTP. - The helloworld.efi file is downloaded from the TFTP server and gets - executed. + The helloworld.efi file is downloaded from the TFTP server and is executed + using the fallback device tree at $fdtcontroladdr. """ addr = fetch_tftp_file(u_boot_console, 'env__efi_loader_helloworld_file') @@ -169,6 +170,7 @@ def test_efi_helloworld_builtin(u_boot_console): expected_text = 'Hello, world' assert expected_text in output [email protected]('of_control') @pytest.mark.buildconfigspec('cmd_bootefi') def test_efi_grub_net(u_boot_console): """Run the grub.efi binary via TFTP. |