[PATCH v2 2/4] vbe: Use the correct image filename in the test

Simon Glass sjg at chromium.org
Sun Apr 2 04:01:25 CEST 2023


At present this inadvertently relies on having a symlink to the correct
file from the current directory. Use the correct path to fix this.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

(no changes since v1)

 test/py/tests/test_vbe_vpl.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/py/tests/test_vbe_vpl.py b/test/py/tests/test_vbe_vpl.py
index d1c9d0548ae0..ed12d3a46186 100644
--- a/test/py/tests/test_vbe_vpl.py
+++ b/test/py/tests/test_vbe_vpl.py
@@ -15,6 +15,7 @@ def test_vbe_vpl(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')
 
     # Enable firmware1 and the mmc that it uses. These are needed for the full
     # VBE flow.
@@ -24,12 +25,13 @@ def test_vbe_vpl(u_boot_console):
         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}')
 
     # Remove any existing RAM file, so we don't have old data present
     if os.path.exists(ram):
         os.remove(ram)
-    flags = ['-p', os.path.join(cons.config.build_dir, 'image.bin'), '-w',
-             '-s', 'state.dtb']
+    flags = ['-p', image_fname, '-w', '-s', 'state.dtb']
     cons.restart_uboot_with_flags(flags)
 
     # Make sure that VBE was used in both VPL (to load SPL) and SPL (to load
-- 
2.40.0.348.gf938b09366-goog



More information about the U-Boot mailing list