Commit 6e11eb2d authored by Peter Maydell's avatar Peter Maydell
Browse files

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



target-arm queue:
 * Netduino 2 improvements (SPI, ADC devices)
 * fix some Mainstone key mappings
 * vmstateify tsc210x, tsc2005
 * virt: add 2.8 machine type
 * virt: support in-kernel GICv3 ITS
 * generic-loader device
 * A64: fix iss_sf decoding in disas_ld_lit
 * correctly handle 'sub pc, pc, 1' for ARMv6

# gpg: Signature made Tue 04 Oct 2016 13:41:34 BST
# gpg:                using RSA key 0x3C2525ED14360CDE
# 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-20161004: (27 commits)
  target-arm: Correctly handle 'sub pc, pc, 1' for ARMv6
  target-arm: A64: Fix decoding of iss_sf in disas_ld_lit
  cadence_gem: Fix priority queue out of bounds access
  docs: Add a generic loader explanation document
  generic-loader: Add a generic loader
  ARM: Virt: ACPI: Add GIC ITS description in ACPI MADT table
  ACPI: Add GIC Interrupt Translation Service Structure definition
  arm/virt: Add ITS to the virt board
  hw/intc/arm_gicv3_its: Implement support for in-kernel ITS emulation
  kvm-all: Pass requester ID to MSI routing functions
  target-arm: move gicv3_class_name from machine to kvm_arm.h
  hw/intc/arm_gicv3_its: Implement ITS base class
  hw/intc/arm_gic(v3)_kvm: Initialize gsi routing
  hw/arm/virt: add 2.8 machine type
  vmstateify tsc210x
  vmstateify tsc2005
  hw/arm: Fix Integrator/CM initialization
  mainstone: Add mapping for dot, slash and backspace.
  mainstone: Fix incorrect key mapping for Enter key.
  MAINTAINERS: Add Alistair to the maintainers list
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 1bb47107 9b6a3ea7

MAINTAINERS

+21 −0
Original line number Diff line number Diff line
@@ -479,6 +479,21 @@ S: Maintained 
F: hw/arm/virt-acpi-build.c

F: include/hw/arm/virt-acpi-build.h



STM32F205

M: Alistair Francis <alistair@alistair23.me>

S: Maintained

F: hw/arm/stm32f205_soc.c

F: hw/misc/stm32f2xx_syscfg.c

F: hw/char/stm32f2xx_usart.c

F: hw/timer/stm32f2xx_timer.c

F: hw/adc/*

F: hw/ssi/stm32f2xx_spi.c



Netduino 2

M: Alistair Francis <alistair@alistair23.me>

S: Maintained

F: hw/arm/netduino2.c



CRIS Machines

-------------

Axis Dev88
@@ -1014,6 +1029,12 @@ M: Dmitry Fleytman <dmitry@daynix.com> 
S: Maintained

F: hw/net/e1000e*



Generic Loader

M: Alistair Francis <alistair.francis@xilinx.com>

S: Maintained

F: hw/core/generic-loader.c

F: include/hw/core/generic-loader.h



Subsystems

----------

Audio

default-configs/arm-softmmu.mak

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,8 @@ CONFIG_ZYNQ=y 
CONFIG_STM32F2XX_TIMER=y

CONFIG_STM32F2XX_USART=y

CONFIG_STM32F2XX_SYSCFG=y

CONFIG_STM32F2XX_ADC=y

CONFIG_STM32F2XX_SPI=y

CONFIG_STM32F205_SOC=y



CONFIG_VERSATILE_PCI=y

docs/generic-loader.txt

0 → 100644
+84 −0
Original line number Diff line number Diff line 
Copyright (c) 2016 Xilinx Inc.



This work is licensed under the terms of the GNU GPL, version 2 or later.  See

the COPYING file in the top-level directory.





The 'loader' device allows the user to load multiple images or values into

QEMU at startup.



Loading Data into Memory Values

---------------------

The loader device allows memory values to be set from the command line. This

can be done by following the syntax below:



     -device loader,addr=<addr>,data=<data>,data-len=<data-len>

                   [,data-be=<data-be>][,cpu-num=<cpu-num>]



    <addr>      - The address to store the data in.

    <data>      - The value to be written to the address. The maximum size of

                  the data is 8 bytes.

    <data-len>  - The length of the data in bytes. This argument must be

                  included if the data argument is.

    <data-be>   - Set to true if the data to be stored on the guest should be

                  written as big endian data. The default is to write little

                  endian data.

    <cpu-num>   - The number of the CPU's address space where the data should

                  be loaded. If not specified the address space of the first

                  CPU is used.



All values are parsed using the standard QemuOps parsing. This allows the user

to specify any values in any format supported. By default the values

will be parsed as decimal. To use hex values the user should prefix the number

with a '0x'.



An example of loading value 0x8000000e to address 0xfd1a0104 is:

    -device loader,addr=0xfd1a0104,data=0x8000000e,data-len=4



Setting a CPU's Program Counter

---------------------

The loader device allows the CPU's PC to be set from the command line. This

can be done by following the syntax below:



     -device loader,addr=<addr>,cpu-num=<cpu-num>



    <addr>      - The value to use as the CPU's PC.

    <cpu-num>   - The number of the CPU whose PC should be set to the

                  specified value.



All values are parsed using the standard QemuOps parsing. This allows the user

to specify any values in any format supported. By default the values

will be parsed as decimal. To use hex values the user should prefix the number

with a '0x'.



An example of setting CPU 0's PC to 0x8000 is:

    -device loader,addr=0x8000,cpu-num=0



Loading Files

---------------------

The loader device also allows files to be loaded into memory. This can be done

similarly to setting memory values. The syntax is shown below:



    -device loader,file=<file>[,addr=<addr>][,cpu-num=<cpu-num>][,force-raw=<raw>]



    <file>      - A file to be loaded into memory

    <addr>      - The addr in memory that the file should be loaded. This is

                  ignored if you are using an ELF (unless force-raw is true).

                  This is required if you aren't loading an ELF.

    <cpu-num>   - This specifies the CPU that should be used. This is an

                  optional argument and will cause the CPU's PC to be set to

                  where the image is stored or in the case of an ELF file to

                  the value in the header. This option should only be used

                  for the boot image.

                  This will also cause the image to be written to the specified

                  CPU's address space. If not specified, the default is CPU 0.

    <force-raw> - Forces the file to be treated as a raw image. This can be

                  used to specify the load address of ELF files.



All values are parsed using the standard QemuOps parsing. This allows the user

to specify any values in any format supported. By default the values

will be parsed as decimal. To use hex values the user should prefix the number

with a '0x'.



An example of loading an ELF file which CPU0 will boot is shown below:

    -device loader,file=./images/boot.elf,cpu-num=0

hw/Makefile.objs

+1 −0
Original line number Diff line number Diff line 
devices-dirs-$(call land, $(CONFIG_VIRTIO),$(call land,$(CONFIG_VIRTFS),$(CONFIG_PCI))) += 9pfs/

devices-dirs-$(CONFIG_ACPI) += acpi/

devices-dirs-$(CONFIG_SOFTMMU) += adc/

devices-dirs-$(CONFIG_SOFTMMU) += audio/

devices-dirs-$(CONFIG_SOFTMMU) += block/

devices-dirs-$(CONFIG_SOFTMMU) += bt/

hw/adc/Makefile.objs

0 → 100644
+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_STM32F2XX_ADC) += stm32f2xx_adc.o