genericarm64: depend on u-boot in testimage

genericarm64 supports runqemu, so testimage should work. However, out of
the box it does not:

runqemu - ERROR - BIOS .../tmp/deploy/images/genericarm64/u-boot.bin not found

That is because we make the user explicitly build the qemu-targetting u-boot
to avoid the confusing situation where they have real hardware but the
deploy directory contains a u-boot for qemu.

In automated testing situations, however, we can be a bit more helpful
and make testimage depend on u-boot. This will lead to u-boot binaries
being in deploy, but at this point the user is already running the images
inside a qemu.

Reported-by: James McGregor <James.McGregor2@arm.com>
(From meta-yocto rev: 90b45c62d34396a20078b55d7d36f66b4e2177f7)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 3 insertions, 0 deletions

diff --git a/meta-yocto-bsp/conf/machine/genericarm64.conf b/meta-yocto-bsp/conf/machine/genericarm64.conf
index 4fa9395b31..1cb5e46dcf 100644
--- a/meta-yocto-bsp/conf/machine/genericarm64.conf
+++ b/meta-yocto-bsp/conf/machine/genericarm64.conf
@@ -58,3 +58,6 @@ QB_SERIAL_OPT = "-device virtio-serial-pci -chardev null,id=virtcon -device virt
 QB_TCPSERIAL_OPT = "-device virtio-serial-pci -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1,nodelay=on -device virtconsole,chardev=virtcon"
 # Virtio networking
 QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no"
+
+# If we're running testimage then we're in a qemu, so ensure u-boot is build
+TESTIMAGEDEPENDS:append = " u-boot:do_deploy"