diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-10-19 18:42:51 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-10-19 18:42:51 +0100 |
| commit | 063833a6ec2a6747e27c5f9866bb44c7e8de1265 (patch) | |
| tree | 259d6e4d4f1c48b6bd515a092b5b81cea54d6cd3 /pc-bios | |
| parent | d634fc0499001c5ee49e1004576f9c92ea7c05ff (diff) | |
| parent | bcf9e2c2f2b7a610efaafc4bd6d0bee9181c2345 (diff) | |
Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-signed' into staging
qemu-sparc update
# gpg: Signature made Thu 19 Oct 2017 07:50:16 BST
# gpg: using RSA key 0x5BC2C56FAE0F321F
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>"
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C C9C4 5BC2 C56F AE0F 321F
* remotes/mcayland/tags/qemu-sparc-signed:
sun4u: fix assert when adding NICs which aren't the in-built model
sun4u: update PCI topology to include simba PCI bridges
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'pc-bios')
| -rw-r--r-- | pc-bios/openbios-sparc64 | bin | 1593408 -> 1593408 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/pc-bios/openbios-sparc64 b/pc-bios/openbios-sparc64 Binary files differindex 7bdd6a1f49..6e1e10c2c0 100644 --- a/pc-bios/openbios-sparc64 +++ b/pc-bios/openbios-sparc64 |