vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Use variable for qemu EFI firmware location

Browse source
This commit is contained in:
Jeremy Soller 2020-03-29 20:02:37 -06:00
parent c3c32c9542
commit 94a1e0d5b0
No known key found for this signature in database
GPG key ID: E988B49EE78A7FB1
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
mk/qemu.mk
View file

@ -1,6 +1,7 @@
QEMU=SDL_VIDEO_X11_DGAMOUSE=0 qemu-system-$(ARCH) QEMU=SDL_VIDEO_X11_DGAMOUSE=0 qemu-system-$(ARCH)
QEMUFLAGS=-d cpu_reset -d guest_errors QEMUFLAGS=-d cpu_reset -d guest_errors
QEMUFLAGS+=-smp 4 -m 2048 QEMUFLAGS+=-smp 4 -m 2048
QEMU_EFI=/usr/share/OVMF/OVMF_CODE.fd
ifeq ($(serial),no) ifeq ($(serial),no)
QEMUFLAGS+=-chardev stdio,id=debug -device isa-debugcon,iobase=0x402,chardev=debug QEMUFLAGS+=-chardev stdio,id=debug -device isa-debugcon,iobase=0x402,chardev=debug
else else
@ -69,13 +70,13 @@ qemu_mbr_no_build: build/extra.bin
qemu_efi: build/harddrive-efi.bin build/extra.bin qemu_efi: build/harddrive-efi.bin build/extra.bin
$(QEMU) $(QEMUFLAGS) \ $(QEMU) $(QEMUFLAGS) \
-bios /usr/share/OVMF/OVMF_CODE.fd \ -bios $(QEMU_EFI) \
-drive file=build/harddrive-efi.bin,format=raw \ -drive file=build/harddrive-efi.bin,format=raw \
-drive file=build/extra.bin,format=raw -drive file=build/extra.bin,format=raw
qemu_efi_no_build: build/extra.bin qemu_efi_no_build: build/extra.bin
$(QEMU) $(QEMUFLAGS) \ $(QEMU) $(QEMUFLAGS) \
-bios /usr/share/OVMF/OVMF_CODE.fd \ -bios $(QEMU_EFI) \
-drive file=build/harddrive-efi.bin,format=raw \ -drive file=build/harddrive-efi.bin,format=raw \
-drive file=build/extra.bin,format=raw -drive file=build/extra.bin,format=raw
@ -91,13 +92,13 @@ qemu_nvme_no_build: build/extra.bin
qemu_nvme_efi: build/harddrive-efi.bin build/extra.bin qemu_nvme_efi: build/harddrive-efi.bin build/extra.bin
$(QEMU) $(QEMUFLAGS) \ $(QEMU) $(QEMUFLAGS) \
-bios /usr/share/OVMF/OVMF_CODE.fd \ -bios $(QEMU_EFI) \
-drive file=build/harddrive-efi.bin,format=raw,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL \ -drive file=build/harddrive-efi.bin,format=raw,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL \
-drive file=build/extra.bin,format=raw,if=none,id=drv1 -device nvme,drive=drv1,serial=NVME_EXTRA -drive file=build/extra.bin,format=raw,if=none,id=drv1 -device nvme,drive=drv1,serial=NVME_EXTRA
qemu_nvme_efi_no_build: build/extra.bin qemu_nvme_efi_no_build: build/extra.bin
$(QEMU) $(QEMUFLAGS) \ $(QEMU) $(QEMUFLAGS) \
-bios /usr/share/OVMF/OVMF_CODE.fd \ -bios $(QEMU_EFI) \
-drive file=build/harddrive-efi.bin,format=raw,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL \ -drive file=build/harddrive-efi.bin,format=raw,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL \
-drive file=build/extra.bin,format=raw,if=none,id=drv1 -device nvme,drive=drv1,serial=NVME_EXTRA -drive file=build/extra.bin,format=raw,if=none,id=drv1 -device nvme,drive=drv1,serial=NVME_EXTRA
@ -133,13 +134,13 @@ qemu_iso_no_build: build/extra.bin
qemu_iso_efi: build/livedisk-efi.iso build/extra.bin qemu_iso_efi: build/livedisk-efi.iso build/extra.bin
$(QEMU) $(QEMUFLAGS) \ $(QEMU) $(QEMUFLAGS) \
-bios /usr/share/OVMF/OVMF_CODE.fd \ -bios $(QEMU_EFI) \
-boot d -cdrom build/livedisk-efi.iso \ -boot d -cdrom build/livedisk-efi.iso \
-drive file=build/extra.bin,format=raw -drive file=build/extra.bin,format=raw
qemu_iso_efi_no_build: build/extra.bin qemu_iso_efi_no_build: build/extra.bin
$(QEMU) $(QEMUFLAGS) \ $(QEMU) $(QEMUFLAGS) \
-bios /usr/share/OVMF/OVMF_CODE.fd \ -bios $(QEMU_EFI) \
-boot d -cdrom build/livedisk-efi.iso \ -boot d -cdrom build/livedisk-efi.iso \
-drive file=build/extra.bin,format=raw -drive file=build/extra.bin,format=raw