From nobody Fri Nov 7 18:33:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548841516436778.89448905083; Wed, 30 Jan 2019 01:45:16 -0800 (PST) Received: from localhost ([127.0.0.1]:34921 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gomQf-0002vs-EI for importer@patchew.org; Wed, 30 Jan 2019 04:45:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44126) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gomP9-00021K-Bj for qemu-devel@nongnu.org; Wed, 30 Jan 2019 04:43:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gomP7-0004LB-3Q for qemu-devel@nongnu.org; Wed, 30 Jan 2019 04:43:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35270) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gomP5-0004Ex-Ne; Wed, 30 Jan 2019 04:43:32 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 84D739F749; Wed, 30 Jan 2019 09:43:14 +0000 (UTC) Received: from thuth.com (ovpn-116-210.ams2.redhat.com [10.36.116.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id D2132600CC; Wed, 30 Jan 2019 09:43:12 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, yang.zhong@intel.com Date: Wed, 30 Jan 2019 10:43:03 +0100 Message-Id: <1548841387-7670-2-git-send-email-thuth@redhat.com> In-Reply-To: <1548841387-7670-1-git-send-email-thuth@redhat.com> References: <3f01a301-d639-dbe7-f522-42a50e2d443e@redhat.com> <1548841387-7670-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 30 Jan 2019 09:43:14 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC PATCH 1/5] ppc64: Express dependencies of 'pseries' and 'powernv' machines with kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The POWERNV switch should always select ISA_IPMI_BT, then the other IPMI options are turned on automatically now. CONFIG_DIMM should always be selected by the pseries machine, which in turn depends on CONFIG_MEM_DEVICE since DIMM implements this interface. CONFIG_VIRTIO_VGA can be dropped from default-configs/ppc64-softmmu.mak completely since this device is already automatically enabled via hw/display/Kconfig now. CONFIG_SPAPR_RNG should stay in the ppc-softmmu.mak file since this is a completely optional device. Cc: C=C3=A9dric Le Goater Signed-off-by: Thomas Huth --- default-configs/ppc64-softmmu.mak | 7 ------- hw/intc/Kconfig | 4 +--- hw/mem/Kconfig | 1 + hw/ppc/Kconfig | 9 +++++++++ 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-soft= mmu.mak index a0a9151..6f8d7ea 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -5,14 +5,7 @@ include ppc-softmmu.mak =20 # For PowerNV CONFIG_POWERNV=3Dy -CONFIG_IPMI=3Dy -CONFIG_IPMI_LOCAL=3Dy -CONFIG_IPMI_EXTERN=3Dy -CONFIG_ISA_IPMI_BT=3Dy =20 # For pSeries CONFIG_PSERIES=3Dy -CONFIG_VIRTIO_VGA=3Dy -CONFIG_MEM_DEVICE=3Dy -CONFIG_DIMM=3Dy CONFIG_SPAPR_RNG=3Dy diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index 6eea14e..1e819d0 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -31,13 +31,11 @@ config OPENPIC_KVM =20 config XICS bool - default y - depends on PSERIES =20 config XICS_SPAPR bool default y - depends on PSERIES + depends on XICS && PSERIES =20 config XICS_KVM bool diff --git a/hw/mem/Kconfig b/hw/mem/Kconfig index d1e635c..620fd4c 100644 --- a/hw/mem/Kconfig +++ b/hw/mem/Kconfig @@ -1,5 +1,6 @@ config DIMM bool + select MEM_DEVICE =20 config MEM_DEVICE bool diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index b0095e1..b44e3bd 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -1,11 +1,20 @@ config PSERIES bool + select DIMM + select PCI + select VFIO + select XICS =20 config SPAPR_RNG bool + depends on PSERIES =20 config POWERNV bool + select ISA_IPMI_BT + select ISA_BUS + select MC146818RTC + select XICS =20 config PPC405 bool --=20 1.8.3.1 From nobody Fri Nov 7 18:33:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548841542802556.5610116300536; Wed, 30 Jan 2019 01:45:42 -0800 (PST) Received: from localhost ([127.0.0.1]:34951 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gomRB-0003I6-Pn for importer@patchew.org; Wed, 30 Jan 2019 04:45:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44222) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gomPP-0002B6-E7 for qemu-devel@nongnu.org; Wed, 30 Jan 2019 04:43:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gomPN-0004Yq-J4 for qemu-devel@nongnu.org; Wed, 30 Jan 2019 04:43:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38792) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gomPN-0004FM-D4; Wed, 30 Jan 2019 04:43:49 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8652D8553D; Wed, 30 Jan 2019 09:43:16 +0000 (UTC) Received: from thuth.com (ovpn-116-210.ams2.redhat.com [10.36.116.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id D43BF18A32; Wed, 30 Jan 2019 09:43:14 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, yang.zhong@intel.com Date: Wed, 30 Jan 2019 10:43:04 +0100 Message-Id: <1548841387-7670-3-git-send-email-thuth@redhat.com> In-Reply-To: <1548841387-7670-1-git-send-email-thuth@redhat.com> References: <3f01a301-d639-dbe7-f522-42a50e2d443e@redhat.com> <1548841387-7670-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 30 Jan 2019 09:43:16 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC PATCH 2/5] ppc: Express dependencies of the 'prep' and '40p' machines with kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, qemu-ppc@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Select the required devices in hw/ppc/Kconfig instead, so that ppc-softmmu.mak only contains the user-selectable PREP switch. Plug-in devices like NE2000_ISA are pulled in automatically by the Kconfig build system now. Cc: Herv=C3=A9 Poussineau Signed-off-by: Thomas Huth --- default-configs/ppc-softmmu.mak | 8 -------- hw/ppc/Kconfig | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 05ba726..422f1b7 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -57,11 +57,3 @@ CONFIG_MAC_NEWWORLD=3Dy =20 # For PReP CONFIG_PREP=3Dy -CONFIG_PREP_PCI=3Dy -CONFIG_RS6000_MC=3Dy -CONFIG_I82374=3Dy -CONFIG_I82378=3Dy -CONFIG_PCKBD=3Dy -CONFIG_NE2000_ISA=3Dy -CONFIG_PC87312=3Dy -CONFIG_CS4231A=3Dy diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index b44e3bd..809830e 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -30,6 +30,14 @@ config SAM460EX =20 config PREP bool + select CS4231A + select PREP_PCI + select I82374 + select I82378 + select LSI_SCSI_PCI + select M48T59 + select PC87312 + select RS6000_MC =20 config RS6000_MC bool --=20 1.8.3.1 From nobody Fri Nov 7 18:33:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548841554745576.5737717878023; Wed, 30 Jan 2019 01:45:54 -0800 (PST) Received: from localhost ([127.0.0.1]:34953 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gomRI-0003JR-Nb for importer@patchew.org; Wed, 30 Jan 2019 04:45:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44224) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gomPP-0002B8-FH for qemu-devel@nongnu.org; Wed, 30 Jan 2019 04:43:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gomPN-0004ZA-PO for qemu-devel@nongnu.org; Wed, 30 Jan 2019 04:43:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38816) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gomPN-0004Fr-Hq; Wed, 30 Jan 2019 04:43:49 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A02A580462; Wed, 30 Jan 2019 09:43:18 +0000 (UTC) Received: from thuth.com (ovpn-116-210.ams2.redhat.com [10.36.116.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF4FF600CC; Wed, 30 Jan 2019 09:43:16 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, yang.zhong@intel.com Date: Wed, 30 Jan 2019 10:43:05 +0100 Message-Id: <1548841387-7670-4-git-send-email-thuth@redhat.com> In-Reply-To: <1548841387-7670-1-git-send-email-thuth@redhat.com> References: <3f01a301-d639-dbe7-f522-42a50e2d443e@redhat.com> <1548841387-7670-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 30 Jan 2019 09:43:18 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC PATCH 3/5] ppc: Express dependencies of the Mac machines with kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, Mark Cave-Ayland , qemu-ppc@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: Thomas Huth Reviewed-by: Paolo Bonzini --- default-configs/ppc-softmmu.mak | 15 --------------- hw/misc/Kconfig | 8 ++++++++ hw/net/Kconfig | 2 ++ hw/pci-host/Kconfig | 4 +++- hw/ppc/Kconfig | 7 +++++++ 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=3Dy CONFIG_SMBUS_EEPROM=3Dy =20 # For Macs -CONFIG_ESCC=3Dy -CONFIG_MACIO=3Dy -CONFIG_MACIO_GPIO=3Dy -CONFIG_SUNGEM=3Dy -CONFIG_MOS6522=3Dy -CONFIG_CUDA=3Dy -CONFIG_ADB=3Dy -CONFIG_MAC_NVRAM=3Dy -CONFIG_MAC_DBDMA=3Dy -CONFIG_MAC_PMU=3Dy -CONFIG_HEATHROW_PIC=3Dy -CONFIG_GRACKLE_PCI=3Dy -CONFIG_UNIN_PCI=3Dy -CONFIG_DEC_PCI=3Dy -CONFIG_IDE_MACIO=3Dy CONFIG_MAC_OLDWORLD=3Dy CONFIG_MAC_NEWWORLD=3Dy =20 diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 3ebe30f..f392502 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -59,6 +59,14 @@ config MOS6522 =20 config MACIO bool + select CUDA + select ESCC + select IDE_MACIO + select MACIO_GPIO + select MAC_DBDMA + select MAC_NVRAM + select MAC_PMU + select MOS6522 =20 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 =20 config SUNGEM bool + default y if (MAC_OLDWORLD || MAC_NEWWORLD) + depends on PCI =20 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 =20 config UNIN_PCI - select PCI bool + select PCI + select DEC_PCI + select OPENPIC =20 config PPCE500_PCI select PCI diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 809830e..f6b4206 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -44,9 +44,16 @@ config RS6000_MC =20 config MAC_OLDWORLD bool + select ADB + select GRACKLE_PCI + select HEATHROW_PIC + select MACIO =20 config MAC_NEWWORLD bool + select ADB + select MACIO + select UNIN_PCI =20 config E500 bool --=20 1.8.3.1 From nobody Fri Nov 7 18:33:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548841850361995.5976467727253; Wed, 30 Jan 2019 01:50:50 -0800 (PST) Received: from localhost ([127.0.0.1]:35030 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gomW1-0006mV-E7 for importer@patchew.org; Wed, 30 Jan 2019 04:50:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gomPR-0002E8-C9 for qemu-devel@nongnu.org; Wed, 30 Jan 2019 04:43:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gomPP-0004ao-Fr for qemu-devel@nongnu.org; Wed, 30 Jan 2019 04:43:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40280) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gomPN-0004IM-PX; Wed, 30 Jan 2019 04:43:51 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9A65880511; Wed, 30 Jan 2019 09:43:22 +0000 (UTC) Received: from thuth.com (ovpn-116-210.ams2.redhat.com [10.36.116.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id EB9A4600CC; Wed, 30 Jan 2019 09:43:18 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, yang.zhong@intel.com Date: Wed, 30 Jan 2019 10:43:06 +0100 Message-Id: <1548841387-7670-5-git-send-email-thuth@redhat.com> In-Reply-To: <1548841387-7670-1-git-send-email-thuth@redhat.com> References: <3f01a301-d639-dbe7-f522-42a50e2d443e@redhat.com> <1548841387-7670-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 30 Jan 2019 09:43:22 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC PATCH 4/5] ppc: Express dependencies of the Sam460EX machines with kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, qemu-ppc@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Most of the dependencies are now directly selected by the SAM460EX switch. We can drop CONFIG_VGA_CIRRUS since this device is already selected automatically when CONFIG_PCI_DEVICES is set. Cc: BALATON Zoltan Signed-off-by: Thomas Huth Reviewed-by: BALATON Zoltan Reviewed-by: Paolo Bonzini --- default-configs/ppc-softmmu.mak | 10 ---------- hw/display/Kconfig | 1 + hw/ppc/Kconfig | 12 ++++++++++++ hw/usb/Kconfig | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 513a8e9..5265d8a 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -25,16 +25,6 @@ CONFIG_PCI_EXPRESS=3Dy =20 # For Sam460ex CONFIG_SAM460EX=3Dy -CONFIG_USB_EHCI_SYSBUS=3Dy -CONFIG_SM501=3Dy -CONFIG_DDC=3Dy -CONFIG_IDE_SII3112=3Dy -CONFIG_I2C=3Dy -CONFIG_AT24C=3Dy -CONFIG_BITBANG_I2C=3Dy -CONFIG_M41T80=3Dy -CONFIG_VGA_CIRRUS=3Dy -CONFIG_SMBUS_EEPROM=3Dy =20 # For Macs CONFIG_MAC_OLDWORLD=3Dy diff --git a/hw/display/Kconfig b/hw/display/Kconfig index c784fe8..f8e6136 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -76,6 +76,7 @@ config MILKYMIST_TMU2 config SM501 bool depends on I2C + select DDC =20 config TCX bool diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index f6b4206..8bd25ed 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -24,9 +24,21 @@ config PPC440 =20 config PPC4XX bool + select BITBANG_I2C + select PCI =20 config SAM460EX bool + select AT24C + select PFLASH_CFI01 + select IDE_SII3112 + select ISA_BUS # FIXME: Currently required for IDE_SII3112 + select M41T80 + select PPC440 + select SM501 + select SMBUS_EEPROM + select USB_EHCI_SYSBUS + select USB_OHCI =20 config PREP bool diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index a1b7acb..871ea47 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -21,7 +21,7 @@ config USB_EHCI =20 config USB_EHCI_SYSBUS bool - select USB + select USB_EHCI =20 config USB_XHCI bool --=20 1.8.3.1 From nobody Fri Nov 7 18:33:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548841682664806.8829305659747; Wed, 30 Jan 2019 01:48:02 -0800 (PST) Received: from localhost ([127.0.0.1]:34979 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gomTM-0004kl-GJ for importer@patchew.org; Wed, 30 Jan 2019 04:47:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44181) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gomPN-00029Q-9G for qemu-devel@nongnu.org; Wed, 30 Jan 2019 04:43:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gomPL-0004Wf-HJ for qemu-devel@nongnu.org; Wed, 30 Jan 2019 04:43:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38346) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gomPK-0004Iu-3T; Wed, 30 Jan 2019 04:43:46 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6ADA813268A; Wed, 30 Jan 2019 09:43:24 +0000 (UTC) Received: from thuth.com (ovpn-116-210.ams2.redhat.com [10.36.116.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id E9362600CC; Wed, 30 Jan 2019 09:43:22 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, yang.zhong@intel.com Date: Wed, 30 Jan 2019 10:43:07 +0100 Message-Id: <1548841387-7670-6-git-send-email-thuth@redhat.com> In-Reply-To: <1548841387-7670-1-git-send-email-thuth@redhat.com> References: <3f01a301-d639-dbe7-f522-42a50e2d443e@redhat.com> <1548841387-7670-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 30 Jan 2019 09:43:24 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC PATCH 5/5] ppc: Express dependencies of the embedded machines with kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, qemu-ppc@nongnu.org, "Edgar E. Iglesias" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This makes it much easier if the users want to disable some of the embedded machines for their builds. Cc: Edgar E. Iglesias Signed-off-by: Thomas Huth Reviewed-by: Paolo Bonzini --- default-configs/ppc-softmmu.mak | 18 ++++-------------- hw/ppc/Kconfig | 12 ++++++++++++ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 5265d8a..5192aca 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -1,27 +1,17 @@ # Default configuration for ppc-softmmu =20 -CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy -CONFIG_ISA_BUS=3Dy CONFIG_TEST_DEVICES=3Dy =20 -# For embedded PPCs: -CONFIG_PPC4XX=3Dy -CONFIG_M48T59=3Dy +# FIXME: CONFIG_SERIAL is currently still required to link all of the +# ppc machines (due to the usage of serial_mm_init() in ppc405_uc.c). CONFIG_SERIAL=3Dy -CONFIG_OPENPIC=3Dy -CONFIG_PPCE500_PCI=3Dy -CONFIG_PFLASH_CFI01=3Dy -CONFIG_PFLASH_CFI02=3Dy -CONFIG_XILINX=3Dy -CONFIG_XILINX_ETHLITE=3Dy + +# For embedded PPCs: CONFIG_E500=3Dy -CONFIG_PLATFORM_BUS=3Dy -CONFIG_ETSEC=3Dy CONFIG_PPC405=3Dy CONFIG_PPC440=3Dy CONFIG_VIRTEX=3Dy -CONFIG_PCI_EXPRESS=3Dy =20 # For Sam460ex CONFIG_SAM460EX=3Dy diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 8bd25ed..ab9b828 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -18,9 +18,14 @@ config POWERNV =20 config PPC405 bool + select M48T59 + select PFLASH_CFI02 + select PPC4XX =20 config PPC440 bool + select PCI_EXPRESS + select PPC4XX =20 config PPC4XX bool @@ -69,9 +74,16 @@ config MAC_NEWWORLD =20 config E500 bool + select ETSEC + select OPENPIC + select PLATFORM_BUS + select PPCE500_PCI =20 config VIRTEX bool + select PFLASH_CFI01 + select XILINX + select XILINX_ETHLITE =20 config MAC_DBDMA bool --=20 1.8.3.1