Failed in applying to current master (
apply log)
Maintainers: "Cédric Le Goater" <clg@kaod.org>, Peter Maydell <peter.maydell@linaro.org>, Andrew Jeffery <andrew@aj.id.au>, Joel Stanley <joel@jms.id.au>, Alistair Francis <alistair@alistair23.me>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Cleber Rosa <crosa@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>
hw/block/m25p80_sfdp.h | 29 ++++
include/hw/i2c/aspeed_i2c.h | 1 +
include/hw/ssi/aspeed_smc.h | 2 +
include/hw/ssi/ssi.h | 3 +
hw/arm/aspeed.c | 15 +-
hw/arm/aspeed_ast2600.c | 2 +
hw/block/m25p80.c | 52 ++++++-
hw/block/m25p80_sfdp.c | 332 ++++++++++++++++++++++++++++++++++++++++
hw/i2c/aspeed_i2c.c | 8 +-
hw/ssi/aspeed_smc.c | 9 +-
hw/ssi/ssi.c | 18 +--
MAINTAINERS | 2 +-
hw/block/meson.build | 1 +
hw/block/trace-events | 1 +
tests/avocado/machine_aspeed.py | 16 +-
15 files changed, 452 insertions(+), 39 deletions(-)
create mode 100644 hw/block/m25p80_sfdp.h
create mode 100644 hw/block/m25p80_sfdp.c