From 1b7fe5e2336a37d463eed05fe057e89c4aeb8b6d Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Sun, 22 Nov 2020 21:08:43 -0700
Subject: [PATCH] Make default image use MBR partition table

---
 mk/disk.mk |  3 ---
 mk/qemu.mk | 12 +-----------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/mk/disk.mk b/mk/disk.mk
index ffb6ef8..0b67fe4 100644
--- a/mk/disk.mk
+++ b/mk/disk.mk
@@ -3,9 +3,6 @@ build/bootloader: bootloader/$(ARCH)/**
 	nasm -f bin -o $@ -D ARCH_$(ARCH) -ibootloader/$(ARCH)/ bootloader/$(ARCH)/disk.asm
 
 build/harddrive.bin: build/filesystem.bin bootloader/$(ARCH)/**
-	nasm -f bin -o $@ -D ARCH_$(ARCH) -D FILESYSTEM=$< -ibootloader/$(ARCH)/ bootloader/$(ARCH)/disk.asm
-
-build/harddrive-mbr.bin: build/filesystem.bin bootloader/$(ARCH)/**
 	nasm -f bin -o build/bootsector.bin -D ARCH_$(ARCH) -ibootloader/$(ARCH)/ bootloader/$(ARCH)/disk.asm
 	dd if=/dev/zero of=$@.partial bs=1M count=$$(expr $$(du -m $< | cut -f1) + 2)
 	parted -s -a minimal $@.partial mklabel msdos
diff --git a/mk/qemu.mk b/mk/qemu.mk
index 6377961..597e504 100644
--- a/mk/qemu.mk
+++ b/mk/qemu.mk
@@ -45,7 +45,7 @@ ifeq ($(UNAME),Linux)
 	ifneq ($(kvm),no)
 		QEMUFLAGS+=-enable-kvm -cpu host
 	else
-		QEMUFLAGS+=-cpu Skylake-Client
+		QEMUFLAGS+=-cpu max
 	endif
 endif
 #,int,pcall
@@ -69,16 +69,6 @@ qemu_no_build: build/extra.bin
 		-drive file=build/harddrive.bin,format=raw \
 		-drive file=build/extra.bin,format=raw
 
-qemu_mbr: build/harddrive-mbr.bin build/extra.bin
-	$(QEMU) $(QEMUFLAGS) \
-		-drive file=build/harddrive-mbr.bin,format=raw \
-		-drive file=build/extra.bin,format=raw
-
-qemu_mbr_no_build: build/extra.bin
-	$(QEMU) $(QEMUFLAGS) \
-		-drive file=build/harddrive-mbr.bin,format=raw \
-		-drive file=build/extra.bin,format=raw
-
 qemu_efi: build/harddrive-efi.bin build/extra.bin
 	$(QEMU) $(QEMUFLAGS) \
 		-bios $(QEMU_EFI) \