s390/ipl: fix ipl with -no-reboot

[mirror_qemu.git] / default-configs / ppc64-softmmu.mak

diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index 065235737dd0a436f82f57e4dc5aa54c05bfc1b2..b94af6c7c62aee9ed514d97ba8ff7057471203fa 100644 (file)
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -1,14 +1,19 @@
 # Default configuration for ppc64-softmmu
 
-CONFIG_GDBSTUB_XML=y
-CONFIG_USB_OHCI=y
-CONFIG_ISA_MMIO=y
-CONFIG_ESCC=y
-CONFIG_M48T59=y
-CONFIG_VGA_PCI=y
-CONFIG_I8254=y
-CONFIG_FDC=y
-CONFIG_IDE_QDEV=y
-CONFIG_IDE_PCI=y
-CONFIG_IDE_ISA=y
-CONFIG_IDE_CMD646=y
+# 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