summary refs log tree commit diff stats
path: root/hw/arm/ast2400.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-07-14 16:49:18 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-07-14 16:49:18 +0100
commit1c8e93fb41c1ee37853ff7b85ebe1218a4a43780 (patch)
treee1c580d9178fc918dc360ab8469e793333e53fde /hw/arm/ast2400.c
parent22e28174ae423629e57b0d03f4bbf2d1bedcd58f (diff)
parentb2a575a1c652904600869e774e45bf4c9ed72c55 (diff)
downloadfocaccia-qemu-1c8e93fb41c1ee37853ff7b85ebe1218a4a43780.tar.gz
focaccia-qemu-1c8e93fb41c1ee37853ff7b85ebe1218a4a43780.zip
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream-fwcfg' into staging
* Updated fw_cfg option ROM to include DMA support

# gpg: Signature made Thu 14 Jul 2016 14:51:06 BST
# gpg:                using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream-fwcfg:
  Add optionrom compatible with fw_cfg DMA version

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/ast2400.c')
0 files changed, 0 insertions, 0 deletions