From patchwork Mon Jan 15 09:30:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10163357 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3244C601C0 for ; Mon, 15 Jan 2018 09:34:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A6451FFE6 for ; Mon, 15 Jan 2018 09:34:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1D3A9285BE; Mon, 15 Jan 2018 09:34:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9DB8B1FFE6 for ; Mon, 15 Jan 2018 09:34:45 +0000 (UTC) Received: from localhost ([::1]:50887 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb1AC-0001rW-Kh for patchwork-qemu-devel@patchwork.kernel.org; Mon, 15 Jan 2018 04:34:44 -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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 -include pci.mak -include sound.mak -include usb.mak -CONFIG_PPC4XX=y +# For embedded PPCs: +include ppcemb-softmmu.mak +CONFIG_E500=y +CONFIG_ETSEC=y +CONFIG_PLATFORM_BUS=y +CONFIG_PPCE500_PCI=y +CONFIG_OPENPIC_KVM=$(call land,$(CONFIG_E500),$(CONFIG_KVM)) + +# For Macs +CONFIG_MAC=y CONFIG_ESCC=y -CONFIG_M48T59=y -CONFIG_SERIAL=y -CONFIG_PARALLEL=y -CONFIG_I8254=y -CONFIG_PCKBD=y -CONFIG_FDC=y -CONFIG_I8257=y -CONFIG_I82374=y -CONFIG_OPENPIC=y -CONFIG_PREP_PCI=y -CONFIG_I82378=y -CONFIG_PC87312=y CONFIG_MACIO=y CONFIG_SUNGEM=y -CONFIG_PCSPK=y -CONFIG_CS4231A=y CONFIG_CUDA=y CONFIG_ADB=y CONFIG_MAC_NVRAM=y @@ -29,26 +21,23 @@ CONFIG_HEATHROW_PIC=y CONFIG_GRACKLE_PCI=y CONFIG_UNIN_PCI=y CONFIG_DEC_PCI=y -CONFIG_PPCE500_PCI=y -CONFIG_IDE_ISA=y -CONFIG_IDE_CMD646=y CONFIG_IDE_MACIO=y -CONFIG_NE2000_ISA=y -CONFIG_PFLASH_CFI01=y -CONFIG_PFLASH_CFI02=y -CONFIG_PTIMER=y -CONFIG_I8259=y -CONFIG_XILINX=y -CONFIG_XILINX_ETHLITE=y -CONFIG_PREP=y -CONFIG_MAC=y -CONFIG_E500=y -CONFIG_OPENPIC_KVM=$(call land,$(CONFIG_E500),$(CONFIG_KVM)) -CONFIG_PLATFORM_BUS=y -CONFIG_ETSEC=y -CONFIG_SM501=y + # For PReP +CONFIG_PREP=y +CONFIG_PREP_PCI=y CONFIG_SERIAL_ISA=y CONFIG_MC146818RTC=y CONFIG_ISA_TESTDEV=y CONFIG_RS6000_MC=y +CONFIG_PARALLEL=y +CONFIG_I82374=y +CONFIG_I82378=y +CONFIG_I8254=y +CONFIG_FDC=y +CONFIG_PCKBD=y +CONFIG_NE2000_ISA=y +CONFIG_PCSPK=y +CONFIG_PC87312=y +CONFIG_IDE_ISA=y +CONFIG_CS4231A=y