summaryrefslogtreecommitdiffstats
path: root/hw/nvram
diff options
context:
space:
mode:
authorPeter Maydell2016-10-31 12:12:02 +0100
committerPeter Maydell2016-10-31 12:12:02 +0100
commit4178c782f85530d261058abdccc734aa9b7c89ca (patch)
tree5e231bd3742e84e5dbb2f9c8a4168d76d257a142 /hw/nvram
parentMerge remote-tracking branch 'remotes/famz/tags/for-upstream' into staging (diff)
parenthw/arm/tosa: Fix reset handling (diff)
downloadqemu-4178c782f85530d261058abdccc734aa9b7c89ca.tar.gz
qemu-4178c782f85530d261058abdccc734aa9b7c89ca.tar.xz
qemu-4178c782f85530d261058abdccc734aa9b7c89ca.zip
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20161028' into staging
target-arm queue: * Fix reset GPIO handling for spitz, tosa boards * virt: add 'pmu' property for configuring whether to expose the vPMU to the guest * char: cadence: correct reset value for baud rate registers * versatilepb: do not run if user asks for more than 256MB RAM * pxa2xx: Set value default values for CCCR and CKEN on PXA255 * arm: cubieboard: Add support for initrd * i.MX: Fix GPIO ISR register write # gpg: Signature made Fri 28 Oct 2016 15:56:56 BST # gpg: using RSA key 0x3C2525ED14360CDE # gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" # gpg: aka "Peter Maydell <pmaydell@gmail.com>" # gpg: aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" # Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83 15CF 3C25 25ED 1436 0CDE * remotes/pmaydell/tags/pull-target-arm-20161028: hw/arm/tosa: Fix reset handling hw/arm/spitz: Fix reset handling arm: virt: add PMU property to mach-virt machine type arm: Add an option to turn on/off vPMU support char: cadence: correct reset value for baud rate registers versatilepb: do not run if user asks for more than 256MB RAM hw/arm/pxa2xx: Set value default values for CCCR and CKEN on PXA255 arm: cubieboard: Add support for initrd i.MX: Fix GPIO ISR register write Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/nvram')
0 files changed, 0 insertions, 0 deletions