diff options
| author | Tom Rini <trini@konsulko.com> | 2025-03-15 08:19:31 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-03-15 08:19:31 -0600 |
| commit | 0e1fc465fea62ebae91f2f56cb823e8b37ee1077 (patch) | |
| tree | 14ea0ca0ef443959df1ac5afa7b5114e6910bf77 /test/py/tests/test_vbe_vpl.py | |
| parent | 00dfb7038ea4dfe9d9667143bfecd11c05cab6fa (diff) | |
| parent | 13e8d14442a85a8556211a9950a5b6f80b447901 (diff) | |
Merge tag 'dm-pull-15mar25' of git://git.denx.de/u-boot-dm into next
Sync up on test renames
Diffstat (limited to 'test/py/tests/test_vbe_vpl.py')
| -rw-r--r-- | test/py/tests/test_vbe_vpl.py | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/test/py/tests/test_vbe_vpl.py b/test/py/tests/test_vbe_vpl.py index ed12d3a4618..f011b034f63 100644 --- a/test/py/tests/test_vbe_vpl.py +++ b/test/py/tests/test_vbe_vpl.py @@ -6,35 +6,34 @@ import os import pytest -import u_boot_utils +import utils @pytest.mark.boardspec('sandbox_vpl') @pytest.mark.requiredtool('dtc') -def test_vbe_vpl(u_boot_console): - cons = u_boot_console - #cmd = [cons.config.build_dir + fname, '-v'] - ram = os.path.join(cons.config.build_dir, 'ram.bin') - fdt = os.path.join(cons.config.build_dir, 'arch/sandbox/dts/test.dtb') - image_fname = os.path.join(cons.config.build_dir, 'image.bin') +def test_vbe_vpl(ubman): + #cmd = [ubman.config.build_dir + fname, '-v'] + ram = os.path.join(ubman.config.build_dir, 'ram.bin') + fdt = os.path.join(ubman.config.build_dir, 'arch/sandbox/dts/test.dtb') + image_fname = os.path.join(ubman.config.build_dir, 'image.bin') # Enable firmware1 and the mmc that it uses. These are needed for the full # VBE flow. - u_boot_utils.run_and_log( - cons, f'fdtput -t s {fdt} /bootstd/firmware0 status disabled') - u_boot_utils.run_and_log( - cons, f'fdtput -t s {fdt} /bootstd/firmware1 status okay') - u_boot_utils.run_and_log( - cons, f'fdtput -t s {fdt} /mmc3 status okay') - u_boot_utils.run_and_log( - cons, f'fdtput -t s {fdt} /mmc3 filename {image_fname}') + utils.run_and_log( + ubman, f'fdtput -t s {fdt} /bootstd/firmware0 status disabled') + utils.run_and_log( + ubman, f'fdtput -t s {fdt} /bootstd/firmware1 status okay') + utils.run_and_log( + ubman, f'fdtput -t s {fdt} /mmc3 status okay') + utils.run_and_log( + ubman, f'fdtput -t s {fdt} /mmc3 filename {image_fname}') # Remove any existing RAM file, so we don't have old data present if os.path.exists(ram): os.remove(ram) flags = ['-p', image_fname, '-w', '-s', 'state.dtb'] - cons.restart_uboot_with_flags(flags) + ubman.restart_uboot_with_flags(flags) # Make sure that VBE was used in both VPL (to load SPL) and SPL (to load # U-Boot - output = cons.run_command('vbe state') + output = ubman.run_command('vbe state') assert output == 'Phases: VPL SPL' |