diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-12-09 11:07:34 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-12-09 11:07:34 +0000 |
| commit | 8350b17be015bb872f28268bdeba1bac6c380efc (patch) | |
| tree | 0789481097b443a79283a47cf56a8b9274299a65 | |
| parent | 02f9c885edefae66d787847758d13ed60c0f539e (diff) | |
| parent | a2fad86497b981426dc720236c15f2a99ca674a9 (diff) | |
| download | qemu-8350b17be015bb872f28268bdeba1bac6c380efc.zip qemu-8350b17be015bb872f28268bdeba1bac6c380efc.tar.gz qemu-8350b17be015bb872f28268bdeba1bac6c380efc.tar.bz2 | |
Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.2-20191209' into staging
ppc patch queue 2019-12-09
This is a last minute pull request for ppc-for-4.2. I know it's very
late in freeze, but this does fix a regression: a bad interaction
between the new qemu and SLOF device tree construction code means that
SLOF will crash if PCI to PCI bridges are included in the system.
This PR supersedes ppc-for-4.2-20191206. This one has only a more
minimal change to the firmware addressed only at fixing this bug and
not incorporating some other unrelated changes that happened in the
meantime.
# gpg: Signature made Mon 09 Dec 2019 04:52:19 GMT
# gpg: using RSA key 75F46586AE61A66CC44E87DC6C38CACA20D9B392
# gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>" [full]
# gpg: aka "David Gibson (Red Hat) <dgibson@redhat.com>" [full]
# gpg: aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>" [full]
# gpg: aka "David Gibson (kernel.org) <dwg@kernel.org>" [unknown]
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E 87DC 6C38 CACA 20D9 B392
* remotes/dgibson/tags/ppc-for-4.2-20191209:
pseries: Update SLOF firmware image
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | pc-bios/README | 2 | ||||
| -rw-r--r-- | pc-bios/slof.bin | bin | 928552 -> 931040 bytes | |||
| m--------- | roms/SLOF | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/pc-bios/README b/pc-bios/README index 830645c..91218c6 100644 --- a/pc-bios/README +++ b/pc-bios/README @@ -17,7 +17,7 @@ - SLOF (Slimline Open Firmware) is a free IEEE 1275 Open Firmware implementation for certain IBM POWER hardware. The sources are at https://github.com/aik/SLOF, and the image currently in qemu is - built from git tag qemu-slof-20191022. + built from git tag qemu-slof-20191209. - sgabios (the Serial Graphics Adapter option ROM) provides a means for legacy x86 software to communicate with an attached serial console as diff --git a/pc-bios/slof.bin b/pc-bios/slof.bin Binary files differindex 0b93fe8..50fc9b1 100644 --- a/pc-bios/slof.bin +++ b/pc-bios/slof.bin diff --git a/roms/SLOF b/roms/SLOF -Subproject 899d98836513bb3d6a4f4e48ef7cee887ee5f57 +Subproject 8ebf2f55e1ba1492b942ba4b682160e644fc0f9 |