Failed in applying to current master (
apply log)
hw/arm/Makefile.objs | 1 +
hw/arm/smmuv3-internal.h | 26 ++---
hw/intc/gic_internal.h | 2 -
include/hw/arm/aspeed.h | 46 +++++++++
include/hw/arm/nrf51_soc.h | 41 ++++++++
include/hw/intc/arm_gic.h | 43 ++++++++
include/hw/timer/aspeed_timer.h | 3 +-
hw/arm/aspeed.c | 212 +++++++++++++---------------------------
hw/arm/exynos4210.c | 8 +-
hw/arm/microbit.c | 67 +++++++++++++
hw/arm/nrf51_soc.c | 133 +++++++++++++++++++++++++
hw/arm/smmu-common.c | 6 +-
hw/arm/smmuv3.c | 2 +-
hw/arm/virt-acpi-build.c | 10 +-
hw/i2c/aspeed_i2c.c | 63 ++++++++----
hw/intc/arm_gic.c | 31 +++---
hw/intc/arm_gic_common.c | 1 -
hw/net/pcnet-pci.c | 98 ++-----------------
hw/ssi/aspeed_smc.c | 8 +-
hw/timer/aspeed_timer.c | 1 -
hw/timer/cmsdk-apb-dualtimer.c | 2 +
target/arm/cpu.c | 14 ++-
target/arm/helper.c | 45 +++++----
MAINTAINERS | 8 ++
default-configs/arm-softmmu.mak | 1 +
hw/net/trace-events | 6 --
26 files changed, 542 insertions(+), 336 deletions(-)
create mode 100644 include/hw/arm/aspeed.h
create mode 100644 include/hw/arm/nrf51_soc.h
create mode 100644 hw/arm/microbit.c
create mode 100644 hw/arm/nrf51_soc.c