diff options
| author | David Turner <digit@android.com> | 2011-03-02 03:45:03 -0800 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-03-02 03:45:03 -0800 |
| commit | 930baf66aeb08c8c72fb5ab3194014d41bb18f94 (patch) | |
| tree | 3a3e2afdc8326d7ff9b2f5b2d9cb8f04fd88c67e | |
| parent | 80e81e424e98b6646f3c7f3420f7bad4dc308a08 (diff) | |
| parent | bc028d4c97991c6d34f1c64d0a0f15cdf712b05e (diff) | |
| download | qemu-pc-bios-930baf66aeb08c8c72fb5ab3194014d41bb18f94.tar.gz | |
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."android-sdk-tools_r12android-sdk-adt_r16.0.1android-sdk-adt_r12android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1ics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-release
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | README | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 @@ -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: |