Failed in applying to current master (
apply log)
Maintainers: "Cédric Le Goater" <clg@kaod.org>, Peter Maydell <peter.maydell@linaro.org>, Steven Lee <steven_lee@aspeedtech.com>, Troy Lee <leetroy@gmail.com>, Jamin Lin <jamin_lin@aspeedtech.com>, Andrew Jeffery <andrew@codeconstruct.com.au>, Joel Stanley <joel@jms.id.au>, Fabiano Rosas <farosas@suse.de>, Laurent Vivier <lvivier@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>
include/hw/i2c/aspeed_i2c.h | 3 +-
include/hw/misc/aspeed_scu.h | 11 +-
hw/arm/aspeed_ast27x0-fc.c | 15 +-
hw/arm/aspeed_ast27x0.c | 36 ++++
hw/arm/aspeed_ast27x0_evb.c | 29 +++-
hw/i2c/aspeed_i2c.c | 58 +++----
hw/misc/aspeed_scu.c | 11 +-
tests/qtest/ast2700-hace-test.c | 22 +--
tests/functional/aarch64/meson.build | 6 +-
..._aspeed_ast2700.py => test_aspeed_ast2700a1.py} | 0
tests/functional/aarch64/test_aspeed_ast2700a2.py | 190 +++++++++++++++++++++
tests/functional/aarch64/test_aspeed_ast2700fc.py | 16 +-
tests/functional/arm/meson.build | 18 +-
tests/functional/arm/test_aspeed_ast1060.py | 0
...ast2500.py => test_aspeed_ast2500_buildroot.py} | 14 --
tests/functional/arm/test_aspeed_ast2500_sdk.py | 29 ++++
.../functional/arm/test_aspeed_ast2500_sdk_515.py | 29 ++++
.../arm/test_aspeed_ast2600_buildroot.py | 41 +----
.../arm/test_aspeed_ast2600_buildroot_tpm.py | 60 +++++++
tests/functional/arm/test_aspeed_ast2600_sdk.py | 15 --
.../functional/arm/test_aspeed_ast2600_sdk_515.py | 29 ++++
.../functional/arm/test_aspeed_ast2600_sdk_otp.py | 62 +++++++
22 files changed, 539 insertions(+), 155 deletions(-)
rename tests/functional/aarch64/{test_aspeed_ast2700.py => test_aspeed_ast2700a1.py} (100%)
create mode 100755 tests/functional/aarch64/test_aspeed_ast2700a2.py
mode change 100644 => 100755 tests/functional/arm/test_aspeed_ast1060.py
rename tests/functional/arm/{test_aspeed_ast2500.py => test_aspeed_ast2500_buildroot.py} (74%)
create mode 100755 tests/functional/arm/test_aspeed_ast2500_sdk.py
create mode 100755 tests/functional/arm/test_aspeed_ast2500_sdk_515.py
create mode 100755 tests/functional/arm/test_aspeed_ast2600_buildroot_tpm.py
create mode 100755 tests/functional/arm/test_aspeed_ast2600_sdk_515.py
create mode 100755 tests/functional/arm/test_aspeed_ast2600_sdk_otp.py