From 2e9caf13d665a624b657aa39385a87ed15899c0b Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 31 Mar 2019 15:05:52 -0600 Subject: [PATCH] Fix bochs target --- bochs.x86_64 | 3 ++- mk/bochs.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bochs.x86_64 b/bochs.x86_64 index 977cfdf..17d1a2a 100644 --- a/bochs.x86_64 +++ b/bochs.x86_64 @@ -1,7 +1,8 @@ -ata0-master: type=disk, path="build/harddrive.bin", mode=flat +ata0-master: type=disk, path="build/livedisk.bin", mode=flat boot: disk com1: enabled=1, mode=file, dev=build/serial.log cpu: model=corei7_haswell_4770 +#e1000: enabled=1, mac=52:54:00:12:34:56 ethmod=vnet megs: 1024 magic_break: enabled=1 diff --git a/mk/bochs.mk b/mk/bochs.mk index 964dba5..55c9640 100644 --- a/mk/bochs.mk +++ b/mk/bochs.mk @@ -1,2 +1,2 @@ -bochs: build/harddrive.bin +bochs: build/livedisk.bin bochs -f bochs.$(ARCH)