From nobody Fri May 3 01:08:09 2024 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 1548942951569181.0561002575456; Thu, 31 Jan 2019 05:55:51 -0800 (PST) Received: from localhost ([127.0.0.1]:55265 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpCoi-00038E-VA for importer@patchew.org; Thu, 31 Jan 2019 08:55:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59506) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpCmp-0001wW-6P for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:53:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpCmo-0006Qh-8c for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:53:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:9409) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpCmo-0006Px-1X; Thu, 31 Jan 2019 08:53:46 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E684EC07224D; Thu, 31 Jan 2019 13:53:44 +0000 (UTC) Received: from thuth.com (ovpn-116-123.ams2.redhat.com [10.36.116.123]) by smtp.corp.redhat.com (Postfix) with ESMTP id E7D611048134; Thu, 31 Jan 2019 13:53:42 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Date: Thu, 31 Jan 2019 14:53:26 +0100 Message-Id: <1548942810-22942-2-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> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 31 Jan 2019 13:53:45 +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] [PATCH v2 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: yang.zhong@intel.com, Paolo Bonzini , qemu-ppc@nongnu.org, David Gibson 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" 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. Signed-off-by: Thomas Huth --- default-configs/ppc64-softmmu.mak | 8 -------- hw/intc/Kconfig | 6 ++---- hw/mem/Kconfig | 1 + hw/ppc/Kconfig | 18 ++++++++++++++---- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-soft= mmu.mak index a0a9151..cca5266 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -5,14 +5,6 @@ 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..de10a6b 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 + depends on POWERNV || PSERIES =20 config XICS_SPAPR bool - default y - depends on PSERIES + select XICS =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..4dbf866 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -1,11 +1,23 @@ config PSERIES bool + select DIMM + select PCI + select VFIO + select XICS_SPAPR + select XIVE_SPAPR =20 config SPAPR_RNG bool + default y + depends on PSERIES =20 config POWERNV bool + select ISA_IPMI_BT + select ISA_BUS + select MC146818RTC + select XICS + select XIVE =20 config PPC405 bool @@ -45,16 +57,14 @@ config MAC_PMU =20 config XIVE bool - default y - depends on PSERIES + depends on POWERNV || PSERIES =20 config MACIO_GPIO bool =20 config XIVE_SPAPR bool - default y - depends on PSERIES + select XIVE =20 config CUDA bool --=20 1.8.3.1 From nobody Fri May 3 01:08:09 2024 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 1548942958820336.0070435360077; Thu, 31 Jan 2019 05:55:58 -0800 (PST) Received: from localhost ([127.0.0.1]:55268 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpCoq-0003Ds-Jh for importer@patchew.org; Thu, 31 Jan 2019 08:55:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59593) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpCmu-00021P-58 for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:53:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpCmt-0006Th-DP for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:53:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52210) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpCmt-0006TG-7c; Thu, 31 Jan 2019 08:53:51 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3A1F03D966; Thu, 31 Jan 2019 13:53:50 +0000 (UTC) Received: from thuth.com (ovpn-116-123.ams2.redhat.com [10.36.116.123]) by smtp.corp.redhat.com (Postfix) with ESMTP id 60A9F1048106; Thu, 31 Jan 2019 13:53:46 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Date: Thu, 31 Jan 2019 14:53:27 +0100 Message-Id: <1548942810-22942-3-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> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 31 Jan 2019 13:53:50 +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] [PATCH v2 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: yang.zhong@intel.com, Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , qemu-ppc@nongnu.org, David Gibson 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 Reviewed-by: Herv=C3=A9 Poussineau --- 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 4dbf866..b1c3a30 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -33,6 +33,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 May 3 01:08:09 2024 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 1548943270214363.2896899715972; Thu, 31 Jan 2019 06:01:10 -0800 (PST) Received: from localhost ([127.0.0.1]:55371 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpCtp-0007fw-2x for importer@patchew.org; Thu, 31 Jan 2019 09:01:01 -0500 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 Received: from mx1.redhat.com ([209.132.183.28]:53638) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpCmv-0006UY-Ow; Thu, 31 Jan 2019 08:53:55 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 763EE89AD1; Thu, 31 Jan 2019 13:53:52 +0000 (UTC) Received: from thuth.com (ovpn-116-123.ams2.redhat.com [10.36.116.123]) by smtp.corp.redhat.com (Postfix) with ESMTP id 92A141048106; Thu, 31 Jan 2019 13:53:50 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 31 Jan 2019 13:53:52 +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] [PATCH v2 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: yang.zhong@intel.com, Paolo Bonzini , Mark Cave-Ayland , qemu-ppc@nongnu.org, David Gibson 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 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=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..9b63f75 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -59,6 +59,12 @@ config MOS6522 =20 config MACIO bool + select CUDA + select ESCC + select IDE_MACIO + select MAC_DBDMA + select MAC_NVRAM + 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 b1c3a30..2956c86 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -47,9 +47,18 @@ 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 MACIO_GPIO + select MAC_PMU + select UNIN_PCI =20 config E500 bool --=20 1.8.3.1 From nobody Fri May 3 01:08:09 2024 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 1548943122356234.91248278394482; Thu, 31 Jan 2019 05:58:42 -0800 (PST) Received: from localhost ([127.0.0.1]:55301 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpCrU-0005l1-7w for importer@patchew.org; Thu, 31 Jan 2019 08:58:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59645) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpCmz-00025q-3V for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:53:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpCmx-0006Vc-PN for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:53:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36354) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpCmx-0006V8-J2; Thu, 31 Jan 2019 08:53:55 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4DB568EA2C; Thu, 31 Jan 2019 13:53:54 +0000 (UTC) Received: from thuth.com (ovpn-116-123.ams2.redhat.com [10.36.116.123]) by smtp.corp.redhat.com (Postfix) with ESMTP id D09681048106; Thu, 31 Jan 2019 13:53:52 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Date: Thu, 31 Jan 2019 14:53:29 +0100 Message-Id: <1548942810-22942-5-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> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 31 Jan 2019 13:53:54 +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] [PATCH v2 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: yang.zhong@intel.com, Paolo Bonzini , qemu-ppc@nongnu.org, David Gibson 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. Reviewed-by: BALATON Zoltan Reviewed-by: Paolo Bonzini Signed-off-by: Thomas Huth --- default-configs/ppc-softmmu.mak | 10 ---------- hw/display/Kconfig | 1 + hw/ppc/Kconfig | 10 ++++++++++ hw/usb/Kconfig | 2 +- 4 files changed, 12 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 2956c86..35e3704 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -27,9 +27,19 @@ config PPC440 =20 config PPC4XX bool + select BITBANG_I2C + select PCI =20 config SAM460EX bool + select PFLASH_CFI01 + select 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 May 3 01:08:09 2024 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 1548943396704263.06819469525954; Thu, 31 Jan 2019 06:03:16 -0800 (PST) Received: from localhost ([127.0.0.1]:55429 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpCvu-000102-MX for importer@patchew.org; Thu, 31 Jan 2019 09:03:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59707) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpCnA-0002E4-Ob for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:54:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpCn9-0006Yu-3c for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:54:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58846) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpCn7-0006Xe-8P; Thu, 31 Jan 2019 08:54:07 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8894481F09; Thu, 31 Jan 2019 13:54:01 +0000 (UTC) Received: from thuth.com (ovpn-116-123.ams2.redhat.com [10.36.116.123]) by smtp.corp.redhat.com (Postfix) with ESMTP id 97A251048122; Thu, 31 Jan 2019 13:53:54 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Date: Thu, 31 Jan 2019 14:53:30 +0100 Message-Id: <1548942810-22942-6-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> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 31 Jan 2019 13:54:01 +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] [PATCH v2 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: yang.zhong@intel.com, Paolo Bonzini , qemu-ppc@nongnu.org, David Gibson 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. Reviewed-by: Paolo Bonzini Signed-off-by: Thomas Huth --- default-configs/ppc-softmmu.mak | 18 ++++-------------- hw/nvram/Kconfig | 2 ++ hw/ppc/Kconfig | 12 ++++++++++++ 3 files changed, 18 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/nvram/Kconfig b/hw/nvram/Kconfig index 1f5ec95..4f44f9b 100644 --- a/hw/nvram/Kconfig +++ b/hw/nvram/Kconfig @@ -3,6 +3,8 @@ config DS1225Y =20 config AT24C bool + default y if E500 + depends on I2C =20 config MAC_NVRAM bool diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 35e3704..4085107 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -21,9 +21,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 @@ -72,9 +77,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