diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2020-07-29 11:20:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-29 11:20:16 +0200 |
| commit | 8f6b6c3739c566e98c2654a8aadd2339ed676595 (patch) | |
| tree | 403affb420d5a769c7091990d5ddf4c691dd0194 | |
| parent | 5f7f0d139b3c81e163ad46d366cf1d843c3cb793 (diff) | |
| parent | f90d617d3af138ed8616829dc403488a700aaae3 (diff) | |
| download | meta-updater-8f6b6c3739c566e98c2654a8aadd2339ed676595.tar.gz | |
Merge pull request #756 from advancedtelematic/fix/restore-bootloader-option
qemucommand: Restore custom booloader parameter.
| -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): |