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/misc | |
| parent | bbd69d36d173d28a9af9298f1c5433f8c07f49c5 (diff) | |
| parent | f874d7293589ab42bf5da0c03c9048e5d11c292f (diff) | |
| download | qemu-17dc57990320edaad52ac9ea808be9719c91cea6.zip qemu-17dc57990320edaad52ac9ea808be9719c91cea6.tar.gz qemu-17dc57990320edaad52ac9ea808be9719c91cea6.tar.bz2 | |
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/misc')
| -rw-r--r-- | hw/misc/Kconfig | 3 | ||||
| -rw-r--r-- | hw/misc/Makefile.objs | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 385e1b0..51754bb 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -117,4 +117,7 @@ config AUX bool select I2C +config UNIMP + bool + source macio/Kconfig diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index e9aab51..e4aad70 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -9,7 +9,7 @@ common-obj-$(CONFIG_PCI_TESTDEV) += pci-testdev.o common-obj-$(CONFIG_EDU) += edu.o common-obj-$(CONFIG_PCA9552) += pca9552.o -common-obj-y += unimp.o +common-obj-$(CONFIG_UNIMP) += unimp.o common-obj-$(CONFIG_FW_CFG_DMA) += vmcoreinfo.o # ARM devices |