diff options
| author | Richard Henderson | 2021-10-22 18:02:12 +0200 |
|---|---|---|
| committer | Richard Henderson | 2021-10-22 18:02:12 +0200 |
| commit | eb8f1d57bd754b19da73bb316e80bbaf9b66103a (patch) | |
| tree | 2b5eec2e06db08fe4e19d87e2ee209638d6dd782 /include/hw | |
| parent | Merge remote-tracking branch 'remotes/vivier-m68k/tags/q800-pull-request' int... (diff) | |
| parent | speed/sdhci: Add trace events (diff) | |
| download | qemu-eb8f1d57bd754b19da73bb316e80bbaf9b66103a.tar.gz qemu-eb8f1d57bd754b19da73bb316e80bbaf9b66103a.tar.xz qemu-eb8f1d57bd754b19da73bb316e80bbaf9b66103a.zip | |
Merge remote-tracking branch 'remotes/clg/tags/pull-aspeed-20211022' into staging
Aspeed patches :
* New fp5280g2-bmc board (John)
* Small cleanup in Aspeed SMC model (Cedric)
# gpg: Signature made Fri 22 Oct 2021 12:55:18 AM PDT
# gpg: using RSA key A0F66548F04895EBFE6B0B6051A343C7CFFBECA1
# gpg: Good signature from "Cédric Le Goater <clg@kaod.org>" [marginal]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: A0F6 6548 F048 95EB FE6B 0B60 51A3 43C7 CFFB ECA1
* remotes/clg/tags/pull-aspeed-20211022:
speed/sdhci: Add trace events
aspeed/smc: Use a container for the flash mmio address space
aspeed: Add support for the fp5280g2-bmc board
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/ssi/aspeed_smc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/ssi/aspeed_smc.h b/include/hw/ssi/aspeed_smc.h index 75bc793bd2..e265555819 100644 --- a/include/hw/ssi/aspeed_smc.h +++ b/include/hw/ssi/aspeed_smc.h @@ -52,8 +52,8 @@ struct AspeedSMCState { SysBusDevice parent_obj; MemoryRegion mmio; + MemoryRegion mmio_flash_container; MemoryRegion mmio_flash; - MemoryRegion mmio_flash_alias; qemu_irq irq; |