aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-03-03 14:04:27 +0000
committerPeter Maydell <peter.maydell@linaro.org>2017-03-03 14:04:27 +0000
commit9a17d32721ddd5e6ec9e791bf960d32a7ac6327b (patch)
treefd11eb00b346d1a192b45dca66570cc9e3c37ed7
parent1ec2dca691470d15d222a969891e467909739279 (diff)
parent125a9cb8e386980d04a1ac8e04fe9e5c0e826c6f (diff)
downloadqemu-9a17d32721ddd5e6ec9e791bf960d32a7ac6327b.zip
qemu-9a17d32721ddd5e6ec9e791bf960d32a7ac6327b.tar.gz
qemu-9a17d32721ddd5e6ec9e791bf960d32a7ac6327b.tar.bz2
Merge remote-tracking branch 'remotes/dgibson/tags/submodule-update-20170303' into staging
submodule updates (SLOF & dtc) 2017-03-03 This set of patches updates the SLOF and dtc submodules for qemu-2.9. The SLOF update could have gone in my ppc pull request earlier today, but I forgot it. It should be safe to apply in either order with that set though. The dtc (and libfdt) update brings us up to dtc 1.4.3 which includes some things that will be useful in future. # gpg: Signature made Fri 03 Mar 2017 06:29:31 GMT # gpg: using RSA key 0x6C38CACA20D9B392 # gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>" # gpg: aka "David Gibson (Red Hat) <dgibson@redhat.com>" # gpg: aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>" # gpg: aka "David Gibson (kernel.org) <dwg@kernel.org>" # Primary key fingerprint: 75F4 6586 AE61 A66C C44E 87DC 6C38 CACA 20D9 B392 * remotes/dgibson/tags/submodule-update-20170303: Update dtc submodule to v1.4.3 pseries: Update SLOF firmware image Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
m---------dtc0
-rw-r--r--pc-bios/README2
-rw-r--r--pc-bios/slof.binbin898232 -> 902120 bytes
m---------roms/SLOF0
4 files changed, 1 insertions, 1 deletions
diff --git a/dtc b/dtc
-Subproject ec02b34c05be04f249ffaaca4b666f5246877de
+Subproject fa8bc7f928ac25f23532afc8beb2073efc8fb06
diff --git a/pc-bios/README b/pc-bios/README
index 47a913f..dcead36 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-20161019.
+ built from git tag qemu-slof-20170303.
- 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
index 30ce7ac..0408723 100644
--- a/pc-bios/slof.bin
+++ b/pc-bios/slof.bin
Binary files differ
diff --git a/roms/SLOF b/roms/SLOF
-Subproject efd65f49929d7db775b26066d538c8120ae3db9
+Subproject 66d250ef0fd06bb88b7399b9563b5008201f2d6