OSDN Git Service

Merge remote-tracking branch 'remotes/vivier/tags/q800-for-5.0-pull-request' into...
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 7 Jan 2020 17:08:21 +0000 (17:08 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 7 Jan 2020 17:08:21 +0000 (17:08 +0000)
commit035eed4c0d257c905a556fa0f4865a0c077b4e7f
tree8ac776fc4c444da977909be32c5aa87f7d0e4b96
parent973d306dd64bba7fc13f7e8b12ef43c089243d31
parent18b6102e51bb317d25ee61b49b7b56702b79560c
Merge remote-tracking branch 'remotes/vivier/tags/q800-for-5.0-pull-request' into staging

m68k: fix CACR valid bits
q800: add a fake mac rom reset (used by linux)
      fix and improve PRAM emulation

# gpg: Signature made Tue 07 Jan 2020 13:25:50 GMT
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier/tags/q800-for-5.0-pull-request:
  target/m68k: only change valid bits in CACR
  q800: implement mac rom reset function for BIOS-less mode
  q800: add a block backend to the PRAM
  q800: fix mac_via RTC PRAM commands

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