aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJun Nakajima <jnakajim@gmail.com>2011-02-28 18:37:28 -0800
committerJun Nakajima <jnakajim@gmail.com>2011-02-28 18:37:28 -0800
commitbc028d4c97991c6d34f1c64d0a0f15cdf712b05e (patch)
tree3a3e2afdc8326d7ff9b2f5b2d9cb8f04fd88c67e
parent80e81e424e98b6646f3c7f3420f7bad4dc308a08 (diff)
downloadqemu-pc-bios-bc028d4c97991c6d34f1c64d0a0f15cdf712b05e.tar.gz
x86: Use the common BIOS for qemu and KVM. With this patch, we can use the same
guest BIOS for Android x86 emulator w/ or w/o KVM enabled. Change-Id: I61ec2f1ff81a441006725377be18ed4e0304af3f Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
-rw-r--r--Makefile2
-rw-r--r--README2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 20a227e..7fd174c 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ bochs/bios/Makefile:
bios.bin: bochs/bios/Makefile
$(MAKE) -C bochs/bios
- $(CP) bochs/bios/rombios16.bin $@
+ $(CP) bochs/bios/BIOS-bochs-latest $@
vgabios-cirrus.bin:
$(MAKE) -C vgabios
diff --git a/README b/README
index 9fb7113..4dd1860 100644
--- a/README
+++ b/README
@@ -7,7 +7,7 @@ SOURCE CODE
+ bios.bin: git://git.kernel.org/pub/scm/virt/bochs/bochs.git
- The file bios.bin is actually rombios16.bin, which is built from
+ The file bios.bin is actually BIOS-bochs-latest, which is built from
bochs/bios. We used the following commit in the bochs git tree so that
it can match with the qemu tree in platform/external/qemu: