openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "bios: Add fast variant of SeaBIOS for use with -kernel on x86." 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJXen/HAAoJEEy22O7T6HE404oP/ianCojUsMOGfaJ+/4XR/crT
 TXAwCtbMXzd/X8IWZuPuqxz+cj9V/2jrjra32n50So52F9UoUuQzfvFdnc3b1Wzw
 DGFYRdcxKVXvDbk80/GRPOqAo+anGnqecVMtyTSeOabMCbnC+BcJ4Mek4ougcjGQ
 O1RQl2vaVic20HS6UPq8NG3TIhnfcL3Ckrz8RkFto1p6FD+KJ3ggjhQNTPjYQPcS
 0pjRYCvXym2Cv8Cq1xjd3KNF5sKalTSAqrFq0WEOiVVIcNSS4YSBvVR1wtjEMFMD
 XnSIGB9Tz4e30WzWVxSebu+EZmZFbLj5PaSzYwYAjDMjKjopJSBmOZU1yDsPKGw0
 bWnkMWOfR8NLH3ABuHOGdmZVe/u1HuN2GKcEedetNZbPeJJdz4YBSFPYMF/wdiCZ
 8c4Lspvcn7mpiaaRnrWQYtoWO5Ya85ikqu7w+gDlW+wSdQoJNiAngV7Jva1TavYa
 K/n7uUjgBCs+nhw44QIBy3rWx7c+2XmolEzCkxLcCuk+CWKsOAcfgg1W6R2g1v5g
 9qGfzctxhe99rp3cI06l4Nh4eEK0BKTod9qbEvJaYiJT1wpuD4Cy2btvvs597Vv2
 y4X5KMuZZicICXmjqRFUP3omFqYrV7Gl/e+fduMc6ZfUkyo4Qm94a7W4icw48jOC
 yCyVwhHqVTJU3cT6QyfC
 =YPb5
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2016-07-04 17:27:54 +01:00
parent 0d7e96c9b5 3b1154fff1
commit 1165942311
4 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -408,8 +408,7 @@ common de-ch es fo fr-ca hu ja mk nl-be pt sl tr \
bepo cz bepo cz
ifdef INSTALL_BLOBS ifdef INSTALL_BLOBS
BLOBS=bios.bin bios-256k.bin bios-fast.bin \ BLOBS=bios.bin bios-256k.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \
sgabios.bin vgabios.bin vgabios-cirrus.bin \
vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin vgabios-virtio.bin \ vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin vgabios-virtio.bin \
acpi-dsdt.aml \ acpi-dsdt.aml \
ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin QEMU,cgthree.bin \ ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin QEMU,cgthree.bin \

BIN
pc-bios/bios-fast.bin
View File

Binary file not shown.

4
roms/Makefile
View File

@ -61,11 +61,9 @@ default:
@echo " slof -- update slof.bin" @echo " slof -- update slof.bin"
@echo " u-boot.e500 -- update u-boot.e500" @echo " u-boot.e500 -- update u-boot.e500"
bios: build-seabios-config-seabios-128k build-seabios-config-seabios-256k \ bios: build-seabios-config-seabios-128k build-seabios-config-seabios-256k
build-seabios-config-seabios-fast
cp seabios/builds/seabios-128k/bios.bin ../pc-bios/bios.bin 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-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)) seavgabios: $(patsubst %,seavgabios-%,$(vgabios_variants))

27
roms/config.seabios-fast
View File

@ -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