ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Thomas Huth 2019-01-31 14:53:26 +01:00 committed by Paolo Bonzini
parent 58accbc508
commit 87f9108bad
4 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
default-configs/ppc64-softmmu.mak
View File

@ -5,11 +5,6 @@ include ppc-softmmu.mak
# For PowerNV # For PowerNV
CONFIG_POWERNV=y CONFIG_POWERNV=y
CONFIG_ISA_IPMI_BT=y
# For pSeries # For pSeries
CONFIG_PSERIES=y CONFIG_PSERIES=y
CONFIG_VIRTIO_VGA=y
CONFIG_MEM_DEVICE=y
CONFIG_DIMM=y
CONFIG_SPAPR_RNG=y

6
hw/intc/Kconfig
View File

@ -31,13 +31,11 @@ config OPENPIC_KVM
config XICS config XICS
bool bool
default y depends on POWERNV || PSERIES
depends on PSERIES
config XICS_SPAPR config XICS_SPAPR
bool bool
default y select XICS
depends on PSERIES
config XICS_KVM config XICS_KVM
bool bool

1
hw/mem/Kconfig
View File

@ -1,5 +1,6 @@
config DIMM config DIMM
bool bool
select MEM_DEVICE
config MEM_DEVICE config MEM_DEVICE
bool bool

22
hw/ppc/Kconfig
View File

@ -1,11 +1,29 @@
config PSERIES config PSERIES
bool 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 config SPAPR_RNG
bool bool
default y
depends on PSERIES
config POWERNV config POWERNV
bool 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 config PPC405
bool bool
@ -39,10 +57,10 @@ config VIRTEX
config XIVE config XIVE
bool bool
default y depends on POWERNV || PSERIES
depends on PSERIES
config XIVE_SPAPR config XIVE_SPAPR
bool bool
default y default y
depends on PSERIES depends on PSERIES
select XIVE