diff options
| author | Peter Maydell | 2019-08-20 15:14:20 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-08-20 15:14:20 +0200 |
| commit | 17dc57990320edaad52ac9ea808be9719c91cea6 (patch) | |
| tree | 348ae3f69c526c2e8c6e9a1943e841994a1c99e9 /hw/core | |
| parent | Merge remote-tracking branch 'remotes/amarkovic/tags/mips-queue-aug-20-2019' ... (diff) | |
| parent | hw/core: Add a config switch for the generic loader device (diff) | |
| download | qemu-17dc57990320edaad52ac9ea808be9719c91cea6.tar.gz qemu-17dc57990320edaad52ac9ea808be9719c91cea6.tar.xz qemu-17dc57990320edaad52ac9ea808be9719c91cea6.zip | |
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/core')
| -rw-r--r-- | hw/core/Kconfig | 13 | ||||
| -rw-r--r-- | hw/core/Makefile.objs | 8 |
2 files changed, 17 insertions, 4 deletions
diff --git a/hw/core/Kconfig b/hw/core/Kconfig index c2a1ae8122..fdf03514d7 100644 --- a/hw/core/Kconfig +++ b/hw/core/Kconfig @@ -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 diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs index f8481d959f..b49f880a0c 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -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 |