Merge remote-tracking branch 'remotes/kraxel/tags/pull-seabios-20160704-1' into staging

seabios: update from 1.9.1 to 1.9.3

# gpg: Signature made Mon 04 Jul 2016 10:29:47 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-1:
  seabios: update binaries from 1.9.1 to 1.9.3
  seabios: update 128k config
  bios: Add fast variant of SeaBIOS for use with -kernel on x86.
  seabios: update submodule from 1.9.1 to 1.9.3

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

8 files changed, 34 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 9d12dc614f..7bfb8b4e90 100644
--- a/Makefile
+++ b/Makefile
@@ -408,7 +408,8 @@ 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 sgabios.bin vgabios.bin vgabios-cirrus.bin \
+BLOBS=bios.bin bios-256k.bin bios-fast.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-256k.bin b/pc-bios/bios-256k.bin
index e7a7e72e32..57fb4d88b1 100644
--- a/pc-bios/bios-256k.bin
+++ b/pc-bios/bios-256k.bin
diff --git a/pc-bios/bios-fast.bin b/pc-bios/bios-fast.bin
new file mode 100644
index 0000000000..00cda3cb82
--- /dev/null
+++ b/pc-bios/bios-fast.bin
diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin
index b0ae502f6e..8a6869ff1b 100644
--- a/pc-bios/bios.bin
+++ b/pc-bios/bios.bin
diff --git a/roms/Makefile b/roms/Makefile
index 7bd1252737..26b058659a 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -61,9 +61,11 @@ 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
+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-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-128k b/roms/config.seabios-128k
index 0a9da77a5e..93203af0de 100644
--- a/roms/config.seabios-128k
+++ b/roms/config.seabios-128k
@@ -2,9 +2,11 @@
 # need to turn off features (xhci,uas) to make it fit into 128k
 CONFIG_QEMU=y
 CONFIG_ROM_SIZE=128
+CONFIG_BOOTSPLASH=n
 CONFIG_XEN=n
 CONFIG_USB_OHCI=n
 CONFIG_USB_XHCI=n
 CONFIG_USB_UAS=n
 CONFIG_SDCARD=n
 CONFIG_TCGBIOS=n
+CONFIG_MPT_SCSI=n
diff --git a/roms/config.seabios-fast b/roms/config.seabios-fast
new file mode 100644
index 0000000000..045693ea59
--- /dev/null
+++ b/roms/config.seabios-fast
@@ -0,0 +1,27 @@
+# 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
diff --git a/roms/seabios b/roms/seabios
-Subproject b3ef39f532db52bf17457ba931da758eeb38d6b
+Subproject e2fc41e24ee0ada60fc511d60b15a41b294538b