diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-07-04 17:27:54 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-07-04 17:27:54 +0100 |
| commit | 11659423113d2fbcf055085b5e8285d590addfaa (patch) | |
| tree | fd2e6a4f95e2b42623753945211b3e0e0495d7c9 /Makefile | |
| parent | 0d7e96c9b505b2afb1db08732c3a87288ccbbdd3 (diff) | |
| parent | 3b1154fff16cf3bb9297d65145c89321bc1b7aa4 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-seabios-20160704-3' into staging
Revert "bios: Add fast variant of SeaBIOS for use with -kernel on x86."
# gpg: Signature made Mon 04 Jul 2016 16:24:55 BST
# gpg: using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/pull-seabios-20160704-3:
Revert "bios: Add fast variant of SeaBIOS for use with -kernel on x86."
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -408,8 +408,7 @@ common de-ch es fo fr-ca hu ja mk nl-be pt sl tr \ bepo cz ifdef INSTALL_BLOBS -BLOBS=bios.bin bios-256k.bin bios-fast.bin \ -sgabios.bin vgabios.bin vgabios-cirrus.bin \ +BLOBS=bios.bin bios-256k.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \ vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin vgabios-virtio.bin \ acpi-dsdt.aml \ ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin QEMU,cgthree.bin \ |