From nobody Mon Feb 9 22:04:29 2026 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; dkim=fail; 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 1516512998405466.01968730330634; Sat, 20 Jan 2018 21:36:38 -0800 (PST) Received: from localhost ([::1]:34438 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ed8Iu-0001tf-0U for importer@patchew.org; Sun, 21 Jan 2018 00:36:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35989) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ed8Gd-0000Xx-9l for qemu-devel@nongnu.org; Sun, 21 Jan 2018 00:34:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ed8Gc-0007Hz-9s for qemu-devel@nongnu.org; Sun, 21 Jan 2018 00:34:07 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:53473) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ed8Gb-0007Bo-HL; Sun, 21 Jan 2018 00:34:06 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3zPNXN5Sh4z9t39; Sun, 21 Jan 2018 16:33:56 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1516512836; bh=FqF3U1xajrS8BBIhXzpf35w9Xf+7G/CK7uMMstDA/IU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H23oi//XsyVKl5eKI1O12jlqbRF2BBeFlt4bb7qRUFM5r8zPvacftyzqQFVct8Lz7 VcB/WkRx6glFNPVPI4+lsxdVaPKi2YncTJyFk9iHLHCOytR+CW1bELBpgOCaWHSZZZ En4JRcwFcI69hTXALatBiQ/y9MjK69JfA4RkoK5w= From: David Gibson To: peter.maydell@linaro.org Date: Sun, 21 Jan 2018 16:33:42 +1100 Message-Id: <20180121053353.25970-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180121053353.25970-1-david@gibson.dropbear.id.au> References: <20180121053353.25970-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 01/12] 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: lvivier@redhat.com, Thomas Huth , surajjs@au1.ibm.com, groug@kaod.org, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Thomas Huth 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 Signed-off-by: David Gibson --- 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 d1b3a6dd50..b94af6c7c6 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 2.14.3