diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2020-09-04 09:45:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-04 09:45:51 +0200 |
| commit | 805e2c6f15cebc3dba2431f362b52c508eda8c5f (patch) | |
| tree | 19677c1d3145d064da883c2211a7c0da56f7fbf9 /scripts/qemucommand.py | |
| parent | af3b1dbd6cef901a2a0db8686231b037758d4c86 (diff) | |
| parent | 79dc91f40bd90b16d2e06e7c9dccf99560db54c9 (diff) | |
| download | meta-updater-805e2c6f15cebc3dba2431f362b52c508eda8c5f.tar.gz | |
Merge pull request #767 from advancedtelematic/feat/dunfell/2020.9
Feat/dunfell/2020.9
Diffstat (limited to 'scripts/qemucommand.py')
| -rw-r--r-- | scripts/qemucommand.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/qemucommand.py b/scripts/qemucommand.py index 30929ac..9658fcd 100644 --- a/scripts/qemucommand.py +++ b/scripts/qemucommand.py | |||
| @@ -75,7 +75,10 @@ class QemuCommand(object): | |||
| 75 | if args.efi: | 75 | if args.efi: |
| 76 | self.bios = 'OVMF.fd' | 76 | self.bios = 'OVMF.fd' |
| 77 | elif self.enable_u_boot: | 77 | elif self.enable_u_boot: |
| 78 | uboot_path = abspath(join(args.dir, self.machine, 'u-boot-qemux86-64.rom')) | 78 | if args.bootloader: |
| 79 | uboot_path = args.bootloader | ||
| 80 | else: | ||
| 81 | uboot_path = abspath(join(args.dir, self.machine, 'u-boot-qemux86-64.rom')) | ||
| 79 | if self.overlay: | 82 | if self.overlay: |
| 80 | new_uboot_path = self.overlay + '.u-boot.rom' | 83 | new_uboot_path = self.overlay + '.u-boot.rom' |
| 81 | if not exists(self.overlay): | 84 | if not exists(self.overlay): |