Merge remote-tracking branch 'remotes/kraxel/tags/pull-roms-20150219-1' into staging

seabios: update to 1.8.0 release

# gpg: Signature made Thu Feb 19 08:36:30 2015 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <[email protected]>"
# gpg:                 aka "Gerd Hoffmann <[email protected]>"
# gpg:                 aka "Gerd Hoffmann (private) <[email protected]>"

* remotes/kraxel/tags/pull-roms-20150219-1:
  seabios: update to 1.8.0 release

Signed-off-by: Peter Maydell <[email protected]>

diff --git a/pc-bios/bios-256k.bin b/pc-bios/bios-256k.bin
index fab9da2b3f1ed9209d9245138e5521363313b005..1c3f4021fcd4dc7a1d5f460a9c578890fb69195f 100644 (file)
Binary files a/pc-bios/bios-256k.bin and b/pc-bios/bios-256k.bin differ

diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin
index 8c718e1b92ae8df3e1e8f90dfe848da786c3d79c..3724535de9c566003c7a264c626a607ba423079e 100644 (file)
Binary files a/pc-bios/bios.bin and b/pc-bios/bios.bin differ

diff --git a/pc-bios/vgabios-cirrus.bin b/pc-bios/vgabios-cirrus.bin
index 0c4d25346b352dc94802558f89c2a1d1044b240c..09dd0fa19cf7c465a9946f24c18a83f90888099c 100644 (file)
Binary files a/pc-bios/vgabios-cirrus.bin and b/pc-bios/vgabios-cirrus.bin differ

diff --git a/pc-bios/vgabios-qxl.bin b/pc-bios/vgabios-qxl.bin
index 4e08e1362d8328d12dbdf1b1ee459ebfcd8b3281..92f22bf48c256c98341e84a4a76c9abcba01a2ba 100644 (file)
Binary files a/pc-bios/vgabios-qxl.bin and b/pc-bios/vgabios-qxl.bin differ

diff --git a/pc-bios/vgabios-stdvga.bin b/pc-bios/vgabios-stdvga.bin
index e5e5b14e4d2e6d83badd8c5f0959e992c9bfe0e5..73c3468e200ea1c168052b8d3366859565f9a6ae 100644 (file)
Binary files a/pc-bios/vgabios-stdvga.bin and b/pc-bios/vgabios-stdvga.bin differ

diff --git a/pc-bios/vgabios-vmware.bin b/pc-bios/vgabios-vmware.bin
index cf2576d3442bd30a90ef72e70b17b64ce8f3710c..86f9f7e8234d0c36d8e92c150adfb093d5496903 100644 (file)
Binary files a/pc-bios/vgabios-vmware.bin and b/pc-bios/vgabios-vmware.bin differ

diff --git a/pc-bios/vgabios.bin b/pc-bios/vgabios.bin
index bad187dc2e2adc24318addb37021400e54d8eabe..de3226e7aafc389cc500c89f0d3aa9326a09973e 100644 (file)
Binary files a/pc-bios/vgabios.bin and b/pc-bios/vgabios.bin differ

diff --git a/roms/config.seabios-128k b/roms/config.seabios-128k
index e653c75f5d485917b35fa36ddb8b35e6eae03d05..c719ba6892d53ac9645c67580f9ba8064a813c90 100644 (file)
--- a/roms/config.seabios-128k
+++ b/roms/config.seabios-128k
@@ -5,3 +5,4 @@ CONFIG_ROM_SIZE=128
 CONFIG_XEN=n
 CONFIG_USB_XHCI=n
 CONFIG_USB_UAS=n
+CONFIG_SDCARD=n

diff --git a/roms/seabios b/roms/seabios
index 8936dbb2cd5403c9a8279c849f7f4b0ccc0796ac..4c59f5d83044df4d57b90958b0fdfcecb913fddb 160000 (submodule)
--- a/roms/seabios
+++ b/roms/seabios
@@ -1 +1 @@
-Subproject commit 8936dbb2cd5403c9a8279c849f7f4b0ccc0796ac
+Subproject commit 4c59f5d83044df4d57b90958b0fdfcecb913fddb