aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-10-19 18:06:30 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-10-19 18:06:30 +0100
commitd634fc0499001c5ee49e1004576f9c92ea7c05ff (patch)
tree59684f7fd64c7084929523e1f8152c87e4184172
parent00525864f2d89da1158b6b8c3e69ebf9e3398caa (diff)
parent083fab0290f2c40d3d04f7f22eed9c8f2d5b6787 (diff)
downloadqemu-d634fc0499001c5ee49e1004576f9c92ea7c05ff.zip
qemu-d634fc0499001c5ee49e1004576f9c92ea7c05ff.tar.gz
qemu-d634fc0499001c5ee49e1004576f9c92ea7c05ff.tar.bz2
Merge remote-tracking branch 'remotes/kraxel/tags/seabios-1.11-prerelease-20171019-pull-request' into staging
seabios: update to 1.11 prerelease # gpg: Signature made Thu 19 Oct 2017 09:19:33 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/seabios-1.11-prerelease-20171019-pull-request: seabios: update to 1.11 prerelease Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--pc-bios/bios-256k.binbin262144 -> 262144 bytes
-rw-r--r--pc-bios/bios.binbin131072 -> 131072 bytes
-rw-r--r--pc-bios/vgabios-cirrus.binbin38400 -> 38400 bytes
-rw-r--r--pc-bios/vgabios-qxl.binbin38912 -> 38912 bytes
-rw-r--r--pc-bios/vgabios-stdvga.binbin38912 -> 38912 bytes
-rw-r--r--pc-bios/vgabios-virtio.binbin38912 -> 38912 bytes
-rw-r--r--pc-bios/vgabios-vmware.binbin38912 -> 38912 bytes
-rw-r--r--pc-bios/vgabios.binbin38400 -> 38400 bytes
-rw-r--r--roms/config.seabios-128k4
m---------roms/seabios0
10 files changed, 4 insertions, 0 deletions
diff --git a/pc-bios/bios-256k.bin b/pc-bios/bios-256k.bin
index 18666c9..3431468 100644
--- a/pc-bios/bios-256k.bin
+++ b/pc-bios/bios-256k.bin
Binary files differ
diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin
index a394411..0de6417 100644
--- a/pc-bios/bios.bin
+++ b/pc-bios/bios.bin
Binary files differ
diff --git a/pc-bios/vgabios-cirrus.bin b/pc-bios/vgabios-cirrus.bin
index e6c42bd..1ea28f2 100644
--- a/pc-bios/vgabios-cirrus.bin
+++ b/pc-bios/vgabios-cirrus.bin
Binary files differ
diff --git a/pc-bios/vgabios-qxl.bin b/pc-bios/vgabios-qxl.bin
index 915eba7..32bda23 100644
--- a/pc-bios/vgabios-qxl.bin
+++ b/pc-bios/vgabios-qxl.bin
Binary files differ
diff --git a/pc-bios/vgabios-stdvga.bin b/pc-bios/vgabios-stdvga.bin
index 40eca8c..bda1998 100644
--- a/pc-bios/vgabios-stdvga.bin
+++ b/pc-bios/vgabios-stdvga.bin
Binary files differ
diff --git a/pc-bios/vgabios-virtio.bin b/pc-bios/vgabios-virtio.bin
index 8b3abfa..16c7c7d 100644
--- a/pc-bios/vgabios-virtio.bin
+++ b/pc-bios/vgabios-virtio.bin
Binary files differ
diff --git a/pc-bios/vgabios-vmware.bin b/pc-bios/vgabios-vmware.bin
index 6a90b94..b08fdf4 100644
--- a/pc-bios/vgabios-vmware.bin
+++ b/pc-bios/vgabios-vmware.bin
Binary files differ
diff --git a/pc-bios/vgabios.bin b/pc-bios/vgabios.bin
index d3ed89d..b1c1942 100644
--- a/pc-bios/vgabios.bin
+++ b/pc-bios/vgabios.bin
Binary files differ
diff --git a/roms/config.seabios-128k b/roms/config.seabios-128k
index 93203af..486ef0e 100644
--- a/roms/config.seabios-128k
+++ b/roms/config.seabios-128k
@@ -10,3 +10,7 @@ CONFIG_USB_UAS=n
CONFIG_SDCARD=n
CONFIG_TCGBIOS=n
CONFIG_MPT_SCSI=n
+CONFIG_PVSCSI=n
+CONFIG_NVME=n
+CONFIG_USE_SMM=n
+CONFIG_VGAHOOKS=n
diff --git a/roms/seabios b/roms/seabios
-Subproject 5f4c7b13cdf9c450eb55645f4362ea58fa61b79
+Subproject cd47172a673762a05a0c7bd27df6e3cc8febe8d