Commit ceac83e9 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190523' into staging 



target-arm queue:
 * exynos4210: QOM'ify the Exynos4210 SoC
 * exynos4210: Add DMA support for the Exynos4210
 * arm_gicv3: Fix writes to ICC_CTLR_EL3
 * arm_gicv3: Fix write of ICH_VMCR_EL2.{VBPR0, VBPR1}
 * target/arm: Fix vector operation segfault
 * target/arm: Minor improvements to BFXIL, EXTR

# gpg: Signature made Thu 23 May 2019 15:22:55 BST
# gpg:                using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE
# gpg:                issuer "peter.maydell@linaro.org"
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" [ultimate]
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>" [ultimate]
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" [ultimate]
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE

* remotes/pmaydell/tags/pull-target-arm-20190523:
  hw/arm/exynos4210: QOM'ify the Exynos4210 SoC
  hw/arm/exynos4210: Add DMA support for the Exynos4210
  hw/arm/exynos4: Use the IEC binary prefix definitions
  hw/arm/exynos4: Remove unuseful debug code
  hw/intc/arm_gicv3: Fix writes to ICC_CTLR_EL3
  hw/intc/arm_gicv3: Fix write of ICH_VMCR_EL2.{VBPR0, VBPR1}
  arm: Rename hw/arm/arm.h to hw/arm/boot.h
  arm: Remove unnecessary includes of hw/arm/arm.h
  arm: Move system_clock_scale to armv7m_systick.h
  target/arm: Fix vector operation segfault
  target/arm: Simplify BFXIL expansion
  target/arm: Use extract2 for EXTR

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 8dc7fd56 98e4f4fd

hw/arm/armsse.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include "hw/sysbus.h"

#include "hw/registerfields.h"

#include "hw/arm/armsse.h"

#include "hw/arm/arm.h"

#include "hw/arm/boot.h"



/* Format of the System Information block SYS_CONFIG register */

typedef enum SysConfigFormat {

hw/arm/armv7m.c

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include "qemu-common.h"

#include "cpu.h"

#include "hw/sysbus.h"

#include "hw/arm/arm.h"

#include "hw/arm/boot.h"

#include "hw/loader.h"

#include "elf.h"

#include "sysemu/qtest.h"

hw/arm/aspeed.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include "qemu-common.h"

#include "cpu.h"

#include "exec/address-spaces.h"

#include "hw/arm/arm.h"

#include "hw/arm/boot.h"

#include "hw/arm/aspeed.h"

#include "hw/arm/aspeed_soc.h"

#include "hw/boards.h"

hw/arm/boot.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include "qapi/error.h"

#include <libfdt.h>

#include "hw/hw.h"

#include "hw/arm/arm.h"

#include "hw/arm/boot.h"

#include "hw/arm/linux-boot-if.h"

#include "sysemu/kvm.h"

#include "sysemu/sysemu.h"

hw/arm/collie.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include "hw/sysbus.h"

#include "hw/boards.h"

#include "strongarm.h"

#include "hw/arm/arm.h"

#include "hw/arm/boot.h"

#include "hw/block/flash.h"

#include "exec/address-spaces.h"

#include "cpu.h"