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

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



target-arm queue:
 * Support u-boot 'noload' images for Arm (as used by NetBSD/evbarm GENERIC kernel)
 * hw/misc/tz-mpc: Fix value of BLK_MAX register
 * target/arm: Emit barriers for A32/T32 load-acquire/store-release insns
 * nRF51 SoC: add timer, GPIO, RNG peripherals
 * hw/arm/allwinner-a10: Add the 'A' SRAM and the SRAM controller
 * cpus.c: Fix race condition in cpu_stop_current()
 * hw/arm: versal: Plug memory leaks
 * Allow M profile boards to run even if -kernel not specified
 * gdbstub: Add multiprocess extension support for use when the
   board has multiple CPUs of different types (like the Xilinx Zynq boards)
 * target/arm: Don't decode S bit in SVE brk[ab] merging insns
 * target/arm: Convert ARM_TBFLAG_* to FIELDs

# gpg: Signature made Mon 07 Jan 2019 16:29:52 GMT
# gpg:                using RSA key 3C2525ED14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>"
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE

* remotes/pmaydell/tags/pull-target-arm-20190107: (37 commits)
  Support u-boot noload images for arm as used by, NetBSD/evbarm GENERIC kernel.
  hw/misc/tz-mpc: Fix value of BLK_MAX register
  target/arm: Emit barriers for A32/T32 load-acquire/store-release insns
  arm: Add Clock peripheral stub to NRF51 SOC
  tests/microbit-test: Add Tests for nRF51 Timer
  arm: Instantiate NRF51 Timers
  hw/timer/nrf51_timer: Add nRF51 Timer peripheral
  tests/microbit-test: Add Tests for nRF51 GPIO
  arm: Instantiate NRF51 general purpose I/O
  hw/gpio/nrf51_gpio: Add nRF51 GPIO peripheral
  arm: Instantiate NRF51 random number generator
  hw/misc/nrf51_rng: Add NRF51 random number generator peripheral
  arm: Add header to host common definition for nRF51 SOC peripherals
  qtest: Add set_irq_in command to set IRQ/GPIO level
  hw/arm/allwinner-a10: Add the 'A' SRAM and the SRAM controller
  cpus.c: Fix race condition in cpu_stop_current()
  MAINTAINERS: Add ARM-related files for hw/[misc|input|timer]/
  hw/arm: versal: Plug memory leaks
  Revert "armv7m: Guard against no -kernel argument"
  arm/xlnx-zynqmp: put APUs and RPUs in separate CPU clusters
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 31ed4188 f831f955

MAINTAINERS

+16 −2
Original line number Diff line number Diff line
@@ -515,6 +515,7 @@ F: hw/intc/arm* 
F: hw/intc/gic_internal.h

F: hw/misc/a9scu.c

F: hw/misc/arm11scu.c

F: hw/misc/arm_l2x0.c

F: hw/timer/a9gtimer*

F: hw/timer/arm*

F: include/hw/arm/arm*.h
@@ -587,6 +588,7 @@ L: qemu-arm@nongnu.org 
S: Maintained

F: hw/arm/integratorcp.c

F: hw/misc/arm_integrator_debug.c

F: include/hw/misc/arm_integrator_debug.h



MCIMX6UL EVK / i.MX6ul

M: Peter Maydell <peter.maydell@linaro.org>
@@ -606,7 +608,9 @@ L: qemu-arm@nongnu.org 
S: Odd Fixes

F: hw/arm/mcimx7d-sabre.c

F: hw/arm/fsl-imx7.c

F: hw/misc/imx7_*.c

F: include/hw/arm/fsl-imx7.h

F: include/hw/misc/imx7_*.h

F: hw/pci-host/designware.c

F: include/hw/pci-host/designware.h
@@ -640,6 +644,10 @@ M: Peter Maydell <peter.maydell@linaro.org> 
L: qemu-arm@nongnu.org

S: Odd Fixes

F: hw/arm/nseries.c

