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>, Subbaraya Sundeep <sundeep.lkml@gmail.com>, Havard Skinnemoen <hskinnemoen@google.com>, Tyrone Ting <kfting@nuvoton.com>, Alistair Francis <alistair@alistair23.me>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Jason Wang <jasowang@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/arm/aspeed_eeprom.h | 19 +++++
hw/block/m25p80_sfdp.h | 2 +
include/hw/arm/aspeed_soc.h | 14 ++++
include/hw/loader.h | 3 -
include/hw/nvram/eeprom_at24c.h | 39 ++++++++++
include/hw/watchdog/wdt_aspeed.h | 4 +-
hw/arm/aspeed.c | 142 ++++++++++++++++++++----------------
hw/arm/aspeed_ast10x0.c | 83 ++++++++++++++++++++-
hw/arm/aspeed_ast2600.c | 4 +-
hw/arm/aspeed_eeprom.c | 82 +++++++++++++++++++++
hw/arm/aspeed_soc.c | 4 +-
hw/arm/msf2-som.c | 5 +-
hw/arm/npcm7xx_boards.c | 20 ++---
hw/block/m25p80.c | 3 +-
hw/block/m25p80_sfdp.c | 40 ++++++++++
hw/misc/aspeed_hace.c | 21 ++++--
hw/misc/aspeed_sdmc.c | 1 -
hw/net/ftgmac100.c | 4 +-
hw/nvram/eeprom_at24c.c | 58 ++++++++++++---
hw/watchdog/wdt_aspeed.c | 24 ++++--
hw/arm/meson.build | 1 +
tests/avocado/boot_linux_console.py | 19 +++--
tests/avocado/machine_aspeed.py | 60 +++++++++++++--
23 files changed, 523 insertions(+), 129 deletions(-)
create mode 100644 hw/arm/aspeed_eeprom.h
create mode 100644 include/hw/nvram/eeprom_at24c.h
create mode 100644 hw/arm/aspeed_eeprom.c