Merge "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."
diff --git a/Makefile b/Makefile
index 20a227e..7fd174c 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@
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 @@
+ 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:
