Warrior backport for 2019.11 (#648)

Warrior backport for 2019.11

2 files changed, 3 insertions, 0 deletions

diff --git a/scripts/qemucommand.py b/scripts/qemucommand.py
index 9b23c54..cef434d 100644
--- a/scripts/qemucommand.py
+++ b/scripts/qemucommand.py
@@ -58,6 +58,8 @@ class QemuCommand(object):
         if args.efi:
             self.bios = 'OVMF.fd'
         else:
+            if args.bootloader:
+                uboot_path = args.bootloader
             uboot_path = abspath(join(args.dir, self.machine, 'u-boot-qemux86-64.rom'))
             if self.overlay:
                 new_uboot_path = self.overlay + '.u-boot.rom'
diff --git a/scripts/run-qemu-ota b/scripts/run-qemu-ota
index 232ee11..e2a4103 100755
--- a/scripts/run-qemu-ota
+++ b/scripts/run-qemu-ota
@@ -20,6 +20,7 @@ def main():
                         help='Boot using UEFI rather than U-Boot. This requires the image to be built with ' +
                              'OSTREE_BOOTLOADER = "grub" and OVMF.fd firmware to be installed (try "apt install ovmf")',
                         action='store_true')
+    parser.add_argument('--bootloader', default=None, help="Path to bootloader, e.g. a u-boot ROM")
     parser.add_argument('--machine', default=None, help="Target MACHINE")
     kvm_group = parser.add_argument_group()
     kvm_group.add_argument('--force-kvm', help='Force use of KVM (default is to autodetect)',