From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:59644) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpCmz-00025p-3V for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:53:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpCmx-0006VV-Mp for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:53:57 -0500 From: Thomas Huth Date: Thu, 31 Jan 2019 14:53:28 +0100 Message-Id: <1548942810-22942-4-git-send-email-thuth@redhat.com> In-Reply-To: <1548942810-22942-1-git-send-email-thuth@redhat.com> References: <1548942810-22942-1-git-send-email-thuth@redhat.com> Subject: [Qemu-devel] [PATCH v2 3/5] ppc: Express dependencies of the Mac machines with kconfig List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: David Gibson , qemu-ppc@nongnu.org, Paolo Bonzini , yang.zhong@intel.com, Mark Cave-Ayland This will make it for example easier if the users want to disable one of the two machines for their builds. Cc: Mark Cave-Ayland Reviewed-by: Paolo Bonzini Signed-off-by: Thomas Huth --- default-configs/ppc-softmmu.mak | 15 --------------- hw/misc/Kconfig | 6 ++++++ hw/net/Kconfig | 2 ++ hw/pci-host/Kconfig | 4 +++- hw/ppc/Kconfig | 9 +++++++++ 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index 422f1b7..513a8e9 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -37,21 +37,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 3ebe30f..9b63f75 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -59,6 +59,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 47368d7..9047f6d 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -85,6 +85,8 @@ config FTGMAC100 config SUNGEM bool + default y if (MAC_OLDWORLD || MAC_NEWWORLD) + depends on PCI config COLDFIRE bool diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig index ff4080c..b39ea29 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 b1c3a30..2956c86 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -47,9 +47,18 @@ config RS6000_MC config MAC_OLDWORLD bool + select ADB + select GRACKLE_PCI + select HEATHROW_PIC + select MACIO config MAC_NEWWORLD bool + select ADB + select MACIO + select MACIO_GPIO + select MAC_PMU + select UNIN_PCI config E500 bool -- 1.8.3.1