F: hw/input/lm832x.c

F: hw/input/tsc2005.c

F: hw/misc/cbus.c

F: hw/timer/twl92230.c



Palm

M: Andrzej Zaborowski <balrogg@gmail.com>
@@ -647,6 +655,7 @@ M: Peter Maydell <peter.maydell@linaro.org> 
L: qemu-arm@nongnu.org

S: Odd Fixes

F: hw/arm/palm.c

F: hw/input/tsc210x.c



Raspberry Pi

M: Peter Maydell <peter.maydell@linaro.org>
@@ -683,6 +692,7 @@ F: hw/display/tc6393xb.c 
F: hw/gpio/max7310.c

F: hw/gpio/zaurus.c

F: hw/misc/mst_fpga.c

F: hw/misc/max111x.c

F: include/hw/arm/pxa.h

F: include/hw/arm/sharpsl.h
@@ -693,10 +703,10 @@ L: qemu-arm@nongnu.org 
S: Odd Fixes

F: hw/arm/sabrelite.c

F: hw/arm/fsl-imx6.c

F: hw/misc/imx6_src.c

F: hw/misc/imx6_*.c

F: hw/ssi/imx_spi.c

F: include/hw/arm/fsl-imx6.h

F: include/hw/misc/imx6_src.h

F: include/hw/misc/imx6_*.h

F: include/hw/ssi/imx_spi.h



Sharp SL-5500 (Collie) PDA
@@ -807,7 +817,9 @@ R: Joel Stanley <joel@jms.id.au> 
L: qemu-arm@nongnu.org

S: Maintained

F: hw/*/*aspeed*

F: hw/misc/pca9552.c

F: include/hw/*/*aspeed*

F: include/hw/misc/pca9552*.h

F: hw/net/ftgmac100.c

F: include/hw/net/ftgmac100.h
@@ -1195,7 +1207,9 @@ M: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> 
S: Supported

F: hw/core/machine.c

F: hw/core/null-machine.c

F: hw/cpu/cluster.c

F: include/hw/boards.h

F: include/hw/cpu/cluster.h

T: git https://github.com/ehabkost/qemu.git machine-next



Xtensa Machines

Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ trace-events-subdirs += hw/vfio 
trace-events-subdirs += hw/virtio

trace-events-subdirs += hw/watchdog

trace-events-subdirs += hw/xen

trace-events-subdirs += hw/gpio

trace-events-subdirs += io

trace-events-subdirs += linux-user

trace-events-subdirs += migration

cpus.c

+2 −1
Original line number Diff line number Diff line
@@ -2100,7 +2100,8 @@ void qemu_init_vcpu(CPUState *cpu) 
void cpu_stop_current(void)

{

    if (current_cpu) {

        qemu_cpu_stop(current_cpu, true);

        current_cpu->stop = true;

        cpu_exit(current_cpu);

    }

}

gdbstub.c

+588 −76

File changed.

Preview size limit exceeded, changes collapsed.

hw/arm/allwinner-a10.c

+6 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "hw/sysbus.h"

#include "hw/devices.h"

#include "hw/arm/allwinner-a10.h"

#include "hw/misc/unimp.h"



static void aw_a10_init(Object *obj)

{
@@ -85,6 +86,11 @@ static void aw_a10_realize(DeviceState *dev, Error **errp) 
    sysbus_connect_irq(sysbusdev, 4, s->irq[67]);

    sysbus_connect_irq(sysbusdev, 5, s->irq[68]);



    memory_region_init_ram(&s->sram_a, OBJECT(dev), "sram A", 48 * KiB,

                           &error_fatal);

    memory_region_add_subregion(get_system_memory(), 0x00000000, &s->sram_a);

    create_unimplemented_device("a10-sram-ctrl", 0x01c00000, 4 * KiB);



    /* FIXME use qdev NIC properties instead of nd_table[] */

    if (nd_table[0].used) {

        qemu_check_nic_model(&nd_table[0], TYPE_AW_EMAC);