potatOS
/
potatOS-pro
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

base: potatOS:c3c32c9542275f356a3b66cc07eb88ebc70c6eed
Branches Tags
potatOS:master
potatOS:single-core
potatOS:cookbook-gui-fix
potatOS:update-script
potatOS:0.4.1
potatOS:0.8.0
potatOS:0.7.0
potatOS:0.6.0
potatOS:0.5.0
potatOS:0.4.1
potatOS:0.3.5
potatOS:0.3.4
potatOS:0.3.3
potatOS:0.3.2
potatOS:0.3.1
potatOS:0.3.0
potatOS:0.2.0
potatOS:0.1.5
potatOS:0.1.4
potatOS:0.1.3
potatOS:0.1.2
potatOS:0.1.1
potatOS:0.1.0
potatOS:0.0.9
potatOS:0.0.8
potatOS:0.0.7
potatOS:0.0.6
potatOS:0.0.5
potatOS:0.0.4
potatOS:0.0.3
potatOS:0.0.2
potatOS:0.0.1
...
compare: potatOS:35ad3f050505ddbf997f37cc6e53b0596d5b98c7
Branches Tags
potatOS:master
potatOS:single-core
potatOS:cookbook-gui-fix
potatOS:update-script
potatOS:0.4.1
potatOS:0.8.0
potatOS:0.7.0
potatOS:0.6.0
potatOS:0.5.0
potatOS:0.4.1
potatOS:0.3.5
potatOS:0.3.4
potatOS:0.3.3
potatOS:0.3.2
potatOS:0.3.1
potatOS:0.3.0
potatOS:0.2.0
potatOS:0.1.5
potatOS:0.1.4
potatOS:0.1.3
potatOS:0.1.2
potatOS:0.1.1
potatOS:0.1.0
potatOS:0.0.9
potatOS:0.0.8
potatOS:0.0.7
potatOS:0.0.6
potatOS:0.0.5
potatOS:0.0.4
potatOS:0.0.3
potatOS:0.0.2
potatOS:0.0.1

2 Commits
c3c32c9542 ... 35ad3f0505

Author SHA1 Message Date
Jeremy Soller 35ad3f0505
Update relibc 2020-03-29 20:17:40 -06:00
Jeremy Soller 94a1e0d5b0
Use variable for qemu EFI firmware location 2020-03-29 20:02:37 -06:00
2 changed files with 8 additions and 7 deletions
Show Stats 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

2
relibc

@ -1 +1 @@
Subproject commit 2629918100d3c23a8fd2086a28271d356f8034e9 Subproject commit 701e64b3a1e6899e94190c84ee301474039446b9