]> xenbits.xensource.com Git - qemu-upstream-4.6-testing.git/commitdiff
Merge remote-tracking branch 'remotes/afaerber/tags/prep-for-2.1' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 7 Jul 2014 18:06:55 +0000 (19:06 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 7 Jul 2014 18:06:55 +0000 (19:06 +0100)
PowerPC Reference Platform (PReP)

* Update OpenHack'Ware firmware to replace QEMU-side workarounds

# gpg: Signature made Mon 07 Jul 2014 15:49:42 BST using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg:                 aka "Andreas Färber <afaerber@suse.com>"

* remotes/afaerber/tags/prep-for-2.1:
  prep: Update ppc_rom.bin
  prep: Remove CPU reset entry point hack related to OpenHack'Ware
  prep: Remove PCI memory hack related to OpenHack'Ware

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Trivial merge