From nobody Fri May 3 15:25:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 151600875759832.84703144730179; Mon, 15 Jan 2018 01:32:37 -0800 (PST) Received: from localhost ([::1]:50822 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb186-0008UZ-Qd for importer@patchew.org; Mon, 15 Jan 2018 04:32:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb16e-0007h7-QI for qemu-devel@nongnu.org; Mon, 15 Jan 2018 04:31:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eb16d-0003XN-UN for qemu-devel@nongnu.org; Mon, 15 Jan 2018 04:31:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56892) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eb16d-0003Wp-PF; Mon, 15 Jan 2018 04:31:03 -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 D73CEC07012B; Mon, 15 Jan 2018 09:31:02 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-134.ams2.redhat.com [10.36.116.134]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7201760637; Mon, 15 Jan 2018 09:30:59 +0000 (UTC) From: Thomas Huth To: David Gibson , qemu-ppc@nongnu.org, qemu-devel@nongnu.org Date: Mon, 15 Jan 2018 10:30:54 +0100 Message-Id: <1516008655-31732-2-git-send-email-thuth@redhat.com> In-Reply-To: <1516008655-31732-1-git-send-email-thuth@redhat.com> References: <1516008655-31732-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.31]); Mon, 15 Jan 2018 09:31:02 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/2] default-configs/ppc64-softmmu: Include 32-bit configs instead of copying them 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" qemu-softmmu-ppc64 is supposed to be a superset of qemu-softmmu-ppc. However, instead of simply including the 32-bit config file, we've duplicated all CONFIG_xxx settings there instead. This way, we've missed some CONFIG switches in ppc64-softmmu.mak which were only added to the 32-bit config file (e.g. CONFIG_SUNGEM). Let's fix this problem by including the 32-bit config file into the 64-bit config file instead of duplicating all the CONFIG switches there. Signed-off-by: Thomas Huth --- default-configs/ppc64-softmmu.mak | 61 +++++------------------------------= ---- 1 file changed, 8 insertions(+), 53 deletions(-) diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-soft= mmu.mak index d1b3a6d..b94af6c 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -1,64 +1,19 @@ # Default configuration for ppc64-softmmu =20 -include pci.mak -include sound.mak -include usb.mak -CONFIG_PPC4XX=3Dy -CONFIG_VIRTIO_VGA=3Dy -CONFIG_ESCC=3Dy -CONFIG_M48T59=3Dy +# Include all 32-bit boards +include ppc-softmmu.mak + +# For PowerNV +CONFIG_POWERNV=3Dy CONFIG_IPMI=3Dy CONFIG_IPMI_LOCAL=3Dy CONFIG_IPMI_EXTERN=3Dy CONFIG_ISA_IPMI_BT=3Dy -CONFIG_SERIAL=3Dy -CONFIG_PARALLEL=3Dy -CONFIG_I8254=3Dy -CONFIG_PCKBD=3Dy -CONFIG_FDC=3Dy -CONFIG_I8257=3Dy -CONFIG_I82374=3Dy -CONFIG_OPENPIC=3Dy -CONFIG_PREP_PCI=3Dy -CONFIG_I82378=3Dy -CONFIG_PC87312=3Dy -CONFIG_MACIO=3Dy -CONFIG_PCSPK=3Dy -CONFIG_CUDA=3Dy -CONFIG_ADB=3Dy -CONFIG_MAC_NVRAM=3Dy -CONFIG_MAC_DBDMA=3Dy -CONFIG_HEATHROW_PIC=3Dy -CONFIG_GRACKLE_PCI=3Dy -CONFIG_UNIN_PCI=3Dy -CONFIG_DEC_PCI=3Dy -CONFIG_PPCE500_PCI=3Dy -CONFIG_IDE_ISA=3Dy -CONFIG_IDE_CMD646=3Dy -CONFIG_IDE_MACIO=3Dy -CONFIG_NE2000_ISA=3Dy -CONFIG_PFLASH_CFI01=3Dy -CONFIG_PFLASH_CFI02=3Dy -CONFIG_PTIMER=3Dy -CONFIG_I8259=3Dy -CONFIG_XILINX=3Dy -CONFIG_XILINX_ETHLITE=3Dy -CONFIG_PSERIES=3Dy -CONFIG_POWERNV=3Dy -CONFIG_PREP=3Dy -CONFIG_MAC=3Dy -CONFIG_E500=3Dy -CONFIG_OPENPIC_KVM=3D$(call land,$(CONFIG_E500),$(CONFIG_KVM)) -CONFIG_PLATFORM_BUS=3Dy -CONFIG_ETSEC=3Dy -CONFIG_SM501=3Dy + # For pSeries +CONFIG_PSERIES=3Dy +CONFIG_VIRTIO_VGA=3Dy CONFIG_XICS=3D$(CONFIG_PSERIES) CONFIG_XICS_SPAPR=3D$(CONFIG_PSERIES) CONFIG_XICS_KVM=3D$(call land,$(CONFIG_PSERIES),$(CONFIG_KVM)) -# For PReP -CONFIG_SERIAL_ISA=3Dy -CONFIG_MC146818RTC=3Dy -CONFIG_ISA_TESTDEV=3Dy CONFIG_MEM_HOTPLUG=3Dy -CONFIG_RS6000_MC=3Dy --=20 1.8.3.1 From nobody Fri May 3 15:25:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516008907850438.26024731839414; Mon, 15 Jan 2018 01:35:07 -0800 (PST) Received: from localhost ([::1]:50887 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb1AZ-0001rW-2n for importer@patchew.org; Mon, 15 Jan 2018 04:35:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36206) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb16m-0007nj-Q6 for qemu-devel@nongnu.org; Mon, 15 Jan 2018 04:31:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eb16g-0003Yn-EC for qemu-devel@nongnu.org; Mon, 15 Jan 2018 04:31:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60358) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eb16g-0003Y5-8M; Mon, 15 Jan 2018 04:31:06 -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 66182780EA; Mon, 15 Jan 2018 09:31:05 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-134.ams2.redhat.com [10.36.116.134]) by smtp.corp.redhat.com (Postfix) with ESMTP id 51EAA512CF; Mon, 15 Jan 2018 09:31:03 +0000 (UTC) From: Thomas Huth To: David Gibson , qemu-ppc@nongnu.org, qemu-devel@nongnu.org Date: Mon, 15 Jan 2018 10:30:55 +0100 Message-Id: <1516008655-31732-3-git-send-email-thuth@redhat.com> In-Reply-To: <1516008655-31732-1-git-send-email-thuth@redhat.com> References: <1516008655-31732-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]); Mon, 15 Jan 2018 09:31:05 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/2] default-configs/ppc-softmmu: Restructure the switches according to the machines 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Order the CONFIG switches in ppc-softmmu.mak according to the machine classes where they are used (embedded, Mac or PReP), so that it is easier for the users to disable a set of switches completely if they are not needed. For the embedded part, we now also include ppcemb-softmmu.mak instead of duplicating all the CONFIG switches again, to make sure that the ppc-softmmu build always contains all switches from ppcemb-softmmu (e.g. the switch CONFIG_IDE_SII3112 from ppcemb was missing in ppc-softmmu). While we're at it, also remove the CONFIG_IDE_CMD646 since this controller does not seem to be used by any ppc machine in QEMU. Signed-off-by: Thomas Huth --- default-configs/ppc-softmmu.mak | 59 +++++++++++++++++--------------------= ---- 1 file changed, 24 insertions(+), 35 deletions(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index bb225c6..460e6f4 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -1,26 +1,18 @@ # Default configuration for ppc-softmmu =20 -include pci.mak -include sound.mak -include usb.mak -CONFIG_PPC4XX=3Dy +# For embedded PPCs: +include ppcemb-softmmu.mak +CONFIG_E500=3Dy +CONFIG_ETSEC=3Dy +CONFIG_PLATFORM_BUS=3Dy +CONFIG_PPCE500_PCI=3Dy +CONFIG_OPENPIC_KVM=3D$(call land,$(CONFIG_E500),$(CONFIG_KVM)) + +# For Macs +CONFIG_MAC=3Dy CONFIG_ESCC=3Dy -CONFIG_M48T59=3Dy -CONFIG_SERIAL=3Dy -CONFIG_PARALLEL=3Dy -CONFIG_I8254=3Dy -CONFIG_PCKBD=3Dy -CONFIG_FDC=3Dy -CONFIG_I8257=3Dy -CONFIG_I82374=3Dy -CONFIG_OPENPIC=3Dy -CONFIG_PREP_PCI=3Dy -CONFIG_I82378=3Dy -CONFIG_PC87312=3Dy CONFIG_MACIO=3Dy CONFIG_SUNGEM=3Dy -CONFIG_PCSPK=3Dy -CONFIG_CS4231A=3Dy CONFIG_CUDA=3Dy CONFIG_ADB=3Dy CONFIG_MAC_NVRAM=3Dy @@ -29,26 +21,23 @@ CONFIG_HEATHROW_PIC=3Dy CONFIG_GRACKLE_PCI=3Dy CONFIG_UNIN_PCI=3Dy CONFIG_DEC_PCI=3Dy -CONFIG_PPCE500_PCI=3Dy -CONFIG_IDE_ISA=3Dy -CONFIG_IDE_CMD646=3Dy CONFIG_IDE_MACIO=3Dy -CONFIG_NE2000_ISA=3Dy -CONFIG_PFLASH_CFI01=3Dy -CONFIG_PFLASH_CFI02=3Dy -CONFIG_PTIMER=3Dy -CONFIG_I8259=3Dy -CONFIG_XILINX=3Dy -CONFIG_XILINX_ETHLITE=3Dy -CONFIG_PREP=3Dy -CONFIG_MAC=3Dy -CONFIG_E500=3Dy -CONFIG_OPENPIC_KVM=3D$(call land,$(CONFIG_E500),$(CONFIG_KVM)) -CONFIG_PLATFORM_BUS=3Dy -CONFIG_ETSEC=3Dy -CONFIG_SM501=3Dy + # For PReP +CONFIG_PREP=3Dy +CONFIG_PREP_PCI=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_MC146818RTC=3Dy CONFIG_ISA_TESTDEV=3Dy CONFIG_RS6000_MC=3Dy +CONFIG_PARALLEL=3Dy +CONFIG_I82374=3Dy +CONFIG_I82378=3Dy +CONFIG_I8254=3Dy +CONFIG_FDC=3Dy +CONFIG_PCKBD=3Dy +CONFIG_NE2000_ISA=3Dy +CONFIG_PCSPK=3Dy +CONFIG_PC87312=3Dy +CONFIG_IDE_ISA=3Dy +CONFIG_CS4231A=3Dy --=20 1.8.3.1