diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-11-20 10:20:37 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-11-20 10:20:37 +0000 |
| commit | 11f303a57829fff9296c3df313d02b50a33169dd (patch) | |
| tree | 3fa564257774e88cfe33f71898aa28b7ed1f88c8 | |
| parent | 393aac1629c8f82b7c448c8615745e89984899a8 (diff) | |
| parent | af51dbed380b7eec0c815da1c37b46e57a909ce8 (diff) | |
| download | qemu-11f303a57829fff9296c3df313d02b50a33169dd.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/seabios-1.12-20181120-pull-request' into staging
seabios: update to 1.12-final
# gpg: Signature made Tue 20 Nov 2018 06:01:21 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# 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.12-20181120-pull-request:
update seabios to 1.12
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | pc-bios/bios-256k.bin | bin | 262144 -> 262144 bytes | |||
| -rw-r--r-- | pc-bios/bios.bin | bin | 131072 -> 131072 bytes | |||
| -rw-r--r-- | pc-bios/vgabios-bochs-display.bin | bin | 27648 -> 27648 bytes | |||
| -rw-r--r-- | pc-bios/vgabios-cirrus.bin | bin | 38400 -> 38400 bytes | |||
| -rw-r--r-- | pc-bios/vgabios-qxl.bin | bin | 38912 -> 38912 bytes | |||
| -rw-r--r-- | pc-bios/vgabios-ramfb.bin | bin | 28160 -> 28160 bytes | |||
| -rw-r--r-- | pc-bios/vgabios-stdvga.bin | bin | 38912 -> 38912 bytes | |||
| -rw-r--r-- | pc-bios/vgabios-virtio.bin | bin | 38912 -> 38912 bytes | |||
| -rw-r--r-- | pc-bios/vgabios-vmware.bin | bin | 38912 -> 38912 bytes | |||
| -rw-r--r-- | pc-bios/vgabios.bin | bin | 38400 -> 38400 bytes | |||
| -rw-r--r-- | roms/Makefile | 2 | ||||
| m--------- | roms/seabios | 0 |
12 files changed, 1 insertions, 1 deletions
diff --git a/pc-bios/bios-256k.bin b/pc-bios/bios-256k.bin Binary files differindex 72801adc43..08ca873ab5 100644 --- a/pc-bios/bios-256k.bin +++ b/pc-bios/bios-256k.bin diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin Binary files differindex 2bb57341a0..056e0f81f9 100644 --- a/pc-bios/bios.bin +++ b/pc-bios/bios.bin diff --git a/pc-bios/vgabios-bochs-display.bin b/pc-bios/vgabios-bochs-display.bin Binary files differindex 9796e66622..0657f6695d 100644 --- a/pc-bios/vgabios-bochs-display.bin +++ b/pc-bios/vgabios-bochs-display.bin diff --git a/pc-bios/vgabios-cirrus.bin b/pc-bios/vgabios-cirrus.bin Binary files differindex fbd66aa959..de36372725 100644 --- a/pc-bios/vgabios-cirrus.bin +++ b/pc-bios/vgabios-cirrus.bin diff --git a/pc-bios/vgabios-qxl.bin b/pc-bios/vgabios-qxl.bin Binary files differindex e5645fa8af..ce2e2141ce 100644 --- a/pc-bios/vgabios-qxl.bin +++ b/pc-bios/vgabios-qxl.bin diff --git a/pc-bios/vgabios-ramfb.bin b/pc-bios/vgabios-ramfb.bin Binary files differindex 5b65e9084e..44b91cfd3d 100644 --- a/pc-bios/vgabios-ramfb.bin +++ b/pc-bios/vgabios-ramfb.bin diff --git a/pc-bios/vgabios-stdvga.bin b/pc-bios/vgabios-stdvga.bin Binary files differindex 5818f6d668..cfbcae944d 100644 --- a/pc-bios/vgabios-stdvga.bin +++ b/pc-bios/vgabios-stdvga.bin diff --git a/pc-bios/vgabios-virtio.bin b/pc-bios/vgabios-virtio.bin Binary files differindex 6735965347..d81fd281a2 100644 --- a/pc-bios/vgabios-virtio.bin +++ b/pc-bios/vgabios-virtio.bin diff --git a/pc-bios/vgabios-vmware.bin b/pc-bios/vgabios-vmware.bin Binary files differindex b76947a128..05db8b1b0d 100644 --- a/pc-bios/vgabios-vmware.bin +++ b/pc-bios/vgabios-vmware.bin diff --git a/pc-bios/vgabios.bin b/pc-bios/vgabios.bin Binary files differindex 729aecc426..b469f5d0f0 100644 --- a/pc-bios/vgabios.bin +++ b/pc-bios/vgabios.bin diff --git a/roms/Makefile b/roms/Makefile index f1ac85ae9b..f4141e1d96 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -39,7 +39,7 @@ powerpc_cross_prefix := $(call find-cross-prefix,powerpc) x86_64_cross_prefix := $(call find-cross-prefix,x86_64) # tag our seabios builds -SEABIOS_EXTRAVERSION="-prebuilt.qemu-project.org" +SEABIOS_EXTRAVERSION="-prebuilt.qemu.org" # # EfiRom utility is shipped with edk2 / tianocore, in BaseTools/ diff --git a/roms/seabios b/roms/seabios -Subproject 14221cd86eadba82255fdc55ed174d401c7a0a0 +Subproject a698c8995ffb2838296ec284fe3c4ad33dfca30 |