From: Simon Glass <sjg@chromium.org>
Date: Thu, 21 Nov 2024 22:32:12 +0000 (-0700)
Subject: test_ut: Use the built mkimage
X-Git-Tag: v2025.04-rc1~17^2~57^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fad73a166a709de69a57a0ec655918f053af169;p=pandora-u-boot.git

test_ut: Use the built mkimage

The mkimage tool is not present in the docker image. Use the one in the
build directory.

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

diff --git a/test/py/tests/test_ut.py b/test/py/tests/test_ut.py
index 0b3ab6242d8..c97ab6b2a46 100644
--- a/test/py/tests/test_ut.py
+++ b/test/py/tests/test_ut.py
@@ -167,8 +167,9 @@ booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
         cons,
         ['sh', '-c', f'xz -dc {infname} >{bmp_file}'])
 
+    mkimage = cons.config.build_dir + '/tools/mkimage'
     u_boot_utils.run_and_log(
-        cons, f'mkimage -C none -A arm -T script -d {cmd_fname} {scr_fname}')
+        cons, f'{mkimage} -C none -A arm -T script -d {cmd_fname} {scr_fname}')
 
     kernel = 'vmlinuz-5.15.63-rockchip64'
     target = os.path.join(bootdir, kernel)
@@ -225,8 +226,9 @@ label Fedora-Workstation-armhfp-31-1.9 (5.3.7-301.fc31.armv7hl)
     inf = os.path.join(cons.config.persistent_data_dir, 'inf')
     with open(inf, 'wb') as fd:
         fd.write(gzip.compress(b'vmlinux'))
+    mkimage = cons.config.build_dir + '/tools/mkimage'
     u_boot_utils.run_and_log(
-        cons, f'mkimage -f auto -d {inf} {os.path.join(mnt, vmlinux)}')
+        cons, f'{mkimage} -f auto -d {inf} {os.path.join(mnt, vmlinux)}')
 
     with open(os.path.join(mnt, initrd), 'w', encoding='ascii') as fd:
         print('initrd', file=fd)