diff options
| -rw-r--r-- | default-configs/ppc-softmmu.mak | 15 | ||||
| -rw-r--r-- | hw/misc/Kconfig | 6 | ||||
| -rw-r--r-- | hw/net/Kconfig | 1 | ||||
| -rw-r--r-- | hw/pci-host/Kconfig | 4 | ||||
| -rw-r--r-- | hw/ppc/Kconfig | 15 |
5 files changed, 25 insertions, 16 deletions
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index 066cec9845..caaff60d9b 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -35,21 +35,6 @@ CONFIG_VGA_CIRRUS=y CONFIG_SMBUS_EEPROM=y # For Macs -CONFIG_ESCC=y -CONFIG_MACIO=y -CONFIG_MACIO_GPIO=y -CONFIG_SUNGEM=y -CONFIG_MOS6522=y -CONFIG_CUDA=y -CONFIG_ADB=y -CONFIG_MAC_NVRAM=y -CONFIG_MAC_DBDMA=y -CONFIG_MAC_PMU=y -CONFIG_HEATHROW_PIC=y -CONFIG_GRACKLE_PCI=y -CONFIG_UNIN_PCI=y -CONFIG_DEC_PCI=y -CONFIG_IDE_MACIO=y CONFIG_MAC_OLDWORLD=y CONFIG_MAC_NEWWORLD=y diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 2433d1b4e4..a012d2c94e 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -57,6 +57,12 @@ config MOS6522 config MACIO bool + select CUDA + select ESCC + select IDE_MACIO + select MAC_DBDMA + select MAC_NVRAM + select MOS6522 config IVSHMEM_DEVICE bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig index c562b69019..6b4633b464 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -86,6 +86,7 @@ config FTGMAC100 config SUNGEM bool + depends on PCI config COLDFIRE bool diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig index ff4080c78c..b39ea297ba 100644 --- a/hw/pci-host/Kconfig +++ b/hw/pci-host/Kconfig @@ -10,8 +10,10 @@ config GRACKLE_PCI bool config UNIN_PCI - select PCI bool + select PCI + select DEC_PCI + select OPENPIC config PPCE500_PCI select PCI diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 78b0d92eba..cb72f6c702 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -55,9 +55,24 @@ config RS6000_MC config MAC_OLDWORLD bool + imply PCI_DEVICES + imply SUNGEM + imply TEST_DEVICES + select ADB + select GRACKLE_PCI + select HEATHROW_PIC + select MACIO config MAC_NEWWORLD bool + imply PCI_DEVICES + imply SUNGEM + imply TEST_DEVICES + select ADB + select MACIO + select MACIO_GPIO + select MAC_PMU + select UNIN_PCI config E500 bool |