diff options
| author | Peter Maydell | 2020-09-18 14:36:42 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-09-18 14:36:42 +0200 |
| commit | e883b492c221241d28aaa322c61536436090538a (patch) | |
| tree | e70915cab4b0fee65482e2abc294c0d97365e296 /include/hw | |
| parent | docker.py: always use --rm (diff) | |
| parent | misc: aspeed_scu: Update AST2600 silicon id register (diff) | |
| download | qemu-e883b492c221241d28aaa322c61536436090538a.tar.gz qemu-e883b492c221241d28aaa322c61536436090538a.tar.xz qemu-e883b492c221241d28aaa322c61536436090538a.zip | |
Merge remote-tracking branch 'remotes/legoater/tags/pull-aspeed-20200918' into staging
Aspeed patches :
* Couple of cleanups
* New machine properties to define the flash models
# gpg: Signature made Fri 18 Sep 2020 08:23:19 BST
# gpg: using RSA key A0F66548F04895EBFE6B0B6051A343C7CFFBECA1
# gpg: Good signature from "Cédric Le Goater <clg@kaod.org>" [undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: A0F6 6548 F048 95EB FE6B 0B60 51A3 43C7 CFFB ECA1
* remotes/legoater/tags/pull-aspeed-20200918:
misc: aspeed_scu: Update AST2600 silicon id register
hw/arm/aspeed: Add machine properties to define the flash models
hw/arm/aspeed: Map the UART5 device unconditionally
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw')
0 files changed, 0 insertions, 0 deletions