Compare commits
No commits in common. "35ad3f050505ddbf997f37cc6e53b0596d5b98c7" and "c3c32c9542275f356a3b66cc07eb88ebc70c6eed" have entirely different histories.
35ad3f0505
...
c3c32c9542
13
mk/qemu.mk
13
mk/qemu.mk
|
|
@ -1,7 +1,6 @@
|
||||||
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
|
||||||
|
|
@ -70,13 +69,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 $(QEMU_EFI) \
|
-bios /usr/share/OVMF/OVMF_CODE.fd \
|
||||||
-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 $(QEMU_EFI) \
|
-bios /usr/share/OVMF/OVMF_CODE.fd \
|
||||||
-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
|
||||||
|
|
||||||
|
|
@ -92,13 +91,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 $(QEMU_EFI) \
|
-bios /usr/share/OVMF/OVMF_CODE.fd \
|
||||||
-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 $(QEMU_EFI) \
|
-bios /usr/share/OVMF/OVMF_CODE.fd \
|
||||||
-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
|
||||||
|
|
||||||
|
|
@ -134,13 +133,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 $(QEMU_EFI) \
|
-bios /usr/share/OVMF/OVMF_CODE.fd \
|
||||||
-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 $(QEMU_EFI) \
|
-bios /usr/share/OVMF/OVMF_CODE.fd \
|
||||||
-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
|
||||||
|
|
||||||
|
|
|
||||||
2
relibc
2
relibc
|
|
@ -1 +1 @@
|
||||||
Subproject commit 701e64b3a1e6899e94190c84ee301474039446b9
|
Subproject commit 2629918100d3c23a8fd2086a28271d356f8034e9
|
||||||
Reference in New Issue