From nobody Tue Oct 28 01:50:40 2025 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516105099572518.5101270432466; Tue, 16 Jan 2018 04:18:19 -0800 (PST) Received: from localhost ([::1]:60390 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebQBs-0004e3-Dx for importer@patchew.org; Tue, 16 Jan 2018 07:18:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43609) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebQA0-0003fs-52 for qemu-devel@nongnu.org; Tue, 16 Jan 2018 07:16:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebQ9w-0002oE-9M for qemu-devel@nongnu.org; Tue, 16 Jan 2018 07:16:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35870) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ebQ9w-0002nr-3K; Tue, 16 Jan 2018 07:16:08 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3C31A85542; Tue, 16 Jan 2018 12:16:07 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-73.ams2.redhat.com [10.36.116.73]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2EB4A60851; Tue, 16 Jan 2018 12:16:03 +0000 (UTC) From: Thomas Huth To: David Gibson , qemu-ppc@nongnu.org, qemu-devel@nongnu.org Date: Tue, 16 Jan 2018 13:15:55 +0100 Message-Id: <1516104958-3881-2-git-send-email-thuth@redhat.com> In-Reply-To: <1516104958-3881-1-git-send-email-thuth@redhat.com> References: <1516104958-3881-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 16 Jan 2018 12:16:07 +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 v2 1/4] 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: , Cc: Alexander Graf 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