Commit 17dc5799 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-08-20' into staging 



- Improvements for the Kconfig switches and Makefiles

# gpg: Signature made Tue 20 Aug 2019 08:26:41 BST
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/huth-gitlab/tags/pull-request-2019-08-20:
  hw/core: Add a config switch for the generic loader device
  hw/misc: Add a config switch for the "unimplemented" device
  hw/core: Add a config switch for the "split-irq" device
  hw/core: Add a config switch for the "or-irq" device
  hw/core: Add a config switch for the "register" device
  hw/dma: Do not build the xlnx_dpdma device for the MicroBlaze machines
  hw/intc: Only build the xlnx-iomod-intc device for the MicroBlaze PMU
  hw/Kconfig: Move the generic XLNX_ZYNQMP to the root hw/Kconfig

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents bbd69d36 f874d729

hw/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -73,3 +73,7 @@ config XILINX 
config XILINX_AXI

    bool

    select PTIMER # for hw/dma/xilinx_axidma.c



config XLNX_ZYNQMP

    bool

    select REGISTER

hw/arm/Kconfig

+17 −0
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ config MUSCA 
    select ARMSSE

    select PL011

    select PL031

    select SPLIT_IRQ

    select UNIMP



config MUSICPAL

    bool
@@ -216,6 +218,7 @@ config STELLARIS 
    select SSI_SD

    select STELLARIS_INPUT

    select STELLARIS_ENET # ethernet

    select UNIMP



config STRONGARM

    bool
@@ -282,6 +285,7 @@ config ALLWINNER_A10 
    select ALLWINNER_A10_PIC

    select ALLWINNER_EMAC

    select SERIAL

    select UNIMP



config RASPI

    bool
@@ -292,6 +296,7 @@ config RASPI 
config STM32F205_SOC

    bool

    select ARM_V7M

    select OR_IRQ

    select STM32F2XX_TIMER

    select STM32F2XX_USART

    select STM32F2XX_SYSCFG
@@ -318,6 +323,7 @@ config XLNX_VERSAL 
    select PL011

    select CADENCE

    select VIRTIO_MMIO

    select UNIMP



config FSL_IMX25

    bool
@@ -353,6 +359,7 @@ config ASPEED_SOC 
    select SSI_M25P80

    select TMP105

    select TMP421

    select UNIMP



config MPS2

    bool
@@ -360,8 +367,11 @@ config MPS2 
    select LAN9118

    select MPS2_FPGAIO

    select MPS2_SCC

    select OR_IRQ

    select PL022    # Serial port

    select PL080    # DMA controller

    select SPLIT_IRQ

    select UNIMP



config FSL_IMX7

    bool
@@ -374,6 +384,7 @@ config FSL_IMX7 
    select IMX_I2C

    select PCI_EXPRESS_DESIGNWARE

    select SDHCI

    select UNIMP



config ARM_SMMUV3

    bool
@@ -385,6 +396,7 @@ config FSL_IMX6UL 
    select IMX_FEC

    select IMX_I2C

    select SDHCI

    select UNIMP



config MICROBIT

    bool
@@ -394,6 +406,7 @@ config NRF51_SOC 
    bool

    select I2C

    select ARM_V7M

    select UNIMP



config EMCRAFT_SF2

    bool
@@ -406,6 +419,7 @@ config MSF2 
    select PTIMER

    select SERIAL

    select SSI

    select UNIMP



config ZAURUS

    bool
@@ -439,9 +453,12 @@ config ARMSSE 
    select IOTKIT_SECCTL

    select IOTKIT_SYSCTL

    select IOTKIT_SYSINFO

    select OR_IRQ

    select SPLIT_IRQ

    select TZ_MPC

    select TZ_MSC

    select TZ_PPC

    select UNIMP



config ARMSSE_CPUID

    bool

hw/core/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -7,5 +7,18 @@ config PTIMER 
config FITLOADER

    bool



config GENERIC_LOADER

    bool

    default y



config OR_IRQ

    bool



config PLATFORM_BUS

    bool



config REGISTER

    bool



config SPLIT_IRQ

    bool

hw/core/Makefile.objs

+4 −4
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ common-obj-$(CONFIG_SOFTMMU) += machine.o 
common-obj-$(CONFIG_SOFTMMU) += loader.o

common-obj-$(CONFIG_FITLOADER) += loader-fit.o

common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o

common-obj-$(CONFIG_SOFTMMU) += register.o

common-obj-$(CONFIG_SOFTMMU) += or-irq.o

common-obj-$(CONFIG_SOFTMMU) += split-irq.o

common-obj-$(CONFIG_REGISTER) += register.o

common-obj-$(CONFIG_OR_IRQ) += or-irq.o

common-obj-$(CONFIG_SPLIT_IRQ) += split-irq.o

common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o

common-obj-$(CONFIG_SOFTMMU) += generic-loader.o

common-obj-$(CONFIG_GENERIC_LOADER) += generic-loader.o

common-obj-$(CONFIG_SOFTMMU) += null-machine.o



obj-$(CONFIG_SOFTMMU) += machine-qmp-cmds.o

hw/dma/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ config I8257 


config ZYNQ_DEVCFG

    bool

    select REGISTER



config STP2000

    bool