diff options
| author | Peter Maydell | 2022-02-28 17:46:45 +0100 |
|---|---|---|
| committer | Peter Maydell | 2022-02-28 17:46:45 +0100 |
| commit | a8d39f5b5ae899b1c872f128f82959158cfce048 (patch) | |
| tree | 68674c0b7a4bc94311d4e76311105bb80f8e134a /hw/misc/meson.build | |
| parent | Merge remote-tracking branch 'remotes/shorne/tags/or1k-pull-request' into sta... (diff) | |
| parent | aspeed/sdmc: Add trace events (diff) | |
| download | qemu-a8d39f5b5ae899b1c872f128f82959158cfce048.tar.gz qemu-a8d39f5b5ae899b1c872f128f82959158cfce048.tar.xz qemu-a8d39f5b5ae899b1c872f128f82959158cfce048.zip | |
Merge remote-tracking branch 'remotes/legoater/tags/pull-aspeed-20220227' into staging
aspeed queue:
* Removal of the swift-bmc machine
* New Secure Boot Controller model
* Improvements on the rainier machine
* Various small cleanups
# gpg: Signature made Sun 27 Feb 2022 08:45:45 GMT
# 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-20220227:
aspeed/sdmc: Add trace events
aspeed/smc: Add an address mask on segment registers
aspeed: Introduce a create_pca9552() helper
aspeed: rainier: Add strap values taken from hardware
aspeed: rainier: Add i2c LED devices
ast2600: Add Secure Boot Controller model
arm: Remove swift-bmc machine
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/misc/meson.build')
| -rw-r--r-- | hw/misc/meson.build | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/misc/meson.build b/hw/misc/meson.build index 6dcbe044f3..645585371a 100644 --- a/hw/misc/meson.build +++ b/hw/misc/meson.build @@ -111,6 +111,7 @@ softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed_i3c.c', 'aspeed_lpc.c', 'aspeed_scu.c', + 'aspeed_sbc.c', 'aspeed_sdmc.c', 'aspeed_xdma.c')) |