From nobody Mon Feb 9 18:45:52 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516513180562929.5098110118122; Sat, 20 Jan 2018 21:39:40 -0800 (PST) Received: from localhost ([::1]:34454 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ed8Lz-0004Ib-P6 for importer@patchew.org; Sun, 21 Jan 2018 00:39:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35988) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ed8Gd-0000Xy-9k 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-0007Hs-9U for qemu-devel@nongnu.org; Sun, 21 Jan 2018 00:34:07 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:33051) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ed8Gb-0007Bn-HG; Sun, 21 Jan 2018 00:34:06 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3zPNXN6nNQz9t1t; 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=suHoNOwG6qzzjBrDnFcD6m8Ox7G2s2m6Mt7SUK1IoKk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n7UzfDSArkLD/ZMzDZ62SZroRA4VaKgdH/1UJ+oqdLnr/1xin0g1EJhG8E6ba1QY6 BAUTO2H+WRRJEeIqk0w4NdnyQewp+J3IZN5pYSZ5oyF9NNKqxcPtVS6B9Wyn+Jgbfe UFe2c9PdSm+Nk6HRUZRqBDCIJHTmjkyOSYq2tX/U= From: David Gibson To: peter.maydell@linaro.org Date: Sun, 21 Jan 2018 16:33:43 +1100 Message-Id: <20180121053353.25970-3-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 02/12] 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: , 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 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. Also add the missing CONFIG_IDE_SII3112 switch to the embedded section which was previously only added to ppcemb-softmmu.mak. And while we're at it, also remove the CONFIG_IDE_CMD646 switch since this controller does not seem to be used by any ppc machine in QEMU. Signed-off-by: Thomas Huth Signed-off-by: David Gibson --- default-configs/ppc-softmmu.mak | 59 ++++++++++++++++++++++---------------= ---- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index bb225c6e46..3baed6a8fd 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -3,52 +3,57 @@ include pci.mak include sound.mak include usb.mak + +# For embedded PPCs: CONFIG_PPC4XX=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 -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_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 +CONFIG_IDE_SII3112=3Dy + +# For Macs +CONFIG_MAC=3Dy +CONFIG_ESCC=3Dy +CONFIG_MACIO=3Dy +CONFIG_SUNGEM=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_IDE_MACIO=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_PCKBD=3Dy +CONFIG_FDC=3Dy +CONFIG_NE2000_ISA=3Dy +CONFIG_PC87312=3Dy +CONFIG_PCSPK=3Dy +CONFIG_IDE_ISA=3Dy +CONFIG_CS4231A=3Dy --=20 2.14.3