aboutsummaryrefslogtreecommitdiff
path: root/default-configs/ppc-softmmu.mak
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-01-23 10:58:02 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2012-01-23 10:58:02 -0600
commitc4ccbeaca521bdbf5cb8db37dc67c47e1add0586 (patch)
tree110cb400e402af772a78495ce58d4715f617e0f4 /default-configs/ppc-softmmu.mak
parent65f82df0d7a71ce1b10cd4c5ab08888d176ac840 (diff)
parent506b7ddf889312659b36c667f7ae17bc9e909418 (diff)
Merge remote-tracking branch 'afaerber/prep-up' into staging
* afaerber/prep-up: prep: Use i82378 PCI->ISA bridge for 'prep' machine prep: Add i82378 PCI-to-ISA bridge emulation prep: Add i82374 DMA emulation MAINTAINERS: Add PCI host bridge files to PReP machine prep: qdev'ify Raven host bridge (SysBus) prep_pci: Update I/O to MemoryRegion ops prep_pci: Simplify I/O endianness prep: qdev'ify Raven host bridge (PCIDevice) prep: Use ISA m48t59 prep: Fix offset of BIOS MemoryRegion
Diffstat (limited to 'default-configs/ppc-softmmu.mak')
-rw-r--r--default-configs/ppc-softmmu.mak3
1 files changed, 3 insertions, 0 deletions
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index 3277291c75..1a768fc519 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -12,9 +12,12 @@ CONFIG_I8254=y
CONFIG_PCKBD=y
CONFIG_FDC=y
CONFIG_DMA=y
+CONFIG_I82374=y
CONFIG_OPENPIC=y
CONFIG_PREP_PCI=y
+CONFIG_I82378=y
CONFIG_MACIO=y
+CONFIG_PCSPK=y
CONFIG_CUDA=y
CONFIG_ADB=y
CONFIG_MAC_NVRAM=y