Merge remote-tracking branch 'sstabellini/tags/xen-20161108-tag' into staging

[qemu.git] / default-configs / ppc-softmmu.mak

diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index c209a8da65b17bbd04cc8f6fe80d25a8226e5500..d4d0f9b1925b0c49bca95ed24f63b17586071087 100644 (file)
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -1,19 +1,16 @@
 # Default configuration for ppc-softmmu
 
 include pci.mak
+include sound.mak
 include usb.mak
-CONFIG_GDBSTUB_XML=y
-CONFIG_ISA_MMIO=y
 CONFIG_ESCC=y
 CONFIG_M48T59=y
-CONFIG_VGA=y
-CONFIG_VGA_PCI=y
 CONFIG_SERIAL=y
 CONFIG_PARALLEL=y
 CONFIG_I8254=y
 CONFIG_PCKBD=y
 CONFIG_FDC=y
-CONFIG_DMA=y
+CONFIG_I8257=y
 CONFIG_I82374=y
 CONFIG_OPENPIC=y
 CONFIG_PREP_PCI=y
@@ -34,10 +31,19 @@ CONFIG_IDE_ISA=y
 CONFIG_IDE_CMD646=y
 CONFIG_IDE_MACIO=y
 CONFIG_NE2000_ISA=y
-CONFIG_SOUND=y
 CONFIG_PFLASH_CFI01=y
 CONFIG_PFLASH_CFI02=y
 CONFIG_PTIMER=y
 CONFIG_I8259=y
 CONFIG_XILINX=y
-CONFIG_E500=$(CONFIG_FDT)
+CONFIG_XILINX_ETHLITE=y
+CONFIG_PREP=y
+CONFIG_MAC=y
+CONFIG_E500=y
+CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))
+CONFIG_PLATFORM_BUS=y
+CONFIG_ETSEC=y
+CONFIG_LIBDECNUMBER=y
+# For PReP
+CONFIG_MC146818RTC=y
+CONFIG_ISA_TESTDEV=y