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>
This commit is contained in:
parent
58accbc508
commit
87f9108bad
@ -5,11 +5,6 @@ include ppc-softmmu.mak
|
||||
|
||||
# For PowerNV
|
||||
CONFIG_POWERNV=y
|
||||
CONFIG_ISA_IPMI_BT=y
|
||||
|
||||
# For pSeries
|
||||
CONFIG_PSERIES=y
|
||||
CONFIG_VIRTIO_VGA=y
|
||||
CONFIG_MEM_DEVICE=y
|
||||
CONFIG_DIMM=y
|
||||
CONFIG_SPAPR_RNG=y
|
||||
|
@ -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
|
||||
|
@ -1,5 +1,6 @@
|
||||
config DIMM
|
||||
bool
|
||||
select MEM_DEVICE
|
||||
|
||||
config MEM_DEVICE
|
||||
bool
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user