summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-02-26 11:18:30 +0000
committerPeter Maydell <peter.maydell@linaro.org>2015-02-26 11:18:30 +0000
commit2559db069628981bfdc90637fac5bf1b4f4e8ef5 (patch)
treeaa6e1df582537665eb7137b38826b68379b24cc8
parent11d39a131020cc5c54ff9bc86d3259f7d32bf849 (diff)
parent21f5826a04d38e19488f917e1eef22751490c769 (diff)
downloadqemu-2559db069628981bfdc90637fac5bf1b4f4e8ef5.tar.gz
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) <kraxel@redhat.com>" # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" * remotes/kraxel/tags/pull-roms-20150219-1: seabios: update to 1.8.0 release 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.binbin37376 -> 37888 bytes
-rw-r--r--pc-bios/vgabios-qxl.binbin37376 -> 38400 bytes
-rw-r--r--pc-bios/vgabios-stdvga.binbin37376 -> 38400 bytes
-rw-r--r--pc-bios/vgabios-vmware.binbin37376 -> 38400 bytes
-rw-r--r--pc-bios/vgabios.binbin37376 -> 38400 bytes
-rw-r--r--roms/config.seabios-128k1
m---------roms/seabios0
9 files changed, 1 insertions, 0 deletions
diff --git a/pc-bios/bios-256k.bin b/pc-bios/bios-256k.bin
index fab9da2b3f..1c3f4021fc 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 8c718e1b92..3724535de9 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 0c4d25346b..09dd0fa19c 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 4e08e1362d..92f22bf48c 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 e5e5b14e4d..73c3468e20 100644
--- a/pc-bios/vgabios-stdvga.bin
+++ b/pc-bios/vgabios-stdvga.bin
Binary files differ
diff --git a/pc-bios/vgabios-vmware.bin b/pc-bios/vgabios-vmware.bin
index cf2576d344..86f9f7e823 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 bad187dc2e..de3226e7aa 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 e653c75f5d..c719ba6892 100644
--- 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
-Subproject 8936dbb2cd5403c9a8279c849f7f4b0ccc0796a
+Subproject 4c59f5d83044df4d57b90958b0fdfcecb913fdd