diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-12-10 14:26:35 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-12-10 14:26:35 +0000 |
| commit | 379e9eaed497a2e09b5985e1e15967d7bfea8296 (patch) | |
| tree | 45cb9eff91601d0de760d40097829b0b565f934f /tests/qtest/meson.build | |
| parent | 00ef48ff0de9c3e5834e7e3f6691bbc80d08c114 (diff) | |
| parent | 6f5f6507e49df4820207a94f3aeaaeab08092d32 (diff) | |
Merge remote-tracking branch 'remotes/legoater/tags/pull-aspeed-20201210' into staging
Aspeed patches :
* New device model for EMC1413/EMC1414 temperature sensors (I2C)
* New g220a-bmc Aspeed machine
* couple of Aspeed cleanups
# gpg: Signature made Thu 10 Dec 2020 11:58:10 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-20201210:
aspeed: g220a-bmc: Add an FRU
aspeed/smc: Add support for address lane disablement
ast2600: SRAM is 89KB
aspeed: Add support for the g220a-bmc board
hw/misc: add an EMC141{3,4} device model
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/qtest/meson.build')
| -rw-r--r-- | tests/qtest/meson.build | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 4ca83ce605..6a67c538be 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -189,6 +189,7 @@ qos_test_ss.add( 'sdhci-test.c', 'spapr-phb-test.c', 'tmp105-test.c', + 'emc141x-test.c', 'usb-hcd-ohci-test.c', 'virtio-test.c', 'virtio-blk-test.c', |