summaryrefslogtreecommitdiff
path: root/partitions
diff options
context:
space:
mode:
authoru <u@billy>2023-11-17 11:21:36 -0500
committeru <u@billy>2023-11-17 11:21:36 -0500
commit8486a7ddebfe82af59e85d9a52cda099ee441482 (patch)
tree2a79da909dbdabf413d1fd1d8e32be66c8abe28a /partitions
parent11bdb26906efeaf7b5bdeba7b2196fb73e80acb8 (diff)
rootfs/Makefile
cleanups
Diffstat (limited to 'partitions')
-rw-r--r--partitions/Makefile11
1 files changed, 9 insertions, 2 deletions
diff --git a/partitions/Makefile b/partitions/Makefile
index 91a60d9..e51ddd7 100644
--- a/partitions/Makefile
+++ b/partitions/Makefile
@@ -33,13 +33,20 @@ optional_persist_disk != [ ! -e $(PERSIST_FILE) ] || printf %s '-drive file=$(PE
33usb: $(whole) 33usb: $(whole)
34 usb=$$(usb) && sudo dd status=progress if="$<" of="$$usb" 34 usb=$$(usb) && sudo dd status=progress if="$<" of="$$usb"
35 35
36
36# QEMU_DISPLAY_OPTIONS = -nographic 37# QEMU_DISPLAY_OPTIONS = -nographic
37QEMU_DISPLAY_OPTIONS = -display gtk 38QEMU_DISPLAY_OPTIONS = -display gtk
38 39
39QEMU_OPTIONS = $(QEMU_BIOS_OPTIONS) $(QEMU_DISPLAY_OPTIONS) 40define QEMU_OPTIONS
41-global isa-fdc.fdtypeA=none
42$(QEMU_BIOS_OPTIONS)
43$(QEMU_DISPLAY_OPTIONS)
44endef
40 45
41define emu 46define emu
42 NO_AT_BRIDGE=1 qemu-system-x86_64 ${QEMU_OPTIONS} -m 800 -enable-kvm -boot c \ 47 NO_AT_BRIDGE=1 qemu-system-x86_64 \
48 ${QEMU_OPTIONS:%=%} \
49 -m 800 -enable-kvm -boot c \
43 -drive file=$(1),media=disk,driver=raw \ 50 -drive file=$(1),media=disk,driver=raw \
44 $(optional_persist_disk) 51 $(optional_persist_disk)
45endef 52endef