From 8486a7ddebfe82af59e85d9a52cda099ee441482 Mon Sep 17 00:00:00 2001 From: u Date: Fri, 17 Nov 2023 11:21:36 -0500 Subject: rootfs/Makefile cleanups --- partitions/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'partitions') 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 usb: $(whole) usb=$$(usb) && sudo dd status=progress if="$<" of="$$usb" + # QEMU_DISPLAY_OPTIONS = -nographic QEMU_DISPLAY_OPTIONS = -display gtk -QEMU_OPTIONS = $(QEMU_BIOS_OPTIONS) $(QEMU_DISPLAY_OPTIONS) +define QEMU_OPTIONS +-global isa-fdc.fdtypeA=none +$(QEMU_BIOS_OPTIONS) +$(QEMU_DISPLAY_OPTIONS) +endef define emu - NO_AT_BRIDGE=1 qemu-system-x86_64 ${QEMU_OPTIONS} -m 800 -enable-kvm -boot c \ + NO_AT_BRIDGE=1 qemu-system-x86_64 \ + ${QEMU_OPTIONS:%=%} \ + -m 800 -enable-kvm -boot c \ -drive file=$(1),media=disk,driver=raw \ $(optional_persist_disk) endef -- cgit v1.2.3