diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2019-08-20 14:14:20 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2019-08-20 14:14:20 +0100 |
commit | 17dc57990320edaad52ac9ea808be9719c91cea6 (patch) | |
tree | 348ae3f69c526c2e8c6e9a1943e841994a1c99e9 /hw/arm/Kconfig | |
parent | bbd69d36d173d28a9af9298f1c5433f8c07f49c5 (diff) | |
parent | f874d7293589ab42bf5da0c03c9048e5d11c292f (diff) |
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: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/Kconfig')
-rw-r--r-- | hw/arm/Kconfig | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index ab65ecd216..76a2a6bcbf 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -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 |