aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-11-14 10:44:32 +0000
committerPeter Maydell <peter.maydell@linaro.org>2019-11-14 10:44:32 +0000
commite10bf1fe00eceb2dbff973f5939036ef3f3c77a4 (patch)
treeff3689636354f390937b591d7dabdc32bbf846be
parentaa464db69b40b4b695be31085e6d2f1e90956c89 (diff)
parent0221d73ce6a8e075adaa0a35a6ef853d2652b855 (diff)
downloadqemu-e10bf1fe00eceb2dbff973f5939036ef3f3c77a4.tar.gz
Merge remote-tracking branch 'remotes/kraxel/tags/seabios-20191113-pull-request' into staging
seabios: update to pre-1.13 snapshot (with ahci fix included). # gpg: Signature made Wed 13 Nov 2019 14:03:25 GMT # gpg: using RSA key 4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full] # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full] # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full] # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/seabios-20191113-pull-request: seabios: update to pre-1.13 snapshot 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-ati.binbin38912 -> 39424 bytes
-rw-r--r--pc-bios/vgabios-bochs-display.binbin27648 -> 28672 bytes
-rw-r--r--pc-bios/vgabios-cirrus.binbin38400 -> 38912 bytes
-rw-r--r--pc-bios/vgabios-qxl.binbin38912 -> 39424 bytes
-rw-r--r--pc-bios/vgabios-ramfb.binbin28160 -> 28672 bytes
-rw-r--r--pc-bios/vgabios-stdvga.binbin38912 -> 39424 bytes
-rw-r--r--pc-bios/vgabios-virtio.binbin38912 -> 39424 bytes
-rw-r--r--pc-bios/vgabios-vmware.binbin38912 -> 39424 bytes
-rw-r--r--pc-bios/vgabios.binbin38400 -> 38912 bytes
-rw-r--r--roms/Makefile2
m---------roms/seabios0
13 files changed, 1 insertions, 1 deletions
diff --git a/pc-bios/bios-256k.bin b/pc-bios/bios-256k.bin
index 04671f160ae..c77468d5e67 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 0159c9b5e9a..a84adde296c 100644
--- a/pc-bios/bios.bin
+++ b/pc-bios/bios.bin
Binary files differ
diff --git a/pc-bios/vgabios-ati.bin b/pc-bios/vgabios-ati.bin
index 79644708ff8..df9da730995 100644
--- a/pc-bios/vgabios-ati.bin
+++ b/pc-bios/vgabios-ati.bin
Binary files differ
diff --git a/pc-bios/vgabios-bochs-display.bin b/pc-bios/vgabios-bochs-display.bin
index dd8a1f7e668..8ab76bd7557 100644
--- a/pc-bios/vgabios-bochs-display.bin
+++ b/pc-bios/vgabios-bochs-display.bin
Binary files differ
diff --git a/pc-bios/vgabios-cirrus.bin b/pc-bios/vgabios-cirrus.bin
index 66b2adc5ff5..0a3ae298ac3 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 96aab241be8..6d56fdf64f1 100644
--- a/pc-bios/vgabios-qxl.bin
+++ b/pc-bios/vgabios-qxl.bin
Binary files differ
diff --git a/pc-bios/vgabios-ramfb.bin b/pc-bios/vgabios-ramfb.bin
index 04eb20ed89b..1214549b38e 100644
--- a/pc-bios/vgabios-ramfb.bin
+++ b/pc-bios/vgabios-ramfb.bin
Binary files differ
diff --git a/pc-bios/vgabios-stdvga.bin b/pc-bios/vgabios-stdvga.bin
index 8559c4c562f..d7274d8b4f5 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 4e274c1e83b..2420a9462c9 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 c6df59fb67e..a89b9df1a6d 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 6bf8e76874f..a43eae8c616 100644
--- a/pc-bios/vgabios.bin
+++ b/pc-bios/vgabios.bin
Binary files differ
diff --git a/roms/Makefile b/roms/Makefile
index c1501705193..28e1e557b07 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -1,5 +1,5 @@
-vgabios_variants := stdvga cirrus vmware qxl isavga virtio bochs-display ramfb
+vgabios_variants := stdvga cirrus vmware qxl isavga virtio bochs-display ramfb ati
vgabios_targets := $(subst -isavga,,$(patsubst %,vgabios-%.bin,$(vgabios_variants)))
pxerom_variants := e1000 e1000e eepro100 ne2k_pci pcnet rtl8139 virtio vmxnet3
pxerom_targets := 8086100e 808610d3 80861209 10500940 10222000 10ec8139 1af41000 15ad07b0
diff --git a/roms/seabios b/roms/seabios
-Subproject a5cab58e9a3fb6e168aba919c5669bea406573b
+Subproject 3bdd2b77656124e3fa7693fbfd7a06f74c38eb8