21d64275ad
qemu-softmmu-ppc64 is supposed to be a superset of qemu-softmmu-ppc. However, instead of simply including the 32-bit config file, we've duplicated all CONFIG_xxx settings there instead. This way, we've missed some CONFIG switches in ppc64-softmmu.mak which were only added to the 32-bit config file (e.g. CONFIG_SUNGEM). Let's fix this problem by including the 32-bit config file into the 64-bit config file instead of duplicating all the CONFIG switches there. Signed-off-by: Thomas Huth <thuth@redhat.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
20 lines
403 B
Makefile
20 lines
403 B
Makefile
# Default configuration for ppc64-softmmu
|
|
|
|
# Include all 32-bit boards
|
|
include ppc-softmmu.mak
|
|
|
|
# For PowerNV
|
|
CONFIG_POWERNV=y
|
|
CONFIG_IPMI=y
|
|
CONFIG_IPMI_LOCAL=y
|
|
CONFIG_IPMI_EXTERN=y
|
|
CONFIG_ISA_IPMI_BT=y
|
|
|
|
# For pSeries
|
|
CONFIG_PSERIES=y
|
|
CONFIG_VIRTIO_VGA=y
|
|
CONFIG_XICS=$(CONFIG_PSERIES)
|
|
CONFIG_XICS_SPAPR=$(CONFIG_PSERIES)
|
|
CONFIG_XICS_KVM=$(call land,$(CONFIG_PSERIES),$(CONFIG_KVM))
|
|
CONFIG_MEM_HOTPLUG=y
|