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 | |
| parent | 0d7e96c9b505b2afb1db08732c3a87288ccbbdd3 (diff) | |
| parent | 3b1154fff16cf3bb9297d65145c89321bc1b7aa4 (diff) | |
| download | qemu-11659423113d2fbcf055085b5e8285d590addfaa.tar.gz | |
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>
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | pc-bios/bios-fast.bin | bin | 65536 -> 0 bytes | |||
| -rw-r--r-- | roms/Makefile | 4 | ||||
| -rw-r--r-- | roms/config.seabios-fast | 27 |
4 files changed, 2 insertions, 32 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 \ diff --git a/pc-bios/bios-fast.bin b/pc-bios/bios-fast.bin Binary files differdeleted file mode 100644 index 00cda3cb82..0000000000 --- a/pc-bios/bios-fast.bin +++ /dev/null diff --git a/roms/Makefile b/roms/Makefile index 26b058659a..7bd1252737 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -61,11 +61,9 @@ default: @echo " slof -- update slof.bin" @echo " u-boot.e500 -- update u-boot.e500" -bios: build-seabios-config-seabios-128k build-seabios-config-seabios-256k \ - build-seabios-config-seabios-fast +bios: build-seabios-config-seabios-128k build-seabios-config-seabios-256k cp seabios/builds/seabios-128k/bios.bin ../pc-bios/bios.bin cp seabios/builds/seabios-256k/bios.bin ../pc-bios/bios-256k.bin - cp seabios/builds/seabios-fast/bios.bin ../pc-bios/bios-fast.bin seavgabios: $(patsubst %,seavgabios-%,$(vgabios_variants)) diff --git a/roms/config.seabios-fast b/roms/config.seabios-fast deleted file mode 100644 index 045693ea59..0000000000 --- a/roms/config.seabios-fast +++ /dev/null @@ -1,27 +0,0 @@ -# The fastest SeaBIOS that can boot Linux using -kernel. -# NB: Since we are using -kernel, we don't need SeaBIOS itself -# to do any boot drive detection, boot ordering, etc. - -# general stuff -CONFIG_QEMU=y -CONFIG_ROM_SIZE=0 -CONFIG_WRITABLE_UPPERMEMORY=y -CONFIG_RELOCATE_INIT=n - -# no input, no boot menu -CONFIG_MOUSE=n -CONFIG_KEYBOARD=n -CONFIG_BOOTMENU=n -CONFIG_BOOTSPLASH=n -CONFIG_BOOTORDER=n - -# hardware support we don't need -CONFIG_LPT=n -CONFIG_SERIAL=n -CONFIG_USB=n -CONFIG_DRIVES=n -CONFIG_TCGBIOS=n -CONFIG_VGAHOOKS=n - -# no logging -CONFIG_DEBUG_LEVEL=0 |