diff options
| author | Thomas Huth <thuth@redhat.com> | 2019-01-31 14:53:26 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-03-07 21:45:53 +0100 |
| commit | 87f9108bad0c5f307902466cf9e2920d1718ea09 (patch) | |
| tree | 635ae249beca172623ebef70f773d9e1c2d53c72 /hw | |
| parent | 58accbc508e123f20829ca95a306dd43ecbd0313 (diff) | |
ppc64: Express dependencies of 'pseries' and 'powernv' machines with kconfig
The POWERNV switch should always select ISA_IPMI_BT, then the other
IPMI options are turned on automatically now.
CONFIG_DIMM should always be selected by the pseries machine,
which in turn depends on CONFIG_MEM_DEVICE since DIMM implements
this interface.
CONFIG_VIRTIO_VGA can be dropped from default-configs/ppc64-softmmu.mak
completely since this device is already automatically enabled via
hw/display/Kconfig now.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/intc/Kconfig | 6 | ||||
| -rw-r--r-- | hw/mem/Kconfig | 1 | ||||
| -rw-r--r-- | hw/ppc/Kconfig | 22 |
3 files changed, 23 insertions, 6 deletions
diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index 6eea14e804..de10a6bcbf 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -31,13 +31,11 @@ config OPENPIC_KVM config XICS bool - default y - depends on PSERIES + depends on POWERNV || PSERIES config XICS_SPAPR bool - default y - depends on PSERIES + select XICS config XICS_KVM bool diff --git a/hw/mem/Kconfig b/hw/mem/Kconfig index d1e635c9a7..620fd4cb59 100644 --- a/hw/mem/Kconfig +++ b/hw/mem/Kconfig @@ -1,5 +1,6 @@ config DIMM bool + select MEM_DEVICE config MEM_DEVICE bool diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index fb085d76fd..32559e8b6d 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -1,11 +1,29 @@ config PSERIES bool + imply PCI_DEVICES + imply TEST_DEVICES + select DIMM + select PCI + select SPAPR_VSCSI + select VFIO if LINUX # needed by spapr_pci_vfio.c + select XICS_SPAPR + select XIVE_SPAPR config SPAPR_RNG bool + default y + depends on PSERIES config POWERNV bool + imply PCI_DEVICES + imply TEST_DEVICES + select ISA_IPMI_BT + select IPMI_LOCAL + select ISA_BUS + select MC146818RTC + select XICS + select XIVE config PPC405 bool @@ -39,10 +57,10 @@ config VIRTEX config XIVE bool - default y - depends on PSERIES + depends on POWERNV || PSERIES config XIVE_SPAPR bool default y depends on PSERIES + select XIVE |