From patchwork Sat Feb 2 07:24:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794143 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BB65313B4 for ; Sat, 2 Feb 2019 07:26:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9FA5332811 for ; Sat, 2 Feb 2019 07:26:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 93A0C32B24; Sat, 2 Feb 2019 07:26:20 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8C47332811 for ; Sat, 2 Feb 2019 07:26:19 +0000 (UTC) Received: from localhost ([127.0.0.1]:38562 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppgw-0001bZ-42 for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:26:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50003) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppfb-0000IQ-5h for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:24:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gppfa-0002OJ-Cw for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:24:55 -0500 Received: from mga14.intel.com ([192.55.52.115]:56071) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gppfa-0002MY-2N for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:24:54 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:24:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828583" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:24:51 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:30 +0800 Message-Id: <20190202072456.6468-2-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 01/27] arm: disable CONFIG_SERIAL_ISA 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Paolo Bonzini ARM should not have an ISA bus, this device should not be enabled. Kconfig allows to clean up the dependencies and remove CONFIG_ISA_BUS=y from ARM, and then catches a contradiction between the hardcoded CONFIG_SERIAL_ISA=y and CONFIG_ISA_BUS=n. Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- default-configs/arm-softmmu.mak | 1 - 1 file changed, 1 deletion(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index be88870799..d7b540cb25 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -6,7 +6,6 @@ CONFIG_VGA=y CONFIG_NAND=y CONFIG_ECC=y CONFIG_SERIAL=y -CONFIG_SERIAL_ISA=y CONFIG_PTIMER=y CONFIG_SD=y CONFIG_MAX7310=y From patchwork Sat Feb 2 07:24:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794151 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 50D28746 for ; Sat, 2 Feb 2019 07:29:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 38AA031500 for ; Sat, 2 Feb 2019 07:29:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A399318CB; Sat, 2 Feb 2019 07:29:12 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9E30F31500 for ; Sat, 2 Feb 2019 07:29:11 +0000 (UTC) Received: from localhost ([127.0.0.1]:38584 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppjj-00042W-0R for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:29:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50040) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppfc-0000J3-5z for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:24:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gppfa-0002Ox-Um for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:24:56 -0500 Received: from mga14.intel.com ([192.55.52.115]:56070) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gppfa-0002Ky-KR for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:24:54 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:24:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828588" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:24:52 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:31 +0800 Message-Id: <20190202072456.6468-3-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 02/27] ide: split ioport registration to a separate file 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Paolo Bonzini This is not needed on ARM, and brings in ISA bus code which is otherwise not necessary. Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- hw/ide/Makefile.objs | 4 +-- hw/ide/core.c | 25 ----------------- hw/ide/ioport.c | 66 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 27 deletions(-) create mode 100644 hw/ide/ioport.c diff --git a/hw/ide/Makefile.objs b/hw/ide/Makefile.objs index fc328ffbe8..a142add90e 100644 --- a/hw/ide/Makefile.objs +++ b/hw/ide/Makefile.objs @@ -1,8 +1,8 @@ common-obj-$(CONFIG_IDE_CORE) += core.o atapi.o common-obj-$(CONFIG_IDE_QDEV) += qdev.o common-obj-$(CONFIG_IDE_PCI) += pci.o -common-obj-$(CONFIG_IDE_ISA) += isa.o -common-obj-$(CONFIG_IDE_PIIX) += piix.o +common-obj-$(CONFIG_IDE_ISA) += isa.o ioport.o +common-obj-$(CONFIG_IDE_PIIX) += piix.o ioport.o common-obj-$(CONFIG_IDE_CMD646) += cmd646.o common-obj-$(CONFIG_IDE_MACIO) += macio.o common-obj-$(CONFIG_IDE_MMIO) += mmio.o diff --git a/hw/ide/core.c b/hw/ide/core.c index c3d779db6e..84832008b8 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2686,31 +2686,6 @@ void ide_exit(IDEState *s) qemu_vfree(s->io_buffer); } -static const MemoryRegionPortio ide_portio_list[] = { - { 0, 8, 1, .read = ide_ioport_read, .write = ide_ioport_write }, - { 0, 1, 2, .read = ide_data_readw, .write = ide_data_writew }, - { 0, 1, 4, .read = ide_data_readl, .write = ide_data_writel }, - PORTIO_END_OF_LIST(), -}; - -static const MemoryRegionPortio ide_portio2_list[] = { - { 0, 1, 1, .read = ide_status_read, .write = ide_cmd_write }, - PORTIO_END_OF_LIST(), -}; - -void ide_init_ioport(IDEBus *bus, ISADevice *dev, int iobase, int iobase2) -{ - /* ??? Assume only ISA and PCI configurations, and that the PCI-ISA - bridge has been setup properly to always register with ISA. */ - isa_register_portio_list(dev, &bus->portio_list, - iobase, ide_portio_list, bus, "ide"); - - if (iobase2) { - isa_register_portio_list(dev, &bus->portio2_list, - iobase2, ide_portio2_list, bus, "ide"); - } -} - static bool is_identify_set(void *opaque, int version_id) { IDEState *s = opaque; diff --git a/hw/ide/ioport.c b/hw/ide/ioport.c new file mode 100644 index 0000000000..a0b3c1f6a1 --- /dev/null +++ b/hw/ide/ioport.c @@ -0,0 +1,66 @@ +/* + * QEMU IDE disk and CD/DVD-ROM Emulator + * + * Copyright (c) 2003 Fabrice Bellard + * Copyright (c) 2006 Openedhand Ltd. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "qemu/osdep.h" +#include "hw/hw.h" +#include "hw/isa/isa.h" +#include "qemu/error-report.h" +#include "qemu/timer.h" +#include "sysemu/sysemu.h" +#include "sysemu/blockdev.h" +#include "sysemu/dma.h" +#include "hw/block/block.h" +#include "sysemu/block-backend.h" +#include "qapi/error.h" +#include "qemu/cutils.h" +#include "sysemu/replay.h" + +#include "hw/ide/internal.h" +#include "trace.h" + +static const MemoryRegionPortio ide_portio_list[] = { + { 0, 8, 1, .read = ide_ioport_read, .write = ide_ioport_write }, + { 0, 1, 2, .read = ide_data_readw, .write = ide_data_writew }, + { 0, 1, 4, .read = ide_data_readl, .write = ide_data_writel }, + PORTIO_END_OF_LIST(), +}; + +static const MemoryRegionPortio ide_portio2_list[] = { + { 0, 1, 1, .read = ide_status_read, .write = ide_cmd_write }, + PORTIO_END_OF_LIST(), +}; + +void ide_init_ioport(IDEBus *bus, ISADevice *dev, int iobase, int iobase2) +{ + /* ??? Assume only ISA and PCI configurations, and that the PCI-ISA + bridge has been setup properly to always register with ISA. */ + isa_register_portio_list(dev, &bus->portio_list, + iobase, ide_portio_list, bus, "ide"); + + if (iobase2) { + isa_register_portio_list(dev, &bus->portio2_list, + iobase2, ide_portio2_list, bus, "ide"); + } +} From patchwork Sat Feb 2 07:24:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794149 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 54A4913B4 for ; Sat, 2 Feb 2019 07:28:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 341D232811 for ; Sat, 2 Feb 2019 07:28:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2684E32B24; Sat, 2 Feb 2019 07:28:23 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D1C7B32811 for ; Sat, 2 Feb 2019 07:28:22 +0000 (UTC) Received: from localhost ([127.0.0.1]:38582 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppiv-0003L8-V1 for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:28:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50047) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppfc-0000JD-FL for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:24:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gppfb-0002Q0-JO for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:24:56 -0500 Received: from mga14.intel.com ([192.55.52.115]:56070) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gppfb-0002Ky-9X for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:24:55 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:24:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828593" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:24:53 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:32 +0800 Message-Id: <20190202072456.6468-4-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 03/27] vfio: move conditional up to hw/Makefile.objs 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Paolo Bonzini Instead of wrapping the entire Makefile.objs with an ifeq/endif, just include the directory only for Linux. Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- hw/Makefile.objs | 2 +- hw/vfio/Makefile.objs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 39d882af6f..22dd211363 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -30,7 +30,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += ssi/ devices-dirs-$(CONFIG_SOFTMMU) += timer/ devices-dirs-$(CONFIG_TPM) += tpm/ devices-dirs-$(CONFIG_SOFTMMU) += usb/ -devices-dirs-$(CONFIG_SOFTMMU) += vfio/ +devices-dirs-$(CONFIG_LINUX) += vfio/ devices-dirs-$(CONFIG_SOFTMMU) += virtio/ devices-dirs-$(CONFIG_SOFTMMU) += watchdog/ devices-dirs-$(CONFIG_SOFTMMU) += xen/ diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs index 8b3f664d85..91805893f7 100644 --- a/hw/vfio/Makefile.objs +++ b/hw/vfio/Makefile.objs @@ -1,4 +1,3 @@ -ifeq ($(CONFIG_LINUX), y) obj-$(CONFIG_SOFTMMU) += common.o obj-$(CONFIG_PCI) += pci.o pci-quirks.o display.o obj-$(CONFIG_VFIO_CCW) += ccw.o @@ -7,4 +6,3 @@ obj-$(CONFIG_VFIO_XGMAC) += calxeda-xgmac.o obj-$(CONFIG_VFIO_AMD_XGBE) += amd-xgbe.o obj-$(CONFIG_SOFTMMU) += spapr.o obj-$(CONFIG_VFIO_AP) += ap.o -endif From patchwork Sat Feb 2 07:24:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794153 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2047C746 for ; Sat, 2 Feb 2019 07:29:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0746731500 for ; Sat, 2 Feb 2019 07:29:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED3D7318CB; Sat, 2 Feb 2019 07:29:16 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 77BAF31500 for ; Sat, 2 Feb 2019 07:29:16 +0000 (UTC) Received: from localhost ([127.0.0.1]:38586 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppjn-000463-Ld for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:29:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50088) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppfe-0000LI-4J for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:24:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gppfd-0002Rp-2C for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:24:58 -0500 Received: from mga14.intel.com ([192.55.52.115]:56070) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gppfc-0002Ky-N1 for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:24:56 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:24:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828597" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:24:55 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:33 +0800 Message-Id: <20190202072456.6468-5-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 04/27] hw/pci-host/Makefile.objs: make CONFIGS clear for PCI EXPRESS 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com, "Michael S . Tsirkin" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Change the CONFIGs for PCI EXPRESS and make module name more clear for code files. Signed-off-by: Yang Zhong Cc: Michael S. Tsirkin Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- default-configs/arm-softmmu.mak | 4 ++-- default-configs/i386-softmmu.mak | 2 +- default-configs/mips64el-softmmu.mak | 2 +- default-configs/pci.mak | 2 +- default-configs/riscv32-softmmu.mak | 2 +- default-configs/riscv64-softmmu.mak | 2 +- hw/net/Makefile.objs | 4 ++-- hw/pci-host/Makefile.objs | 8 ++++---- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index d7b540cb25..32f4a4ac27 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -123,7 +123,7 @@ CONFIG_VERSATILE=y CONFIG_VERSATILE_PCI=y CONFIG_VERSATILE_I2C=y -CONFIG_PCI_GENERIC=y +CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y CONFIG_VFIO_XGMAC=y CONFIG_VFIO_AMD_XGBE=y @@ -154,7 +154,7 @@ CONFIG_GPIO_KEY=y CONFIG_MSF2=y CONFIG_FW_CFG_DMA=y CONFIG_XILINX_AXI=y -CONFIG_PCI_DESIGNWARE=y +CONFIG_PCI_EXPRESS_DESIGNWARE=y CONFIG_STRONGARM=y CONFIG_HIGHBANK=y diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 64c998c4c8..2f919df346 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -47,7 +47,7 @@ CONFIG_ISA_TESTDEV=y CONFIG_VMPORT=y CONFIG_SGA=y CONFIG_LPC_ICH9=y -CONFIG_PCI_Q35=y +CONFIG_PCI_EXPRESS_Q35=y CONFIG_APIC=y CONFIG_IOAPIC=y CONFIG_PVPANIC=y diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index c2ae313f47..9eb1208b58 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -12,4 +12,4 @@ CONFIG_JAZZ_LED=y CONFIG_VT82C686=y CONFIG_MIPS_BOSTON=y CONFIG_FITLOADER=y -CONFIG_PCI_XILINX=y +CONFIG_PCI_EXPRESS_XILINX=y diff --git a/default-configs/pci.mak b/default-configs/pci.mak index 6c7be12779..83738cbb65 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -22,7 +22,7 @@ CONFIG_MEGASAS_SCSI_PCI=y CONFIG_MPTSAS_SCSI_PCI=y CONFIG_RTL8139_PCI=y CONFIG_E1000_PCI=y -CONFIG_E1000E_PCI=y +CONFIG_E1000E_PCI_EXPRESS=y CONFIG_IDE_CORE=y CONFIG_IDE_QDEV=y CONFIG_IDE_PCI=y diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-softmmu.mak index c9c5971409..fbfd1d4e4b 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -8,7 +8,7 @@ CONFIG_VIRTIO_MMIO=y CONFIG_CADENCE=y -CONFIG_PCI_GENERIC=y +CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y CONFIG_VGA=y CONFIG_VGA_PCI=y diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-softmmu.mak index c9c5971409..fbfd1d4e4b 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -8,7 +8,7 @@ CONFIG_VIRTIO_MMIO=y CONFIG_CADENCE=y -CONFIG_PCI_GENERIC=y +CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y CONFIG_VGA=y CONFIG_VGA_PCI=y diff --git a/hw/net/Makefile.objs b/hw/net/Makefile.objs index fa461d4463..a43351aa04 100644 --- a/hw/net/Makefile.objs +++ b/hw/net/Makefile.objs @@ -7,8 +7,8 @@ common-obj-$(CONFIG_EEPRO100_PCI) += eepro100.o common-obj-$(CONFIG_PCNET_PCI) += pcnet-pci.o common-obj-$(CONFIG_PCNET_COMMON) += pcnet.o common-obj-$(CONFIG_E1000_PCI) += e1000.o e1000x_common.o -common-obj-$(CONFIG_E1000E_PCI) += net_tx_pkt.o net_rx_pkt.o -common-obj-$(CONFIG_E1000E_PCI) += e1000e.o e1000e_core.o e1000x_common.o +common-obj-$(CONFIG_E1000E_PCI_EXPRESS) += net_tx_pkt.o net_rx_pkt.o +common-obj-$(CONFIG_E1000E_PCI_EXPRESS) += e1000e.o e1000e_core.o e1000x_common.o common-obj-$(CONFIG_RTL8139_PCI) += rtl8139.o common-obj-$(CONFIG_VMXNET3_PCI) += net_tx_pkt.o net_rx_pkt.o common-obj-$(CONFIG_VMXNET3_PCI) += vmxnet3.o diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs index 6d6597c065..073d5124d1 100644 --- a/hw/pci-host/Makefile.objs +++ b/hw/pci-host/Makefile.objs @@ -14,8 +14,8 @@ common-obj-$(CONFIG_VERSATILE_PCI) += versatile.o common-obj-$(CONFIG_PCI_SABRE) += sabre.o common-obj-$(CONFIG_FULONG) += bonito.o common-obj-$(CONFIG_PCI_PIIX) += piix.o -common-obj-$(CONFIG_PCI_Q35) += q35.o -common-obj-$(CONFIG_PCI_GENERIC) += gpex.o -common-obj-$(CONFIG_PCI_XILINX) += xilinx-pcie.o +common-obj-$(CONFIG_PCI_EXPRESS_Q35) += q35.o +common-obj-$(CONFIG_PCI_EXPRESS_GENERIC_BRIDGE) += gpex.o +common-obj-$(CONFIG_PCI_EXPRESS_XILINX) += xilinx-pcie.o -common-obj-$(CONFIG_PCI_DESIGNWARE) += designware.o +common-obj-$(CONFIG_PCI_EXPRESS_DESIGNWARE) += designware.o From patchwork Sat Feb 2 07:24:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794147 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BB3A6746 for ; Sat, 2 Feb 2019 07:26:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A50ED32811 for ; Sat, 2 Feb 2019 07:26:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 995C832B24; Sat, 2 Feb 2019 07:26:24 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4C3E632811 for ; Sat, 2 Feb 2019 07:26:24 +0000 (UTC) Received: from localhost ([127.0.0.1]:38566 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpph1-0001h8-Ke for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:26:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50110) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppff-0000M2-4W for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:24:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gppfe-0002TY-DX for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:24:59 -0500 Received: from mga14.intel.com ([192.55.52.115]:56070) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gppfe-0002Ky-3u for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:24:58 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:24:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828603" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:24:56 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:34 +0800 Message-Id: <20190202072456.6468-6-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 05/27] build: actually use CONFIG_PAM 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Paolo Bonzini Do not link it unconditionally into all binaries. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth --- default-configs/i386-softmmu.mak | 1 + hw/pci-host/Makefile.objs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 2f919df346..48da9968cc 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -67,3 +67,4 @@ CONFIG_I2C=y CONFIG_SEV=$(CONFIG_KVM) CONFIG_VTD=y CONFIG_AMD_IOMMU=y +CONFIG_PAM=y diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs index 073d5124d1..a9cd3e022d 100644 --- a/hw/pci-host/Makefile.objs +++ b/hw/pci-host/Makefile.objs @@ -1,4 +1,4 @@ -common-obj-y += pam.o +common-obj-$(CONFIG_PAM) += pam.o # PPC devices common-obj-$(CONFIG_PREP_PCI) += prep.o From patchwork Sat Feb 2 07:24:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794157 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 35F55746 for ; Sat, 2 Feb 2019 07:31:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1FF0832BD7 for ; Sat, 2 Feb 2019 07:31:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 13D8F32EF4; Sat, 2 Feb 2019 07:31:22 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9887D32EEB for ; Sat, 2 Feb 2019 07:31:21 +0000 (UTC) Received: from localhost ([127.0.0.1]:38636 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpplo-0005x6-AI for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:31:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50139) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppfg-0000Nq-JV for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gppff-0002V3-Td for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:00 -0500 Received: from mga14.intel.com ([192.55.52.115]:56070) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gppff-0002Ky-J6 for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:24:59 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:24:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828613" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:24:57 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:35 +0800 Message-Id: <20190202072456.6468-7-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 06/27] hw/i386/Makefile.objs: Build pc_piix* and pc_q35 boards 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com, =?utf-8?b?w4Frb3MgS292w6Fjcw==?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Paolo Bonzini CONFIG_PIIX and CONFIG_Q35 created for the pc board object files. These are enabled automatically at default-configs/i386-softmmu.mak and default-configs/x86_64-softmmu.mak Signed-off-by: Ákos Kovács Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- default-configs/i386-softmmu.mak | 2 ++ hw/i386/Makefile.objs | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 48da9968cc..71c9f6fbcb 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -68,3 +68,5 @@ CONFIG_SEV=$(CONFIG_KVM) CONFIG_VTD=y CONFIG_AMD_IOMMU=y CONFIG_PAM=y +CONFIG_I440FX=y +CONFIG_Q35=y diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index fa87a14152..3de7ca2bb9 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -1,6 +1,8 @@ obj-$(CONFIG_KVM) += kvm/ obj-y += multiboot.o -obj-y += pc.o pc_piix.o pc_q35.o +obj-y += pc.o +obj-$(CONFIG_I440FX) += pc_piix.o +obj-$(CONFIG_Q35) += pc_q35.o obj-y += pc_sysfw.o obj-$(CONFIG_VTD) += x86-iommu.o intel_iommu.o obj-$(CONFIG_AMD_IOMMU) += x86-iommu.o amd_iommu.o From patchwork Sat Feb 2 07:24:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794161 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D90E2746 for ; Sat, 2 Feb 2019 07:32:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C813F32DD3 for ; Sat, 2 Feb 2019 07:32:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BC83C32EE4; Sat, 2 Feb 2019 07:32:15 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5DF8632DD3 for ; Sat, 2 Feb 2019 07:32:15 +0000 (UTC) Received: from localhost ([127.0.0.1]:38640 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppmg-0006fD-HC for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:32:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50166) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppfi-0000Pj-3M for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gppfh-0002Wl-91 for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:02 -0500 Received: from mga14.intel.com ([192.55.52.115]:56070) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gppfh-0002Ky-0H for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:01 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:25:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828618" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:24:59 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:36 +0800 Message-Id: <20190202072456.6468-8-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 07/27] hw/arm/Makefile.objs: CONFIG_ARM_VIRT created for virt board 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Make ARM virt code configurable and the new CONFIG_ARM_VIRT definitions added to the default-configs/arm-softmmu.mak. Signed-off-by: Yang Zhong Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- default-configs/arm-softmmu.mak | 1 + hw/arm/Makefile.objs | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 32f4a4ac27..1db36396b1 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -148,6 +148,7 @@ CONFIG_XIO3130=y CONFIG_IOH3420=y CONFIG_I82801B11=y CONFIG_ACPI=y +CONFIG_ARM_VIRT=y CONFIG_SMBIOS=y CONFIG_ASPEED_SOC=y CONFIG_GPIO_KEY=y diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 22b7f0ed0b..fa40e8d641 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -1,4 +1,5 @@ -obj-y += boot.o virt.o sysbus-fdt.o +obj-y += boot.o sysbus-fdt.o +obj-$(CONFIG_ARM_VIRT) += virt.o obj-$(CONFIG_ACPI) += virt-acpi-build.o obj-$(CONFIG_DIGIC) += digic_boards.o obj-$(CONFIG_EXYNOS4) += exynos4_boards.o From patchwork Sat Feb 2 07:24:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794165 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2B818159A for ; Sat, 2 Feb 2019 07:34:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0D3A032EBE for ; Sat, 2 Feb 2019 07:34:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 01B4E32EEB; Sat, 2 Feb 2019 07:34:25 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A879A32EBE for ; Sat, 2 Feb 2019 07:34:25 +0000 (UTC) Received: from localhost ([127.0.0.1]:38660 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppom-0008Jw-Pq for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:34:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50187) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppfj-0000Qx-CM for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gppfi-0002YA-MO for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:03 -0500 Received: from mga14.intel.com ([192.55.52.115]:56070) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gppfi-0002Ky-D2 for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:02 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:25:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828629" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:25:00 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:37 +0800 Message-Id: <20190202072456.6468-9-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 08/27] hw/m68k/Makefile.objs: Conditionally build boards 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com, =?utf-8?b?w4Frb3MgS292w6Fjcw==?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Ákos Kovács CONFIG_AN5206, CONFIG_MCF5206 and CONFIG_MCF5208 make variables created for m68k boards, and added to default-configs/m86k-softmmu.mak. Signed-off-by: Ákos Kovács Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- default-configs/m68k-softmmu.mak | 2 ++ hw/m68k/Makefile.objs | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmmu.mak index 60f7cdfbf2..27f5274244 100644 --- a/default-configs/m68k-softmmu.mak +++ b/default-configs/m68k-softmmu.mak @@ -2,3 +2,5 @@ CONFIG_COLDFIRE=y CONFIG_PTIMER=y +CONFIG_AN5206=y +CONFIG_MCF5208=y diff --git a/hw/m68k/Makefile.objs b/hw/m68k/Makefile.objs index d1f089c08a..482f8477b4 100644 --- a/hw/m68k/Makefile.objs +++ b/hw/m68k/Makefile.objs @@ -1,2 +1,2 @@ -obj-y += an5206.o mcf5208.o -obj-y += mcf5206.o mcf_intc.o +obj-$(CONFIG_AN5206) += an5206.o mcf5206.o +obj-$(CONFIG_MCF5208) += mcf5208.o mcf_intc.o From patchwork Sat Feb 2 07:24:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794159 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5611D746 for ; Sat, 2 Feb 2019 07:32:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 42ABC32EBE for ; Sat, 2 Feb 2019 07:32:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 36C3332EE2; Sat, 2 Feb 2019 07:32:06 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DC7D832EBE for ; Sat, 2 Feb 2019 07:32:05 +0000 (UTC) Received: from localhost ([127.0.0.1]:38626 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppmX-0005Q2-18 for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:32:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50215) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppfk-0000So-V4 for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gppfk-0002Zh-6w for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:04 -0500 Received: from mga14.intel.com ([192.55.52.115]:56070) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gppfj-0002Ky-Rz for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:04 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:25:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828645" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:25:02 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:38 +0800 Message-Id: <20190202072456.6468-10-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 09/27] hw/microblaze/Makefile.objs: Create configs for petalogix and xilinx boards 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com, =?utf-8?b?w4Frb3MgS292w6Fjcw==?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Ákos Kovács CONFIG_PETALOGIX_* and CONFIG_XLNX_* configs added to default-configs/microblaze-softmmu.mak and default-configs/microblazeel-softmmu.mak. Signed-off-by: Ákos Kovács Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- default-configs/microblaze-softmmu.mak | 3 +++ hw/microblaze/Makefile.objs | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/microblaze-softmmu.mak index 7fca8e4c99..14837cf74a 100644 --- a/default-configs/microblaze-softmmu.mak +++ b/default-configs/microblaze-softmmu.mak @@ -10,3 +10,6 @@ CONFIG_XILINX_ETHLITE=y CONFIG_SSI=y CONFIG_SSI_M25P80=y CONFIG_XLNX_ZYNQMP=y +CONFIG_PETALOGIX_S3ADSP1800=y +CONFIG_PETALOGIX_ML605=y +CONFIG_XLNX_ZYNQMP_PMU=y diff --git a/hw/microblaze/Makefile.objs b/hw/microblaze/Makefile.objs index ae9fd40de7..8595a62f6c 100644 --- a/hw/microblaze/Makefile.objs +++ b/hw/microblaze/Makefile.objs @@ -1,4 +1,4 @@ -obj-y += petalogix_s3adsp1800_mmu.o -obj-y += petalogix_ml605_mmu.o -obj-y += xlnx-zynqmp-pmu.o +obj-$(CONFIG_PETALOGIX_S3ADSP1800) += petalogix_s3adsp1800_mmu.o +obj-$(CONFIG_PETALOGIX_ML605) += petalogix_ml605_mmu.o +obj-$(CONFIG_XLNX_ZYNQMP_PMU) += xlnx-zynqmp-pmu.o obj-y += boot.o From patchwork Sat Feb 2 07:24:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794169 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CE10C159A for ; Sat, 2 Feb 2019 07:35:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF278327F7 for ; Sat, 2 Feb 2019 07:35:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B383032EEB; Sat, 2 Feb 2019 07:35:21 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6432A327F7 for ; Sat, 2 Feb 2019 07:35:21 +0000 (UTC) Received: from localhost ([127.0.0.1]:38693 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpppg-0000hr-NF for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:35:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50235) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppfm-0000UU-DL for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gppfl-0002bO-H8 for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:06 -0500 Received: from mga14.intel.com ([192.55.52.115]:56070) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gppfl-0002Ky-85 for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:05 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:25:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828655" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:25:03 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:39 +0800 Message-Id: <20190202072456.6468-11-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 10/27] hw/mips/Makefile.objs: Create CONFIG_* for r4k, malta, mipssim boards 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com, =?utf-8?b?w4Frb3MgS292w6Fjcw==?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Ákos Kovács Add the new configs to default-configs/mips*-sofmmu.mak. Signed-off-by: Ákos Kovács Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth --- default-configs/mips-softmmu-common.mak | 3 +++ hw/mips/Makefile.objs | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak index fae2347ee7..479fb4d900 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -36,3 +36,6 @@ CONFIG_EMPTY_SLOT=y CONFIG_MIPS_CPS=y CONFIG_MIPS_ITU=y CONFIG_I2C=y +CONFIG_R4K=y +CONFIG_MALTA=y +CONFIG_MIPSSIM=y diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs index 17a311aaba..525809af07 100644 --- a/hw/mips/Makefile.objs +++ b/hw/mips/Makefile.objs @@ -1,7 +1,8 @@ -obj-y += mips_r4k.o mips_malta.o mips_mipssim.o obj-y += addr.o mips_int.o +obj-$(CONFIG_R4K) += mips_r4k.o +obj-$(CONFIG_MALTA) += gt64xxx_pci.o mips_malta.o +obj-$(CONFIG_MIPSSIM) += mips_mipssim.o obj-$(CONFIG_JAZZ) += mips_jazz.o obj-$(CONFIG_FULONG) += mips_fulong2e.o -obj-y += gt64xxx_pci.o obj-$(CONFIG_MIPS_CPS) += cps.o obj-$(CONFIG_MIPS_BOSTON) += boston.o From patchwork Sat Feb 2 07:24:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794167 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A1145746 for ; Sat, 2 Feb 2019 07:35:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8CC11327F7 for ; Sat, 2 Feb 2019 07:35:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7A70232EEB; Sat, 2 Feb 2019 07:35:14 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 170D8327F7 for ; Sat, 2 Feb 2019 07:35:14 +0000 (UTC) Received: from localhost ([127.0.0.1]:38650 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpppZ-0007jt-Ch for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:35:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50257) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppfn-0000WB-Vz for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gppfn-0002dV-4i for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:07 -0500 Received: from mga14.intel.com ([192.55.52.115]:56070) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gppfm-0002Ky-Mm for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:07 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:25:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828662" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:25:05 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:40 +0800 Message-Id: <20190202072456.6468-12-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 11/27] hw/ppc/Makefile.objs: Build all boards conditinally with CONFIG_* 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com, =?utf-8?b?w4Frb3MgS292w6Fjcw==?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Ákos Kovács CONFIG_PPC405, CONFIG_PPC440, CONFIG_MAC_OLDWORLD, CONFIG_MAX_NEWWORLD and CONFIG_VIRTEX configuration options created for default-configs/ppc*-softmmu.mak. Signed-off-by: Ákos Kovács Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth --- default-configs/ppc-softmmu.mak | 7 ++++++- hw/ppc/Makefile.objs | 11 ++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index 23d871fb3e..7f80f0ccba 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -21,6 +21,10 @@ CONFIG_E500=y CONFIG_OPENPIC_KVM=$(call land,$(CONFIG_E500),$(CONFIG_KVM)) CONFIG_PLATFORM_BUS=y CONFIG_ETSEC=y +CONFIG_PPC405=y +CONFIG_PPC440=y +CONFIG_VIRTEX=y + # For Sam460ex CONFIG_SAM460EX=y CONFIG_USB_EHCI_SYSBUS=y @@ -34,7 +38,6 @@ CONFIG_M41T80=y CONFIG_VGA_CIRRUS=y # For Macs -CONFIG_MAC=y CONFIG_ESCC=y CONFIG_MACIO=y CONFIG_MACIO_GPIO=y @@ -50,6 +53,8 @@ CONFIG_GRACKLE_PCI=y CONFIG_UNIN_PCI=y CONFIG_DEC_PCI=y CONFIG_IDE_MACIO=y +CONFIG_MAC_OLDWORLD=y +CONFIG_MAC_NEWWORLD=y # For PReP CONFIG_PREP=y diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 4e0c1c0941..7d815b7d57 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -14,19 +14,20 @@ endif obj-$(CONFIG_PSERIES) += spapr_rtas_ddw.o # PowerPC 4xx boards obj-y += ppc4xx_devs.o ppc405_uc.o -obj-$(CONFIG_PPC4XX) += ppc4xx_pci.o ppc405_boards.o -obj-$(CONFIG_PPC4XX) += ppc440_bamboo.o ppc440_pcix.o ppc440_uc.o +obj-$(CONFIG_PPC405) += ppc405_boards.o +obj-$(CONFIG_PPC440) += ppc440_bamboo.o ppc440_pcix.o ppc440_uc.o +obj-$(CONFIG_PPC4XX) += ppc4xx_pci.o obj-$(CONFIG_SAM460EX) += sam460ex.o # PReP obj-$(CONFIG_PREP) += prep.o obj-$(CONFIG_PREP) += prep_systemio.o obj-${CONFIG_RS6000_MC} += rs6000_mc.o # OldWorld PowerMac -obj-$(CONFIG_MAC) += mac_oldworld.o +obj-$(CONFIG_MAC_OLDWORLD) += mac_oldworld.o # NewWorld PowerMac -obj-$(CONFIG_MAC) += mac_newworld.o +obj-$(CONFIG_MAC_NEWWORLD) += mac_newworld.o # e500 obj-$(CONFIG_E500) += e500.o mpc8544ds.o e500plat.o obj-$(CONFIG_E500) += mpc8544_guts.o ppce500_spin.o # PowerPC 440 Xilinx ML507 reference board. -obj-$(CONFIG_XILINX) += virtex_ml507.o +obj-$(CONFIG_VIRTEX) += virtex_ml507.o From patchwork Sat Feb 2 07:24:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794179 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B3D0A186E for ; Sat, 2 Feb 2019 07:38:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A5CA332800 for ; Sat, 2 Feb 2019 07:38:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A53A32EEB; Sat, 2 Feb 2019 07:38:22 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4EDB632800 for ; Sat, 2 Feb 2019 07:38:22 +0000 (UTC) Received: from localhost ([127.0.0.1]:38722 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppsb-0003Aj-Jq for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:38:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50405) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppgU-0001Bg-B9 for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gppgN-00033V-Be for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:46 -0500 Received: from mga14.intel.com ([192.55.52.115]:56070) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gppgH-0002Ky-RR for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:38 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:25:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828674" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:25:06 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:41 +0800 Message-Id: <20190202072456.6468-13-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 12/27] hw/sh4/Makefile.objs: New CONFIG_* varibales created for sh4 boards and device 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com, =?utf-8?b?w4Frb3MgS292w6Fjcw==?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Ákos Kovács Make hw/sh4 configurable and add new CONFIG_* to the default-configs/sh4*-softmmu.mak. Signed-off-by: Ákos Kovács Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- default-configs/sh4-softmmu.mak | 2 ++ default-configs/sh4eb-softmmu.mak | 2 ++ hw/sh4/Makefile.objs | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak index caeccd55be..1fdb009151 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -19,3 +19,5 @@ CONFIG_PCSPK=y CONFIG_I82374=y CONFIG_I8257=y CONFIG_MC146818RTC=y +CONFIG_R2D=y +CONFIG_SHIX=y diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak index 53b9cd7b5a..3b550a5fe8 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -19,3 +19,5 @@ CONFIG_PCSPK=y CONFIG_I82374=y CONFIG_I8257=y CONFIG_MC146818RTC=y +CONFIG_R2D=y +CONFIG_SHIX=y diff --git a/hw/sh4/Makefile.objs b/hw/sh4/Makefile.objs index 2393702c57..2a707f9473 100644 --- a/hw/sh4/Makefile.objs +++ b/hw/sh4/Makefile.objs @@ -1,4 +1,4 @@ -obj-y += shix.o r2d.o - obj-y += sh7750.o sh7750_regnames.o obj-y += sh_pci.o +obj-$(CONFIG_R2D) += r2d.o +obj-$(CONFIG_SHIX) += shix.o From patchwork Sat Feb 2 07:24:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794185 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 77D51159A for ; Sat, 2 Feb 2019 07:41:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6BAF432DDD for ; Sat, 2 Feb 2019 07:41:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 605AF32EA2; Sat, 2 Feb 2019 07:41:11 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1850332DDD for ; Sat, 2 Feb 2019 07:41:11 +0000 (UTC) Received: from localhost ([127.0.0.1]:38779 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppvK-0005bt-DZ for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:41:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50402) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppgU-0001Bd-9X for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gppgH-0002yL-Pg for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:45 -0500 Received: from mga14.intel.com ([192.55.52.115]:56076) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gppg8-0002hI-3p for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:33 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:25:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828683" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:25:08 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:42 +0800 Message-Id: <20190202072456.6468-14-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 13/27] hw/s390/Makefile.objs: Create new CONFIG_* variables for s390x boards and devices 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Paolo Bonzini Make hw/s390x configurable and add new CONFIG_* to the default-configs/s390x*-softmmu.mak. This will be used to enable/disable vfio-ccw. Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- default-configs/s390x-softmmu.mak | 1 + hw/s390x/Makefile.objs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak index 5eef375924..8bb7e438c8 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -8,3 +8,4 @@ CONFIG_S390_FLIC_KVM=$(CONFIG_KVM) CONFIG_VFIO_CCW=$(CONFIG_LINUX) CONFIG_WDT_DIAG288=y CONFIG_VFIO_AP=$(CONFIG_LINUX) +CONFIG_S390_CCW_VIRTIO=y diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs index ca68806e44..a18c471913 100644 --- a/hw/s390x/Makefile.objs +++ b/hw/s390x/Makefile.objs @@ -5,7 +5,7 @@ obj-y += sclpquiesce.o obj-y += sclpcpu.o obj-y += ipl.o obj-y += css.o -obj-y += s390-virtio-ccw.o +obj-$(CONFIG_S390_CCW_VIRTIO) += s390-virtio-ccw.o obj-y += 3270-ccw.o obj-y += virtio-ccw.o obj-$(CONFIG_VIRTIO_SERIAL) += virtio-ccw-serial.o From patchwork Sat Feb 2 07:24:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794155 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B0B00746 for ; Sat, 2 Feb 2019 07:29:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99BF631500 for ; Sat, 2 Feb 2019 07:29:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8DC23318CB; Sat, 2 Feb 2019 07:29:18 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3634B31500 for ; Sat, 2 Feb 2019 07:29:18 +0000 (UTC) Received: from localhost ([127.0.0.1]:38588 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppjp-00047W-Dm for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:29:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50383) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppgQ-000186-KP for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gppgI-0002zQ-1N for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:39 -0500 Received: from mga14.intel.com ([192.55.52.115]:56083) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gppgH-0002jk-ED for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:37 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:25:10 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828688" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:25:09 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:43 +0800 Message-Id: <20190202072456.6468-15-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 14/27] hw/sparc/Makefile.objs: CONFIG_* for sun4m and leon3 created 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com, =?utf-8?b?w4Frb3MgS292w6Fjcw==?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Ákos Kovács CONFIG_LEON3 added to default-configs/sparc-softmmu.mak. Signed-off-by: Ákos Kovács Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- default-configs/sparc-softmmu.mak | 2 ++ hw/sparc/Makefile.objs | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak index 12f97eeb20..59a4a3d693 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -18,4 +18,6 @@ CONFIG_CS4231=y CONFIG_GRLIB=y CONFIG_STP2000=y CONFIG_ECCMEMCTL=y + CONFIG_SUN4M=y +CONFIG_LEON3=y diff --git a/hw/sparc/Makefile.objs b/hw/sparc/Makefile.objs index e2d0828c39..d57e33f83e 100644 --- a/hw/sparc/Makefile.objs +++ b/hw/sparc/Makefile.objs @@ -1 +1,3 @@ -obj-y += sun4m_iommu.o sun4m.o leon3.o +obj-$(CONFIG_SUN4M) += sun4m_iommu.o +obj-$(CONFIG_SUN4M) += sun4m.o +obj-$(CONFIG_LEON3) += leon3.o From patchwork Sat Feb 2 07:24:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794173 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5E5A2159A for ; Sat, 2 Feb 2019 07:37:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B7FC32800 for ; Sat, 2 Feb 2019 07:37:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D09232EEB; Sat, 2 Feb 2019 07:37:28 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DBBC832800 for ; Sat, 2 Feb 2019 07:37:27 +0000 (UTC) Received: from localhost ([127.0.0.1]:38702 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpprj-0001KT-2k for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:37:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50497) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppgc-0001IS-3c for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gppgY-0003EF-H2 for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:56 -0500 Received: from mga14.intel.com ([192.55.52.115]:56076) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gppgV-0002hI-SU for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:52 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:25:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828693" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:25:10 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:44 +0800 Message-Id: <20190202072456.6468-16-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 15/27] hw/lm32/Makefile.objs: Conditionally build lm32 and milkmyst 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com, =?utf-8?b?w4Frb3MgS292w6Fjcw==?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Ákos Kovács CONFIG_LM32 and CONFIG_MILKYMIST added for lm32 and milkmyst build. Signed-off-by: Ákos Kovács Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- hw/lm32/Makefile.objs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/lm32/Makefile.objs b/hw/lm32/Makefile.objs index ea6418ae59..c3941866c7 100644 --- a/hw/lm32/Makefile.objs +++ b/hw/lm32/Makefile.objs @@ -1,3 +1,3 @@ # LM32 boards -obj-y += lm32_boards.o -obj-y += milkymist.o +obj-$(CONFIG_LM32) += lm32_boards.o +obj-$(CONFIG_MILKYMIST) += milkymist.o From patchwork Sat Feb 2 07:24:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794163 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2B9EF13B5 for ; Sat, 2 Feb 2019 07:32:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1968032DD3 for ; Sat, 2 Feb 2019 07:32:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0D1D132EEB; Sat, 2 Feb 2019 07:32:16 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9B73B32ECF for ; Sat, 2 Feb 2019 07:32:15 +0000 (UTC) Received: from localhost ([127.0.0.1]:38642 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppmg-0006fS-Pg for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:32:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppgc-0001IV-BM for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gppga-0003FQ-67 for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:58 -0500 Received: from mga14.intel.com ([192.55.52.115]:56083) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gppgW-0002jk-A2 for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:54 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:25:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828701" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:25:12 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:45 +0800 Message-Id: <20190202072456.6468-17-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 16/27] hw/xtensa/Makefile.objs: Build xtensa_sim and xtensa_fpga conditionally 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com, =?utf-8?b?w4Frb3MgS292w6Fjcw==?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Ákos Kovács Add the new CONFIG_* values to default-config/xtensa*-softmmu.mak. Signed-off-by: Ákos Kovács Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth Acked-by: Max Filippov --- default-configs/xtensa-softmmu.mak | 3 +++ default-configs/xtensaeb-softmmu.mak | 3 +++ hw/xtensa/Makefile.objs | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/default-configs/xtensa-softmmu.mak b/default-configs/xtensa-softmmu.mak index 9d8899cde7..baf90ca162 100644 --- a/default-configs/xtensa-softmmu.mak +++ b/default-configs/xtensa-softmmu.mak @@ -3,3 +3,6 @@ CONFIG_SERIAL=y CONFIG_OPENCORES_ETH=y CONFIG_PFLASH_CFI01=y + +CONFIG_XTENSA_SIM=y +CONFIG_XTENSA_FPGA=y diff --git a/default-configs/xtensaeb-softmmu.mak b/default-configs/xtensaeb-softmmu.mak index 9d8899cde7..baf90ca162 100644 --- a/default-configs/xtensaeb-softmmu.mak +++ b/default-configs/xtensaeb-softmmu.mak @@ -3,3 +3,6 @@ CONFIG_SERIAL=y CONFIG_OPENCORES_ETH=y CONFIG_PFLASH_CFI01=y + +CONFIG_XTENSA_SIM=y +CONFIG_XTENSA_FPGA=y diff --git a/hw/xtensa/Makefile.objs b/hw/xtensa/Makefile.objs index cb4998d2bf..62e244fa53 100644 --- a/hw/xtensa/Makefile.objs +++ b/hw/xtensa/Makefile.objs @@ -1,4 +1,4 @@ obj-y += pic_cpu.o -obj-y += sim.o obj-y += xtensa_memory.o -obj-y += xtfpga.o +obj-$(CONFIG_XTENSA_SIM) += sim.o +obj-$(CONFIG_XTENSA_FPGA) += xtfpga.o From patchwork Sat Feb 2 07:24:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794191 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B4AC8159A for ; Sat, 2 Feb 2019 07:44:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A487A2B495 for ; Sat, 2 Feb 2019 07:44:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 926F12BE69; Sat, 2 Feb 2019 07:44:01 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3A8082B495 for ; Sat, 2 Feb 2019 07:44:01 +0000 (UTC) Received: from localhost ([127.0.0.1]:38807 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppy4-000808-HQ for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:44:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50571) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppgd-0001Iv-QP for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gppgc-0003IQ-PG for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:59 -0500 Received: from mga14.intel.com ([192.55.52.115]:56070) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gppgc-0002Ky-8r for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:58 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:25:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828707" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:25:13 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:46 +0800 Message-Id: <20190202072456.6468-18-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 17/27] hw/nios2/Makefile.objs: Conditionally build nios2 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP CONFIG_NIOS2_10M50 added for 10m50 dev board. Signed-off-by: Yang Zhong Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- default-configs/nios2-softmmu.mak | 1 + hw/nios2/Makefile.objs | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/default-configs/nios2-softmmu.mak b/default-configs/nios2-softmmu.mak index 74dc70caae..ab42d0fc28 100644 --- a/default-configs/nios2-softmmu.mak +++ b/default-configs/nios2-softmmu.mak @@ -4,3 +4,4 @@ CONFIG_NIOS2=y CONFIG_SERIAL=y CONFIG_PTIMER=y CONFIG_ALTERA_TIMER=y +CONFIG_NIOS2_10M50=y diff --git a/hw/nios2/Makefile.objs b/hw/nios2/Makefile.objs index 6b5c421760..89a419a9f5 100644 --- a/hw/nios2/Makefile.objs +++ b/hw/nios2/Makefile.objs @@ -1 +1,2 @@ -obj-y = boot.o cpu_pic.o 10m50_devboard.o +obj-y = boot.o cpu_pic.o +obj-$(CONFIG_NIOS2_10M50) += 10m50_devboard.o From patchwork Sat Feb 2 07:24:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794195 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B966A746 for ; Sat, 2 Feb 2019 07:46:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD4952C5EE for ; Sat, 2 Feb 2019 07:46:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A07752C74C; Sat, 2 Feb 2019 07:46:09 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 462192C5EE for ; Sat, 2 Feb 2019 07:46:09 +0000 (UTC) Received: from localhost ([127.0.0.1]:38855 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpq08-0001Wr-K2 for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:46:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50597) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppge-0001JW-H6 for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gppgd-0003Jh-9Y for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:00 -0500 Received: from mga14.intel.com ([192.55.52.115]:56076) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gppgc-0002hI-S6 for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:59 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:25:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828713" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:25:15 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:47 +0800 Message-Id: <20190202072456.6468-19-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 18/27] hw/riscv/Makefile.objs: Create CONFIG_* for riscv boards 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add the new configs to default-configs/riscv*-sofmmu.mak. Signed-off-by: Yang Zhong Signed-off-by: Paolo Bonzini Reviewed-by: Alistair Francis Reviewed-by: Thomas Huth --- default-configs/riscv32-softmmu.mak | 7 +++++++ default-configs/riscv64-softmmu.mak | 7 +++++++ hw/riscv/Makefile.objs | 22 +++++++++++----------- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-softmmu.mak index fbfd1d4e4b..65337166e1 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -12,3 +12,10 @@ CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y CONFIG_VGA=y CONFIG_VGA_PCI=y + +CONFIG_SPIKE=y +CONFIG_HART=y +CONFIG_SIFIVE_E=y +CONFIG_SIFIVE=y +CONFIG_SIFIVE_U=y +CONFIG_RISCV_VIRT=y diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-softmmu.mak index fbfd1d4e4b..65337166e1 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -12,3 +12,10 @@ CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y CONFIG_VGA=y CONFIG_VGA_PCI=y + +CONFIG_SPIKE=y +CONFIG_HART=y +CONFIG_SIFIVE_E=y +CONFIG_SIFIVE=y +CONFIG_SIFIVE_U=y +CONFIG_RISCV_VIRT=y diff --git a/hw/riscv/Makefile.objs b/hw/riscv/Makefile.objs index 1dde01d39d..79bfb3abf9 100644 --- a/hw/riscv/Makefile.objs +++ b/hw/riscv/Makefile.objs @@ -1,11 +1,11 @@ -obj-y += riscv_htif.o -obj-y += riscv_hart.o -obj-y += sifive_e.o -obj-y += sifive_clint.o -obj-y += sifive_prci.o -obj-y += sifive_plic.o -obj-y += sifive_test.o -obj-y += sifive_u.o -obj-y += sifive_uart.o -obj-y += spike.o -obj-y += virt.o +obj-$(CONFIG_SPIKE) += riscv_htif.o +obj-$(CONFIG_HART) += riscv_hart.o +obj-$(CONFIG_SIFIVE_E) += sifive_e.o +obj-$(CONFIG_SIFIVE) += sifive_clint.o +obj-$(CONFIG_SIFIVE) += sifive_prci.o +obj-$(CONFIG_SIFIVE) += sifive_plic.o +obj-$(CONFIG_SIFIVE) += sifive_test.o +obj-$(CONFIG_SIFIVE_U) += sifive_u.o +obj-$(CONFIG_SIFIVE) += sifive_uart.o +obj-$(CONFIG_SPIKE) += spike.o +obj-$(CONFIG_RISCV_VIRT) += virt.o From patchwork Sat Feb 2 07:24:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794181 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BC2D0746 for ; Sat, 2 Feb 2019 07:40:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A60B632DDD for ; Sat, 2 Feb 2019 07:40:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 99E3432EA2; Sat, 2 Feb 2019 07:40:22 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3D1A632DDD for ; Sat, 2 Feb 2019 07:40:22 +0000 (UTC) Received: from localhost ([127.0.0.1]:38775 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppuX-0004ui-Gl for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:40:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50588) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppge-0001JG-6E for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gppgd-0003J9-1R for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:00 -0500 Received: from mga14.intel.com ([192.55.52.115]:56083) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gppgc-0002jk-Iy for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:25:58 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:25:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828719" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:25:16 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:48 +0800 Message-Id: <20190202072456.6468-20-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 19/27] hw/sparc64/Makefile.objs: Create CONFIG_* for sparc64 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add the new configs to default-configs/sparc64-sofmmu.mak. Signed-off-by: Yang Zhong Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- default-configs/sparc64-softmmu.mak | 2 ++ hw/sparc64/Makefile.objs | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak index ce63d47046..1fae4888db 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -17,3 +17,5 @@ CONFIG_SUNHME=y CONFIG_MC146818RTC=y CONFIG_ISA_TESTDEV=y CONFIG_SUN4V_RTC=y +CONFIG_SUN4U=y +CONFIG_NIAGARA=y diff --git a/hw/sparc64/Makefile.objs b/hw/sparc64/Makefile.objs index 117e0ff27d..af0525c1a2 100644 --- a/hw/sparc64/Makefile.objs +++ b/hw/sparc64/Makefile.objs @@ -1,4 +1,4 @@ obj-y += sparc64.o -obj-y += sun4u_iommu.o -obj-y += sun4u.o -obj-y += niagara.o \ No newline at end of file +obj-$(CONFIG_SUN4U) += sun4u_iommu.o +obj-$(CONFIG_SUN4U) += sun4u.o +obj-$(CONFIG_NIAGARA) += niagara.o From patchwork Sat Feb 2 07:24:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794171 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 84590186E for ; Sat, 2 Feb 2019 07:35:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 74F1F327F7 for ; Sat, 2 Feb 2019 07:35:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6978B32EEB; Sat, 2 Feb 2019 07:35:22 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1BF18327F7 for ; Sat, 2 Feb 2019 07:35:22 +0000 (UTC) Received: from localhost ([127.0.0.1]:38695 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppph-0000iz-CK for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:35:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50805) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppgo-0001Te-Oj for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gppgn-0003Xt-JE for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:10 -0500 Received: from mga14.intel.com ([192.55.52.115]:56070) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gppgn-0002Ky-0u for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:09 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:25:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828722" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:25:17 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:49 +0800 Message-Id: <20190202072456.6468-21-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 20/27] hw/alpha/Makefile.objs: Create CONFIG_* for alpha 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add the new configs to default-configs/alpha-sofmmu.mak. Signed-off-by: Yang Zhong Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson --- default-configs/alpha-softmmu.mak | 1 + hw/alpha/Makefile.objs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-softmmu.mak index 4d654eaa0b..49cb7ce351 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -19,3 +19,4 @@ CONFIG_I8259=y CONFIG_MC146818RTC=y CONFIG_ISA_TESTDEV=y CONFIG_SMC37C669=y +CONFIG_DP264=y diff --git a/hw/alpha/Makefile.objs b/hw/alpha/Makefile.objs index 5c742756f0..62fdf3edec 100644 --- a/hw/alpha/Makefile.objs +++ b/hw/alpha/Makefile.objs @@ -1 +1 @@ -obj-y += dp264.o pci.o typhoon.o +obj-$(CONFIG_DP264) += dp264.o pci.o typhoon.o From patchwork Sat Feb 2 07:24:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794175 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E48F6159A for ; Sat, 2 Feb 2019 07:38:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D22FF32800 for ; Sat, 2 Feb 2019 07:38:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C40BD32EEB; Sat, 2 Feb 2019 07:38:11 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5826532800 for ; Sat, 2 Feb 2019 07:38:11 +0000 (UTC) Received: from localhost ([127.0.0.1]:38720 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppsQ-00033n-I1 for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:38:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50806) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppgo-0001Tf-PA for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gppgn-0003Y8-PC for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:10 -0500 Received: from mga14.intel.com ([192.55.52.115]:56083) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gppgn-0002jk-Bi for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:09 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:25:19 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828727" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:25:19 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:50 +0800 Message-Id: <20190202072456.6468-22-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 21/27] hw/cris/Makefile.objs: Create CONFIG_* for cris 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add the new configs to default-configs/cris-sofmmu.mak. Signed-off-by: Yang Zhong Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- default-configs/cris-softmmu.mak | 1 + hw/cris/Makefile.objs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/default-configs/cris-softmmu.mak b/default-configs/cris-softmmu.mak index d970d50158..a637c4b4bf 100644 --- a/default-configs/cris-softmmu.mak +++ b/default-configs/cris-softmmu.mak @@ -4,3 +4,4 @@ CONFIG_ETRAXFS=y CONFIG_NAND=y CONFIG_PTIMER=y CONFIG_PFLASH_CFI02=y +CONFIG_AXIS=y diff --git a/hw/cris/Makefile.objs b/hw/cris/Makefile.objs index 7624173f77..a4a27b3a13 100644 --- a/hw/cris/Makefile.objs +++ b/hw/cris/Makefile.objs @@ -1,2 +1,2 @@ obj-y += boot.o -obj-y += axis_dev88.o +obj-$(CONFIG_AXIS) += axis_dev88.o From patchwork Sat Feb 2 07:24:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794189 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7404F159A for ; Sat, 2 Feb 2019 07:43:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E78032DDD for ; Sat, 2 Feb 2019 07:43:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A87D32EA2; Sat, 2 Feb 2019 07:43:07 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B80AF32DDD for ; Sat, 2 Feb 2019 07:43:06 +0000 (UTC) Received: from localhost ([127.0.0.1]:38803 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppxB-0007FE-MO for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:43:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50811) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppgo-0001Tn-TX for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gppgo-0003YX-0c for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:10 -0500 Received: from mga14.intel.com ([192.55.52.115]:56076) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gppgn-0002hI-Jn for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:09 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:25:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828732" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:25:20 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:51 +0800 Message-Id: <20190202072456.6468-23-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 22/27] hw/hppa/Makefile.objs: Create CONFIG_* for hppa 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add the new configs to default-configs/hppa-sofmmu.mak. Signed-off-by: Yang Zhong Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- default-configs/hppa-softmmu.mak | 1 + hw/hppa/Makefile.objs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmmu.mak index 4badc0521e..b594a6ddd9 100644 --- a/default-configs/hppa-softmmu.mak +++ b/default-configs/hppa-softmmu.mak @@ -10,3 +10,4 @@ CONFIG_IDE_CMD646=y # CONFIG_IDE_MMIO=y CONFIG_VIRTIO_VGA=y CONFIG_MC146818RTC=y +CONFIG_DINO=y diff --git a/hw/hppa/Makefile.objs b/hw/hppa/Makefile.objs index bef241ed25..67838f50a3 100644 --- a/hw/hppa/Makefile.objs +++ b/hw/hppa/Makefile.objs @@ -1 +1 @@ -obj-y += machine.o pci.o dino.o +obj-$(CONFIG_DINO) += pci.o machine.o dino.o From patchwork Sat Feb 2 07:24:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794193 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DCA5F13B4 for ; Sat, 2 Feb 2019 07:45:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CCDC62C5EE for ; Sat, 2 Feb 2019 07:45:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BAE212C74C; Sat, 2 Feb 2019 07:45:34 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 69ECB2C5EE for ; Sat, 2 Feb 2019 07:45:34 +0000 (UTC) Received: from localhost ([127.0.0.1]:38853 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppzZ-00018X-N8 for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:45:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50902) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpphH-0001uj-1j for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpphB-0003ge-CN for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:35 -0500 Received: from mga14.intel.com ([192.55.52.115]:56070) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpph3-0002Ky-V8 for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:26 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:25:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828736" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:25:22 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:52 +0800 Message-Id: <20190202072456.6468-24-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 23/27] hw/moxie/Makefile.objs: Conditionally build moxie 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP CONFIG_MOXIE added for moxiesim board. Signed-off-by: Yang Zhong Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- default-configs/moxie-softmmu.mak | 1 + hw/moxie/Makefile.objs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/default-configs/moxie-softmmu.mak b/default-configs/moxie-softmmu.mak index e00d099994..17ba906dc2 100644 --- a/default-configs/moxie-softmmu.mak +++ b/default-configs/moxie-softmmu.mak @@ -5,3 +5,4 @@ CONFIG_MC146818RTC=y CONFIG_SERIAL=y CONFIG_SERIAL_ISA=y CONFIG_VGA=y +CONFIG_MOXIESIM=y diff --git a/hw/moxie/Makefile.objs b/hw/moxie/Makefile.objs index bfc90012fd..ddbf300f54 100644 --- a/hw/moxie/Makefile.objs +++ b/hw/moxie/Makefile.objs @@ -1,2 +1,2 @@ # moxie boards -obj-y += moxiesim.o +obj-$(CONFIG_MOXIESIM) += moxiesim.o From patchwork Sat Feb 2 07:24:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794177 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 62130746 for ; Sat, 2 Feb 2019 07:38:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5479C32EE4 for ; Sat, 2 Feb 2019 07:38:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4785232EEB; Sat, 2 Feb 2019 07:38:22 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E007B32800 for ; Sat, 2 Feb 2019 07:38:21 +0000 (UTC) Received: from localhost ([127.0.0.1]:38716 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppsb-00021c-6w for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:38:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpphH-0001uh-1l for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpphB-0003gz-DI for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:35 -0500 Received: from mga14.intel.com ([192.55.52.115]:56083) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpph4-0002jk-J1 for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:28 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:25:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828741" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:25:23 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:53 +0800 Message-Id: <20190202072456.6468-25-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 24/27] hw/openrisc/Makefile.objs: Create CONFIG_* for openrisc 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add the new configs to default-configs/or1k-sofmmu.mak. Signed-off-by: Yang Zhong Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- default-configs/or1k-softmmu.mak | 1 + hw/openrisc/Makefile.objs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/default-configs/or1k-softmmu.mak b/default-configs/or1k-softmmu.mak index 6f5824fd48..6a0f2ef6cf 100644 --- a/default-configs/or1k-softmmu.mak +++ b/default-configs/or1k-softmmu.mak @@ -3,3 +3,4 @@ CONFIG_SERIAL=y CONFIG_OPENCORES_ETH=y CONFIG_OMPIC=y +CONFIG_OR1K_SIM=y diff --git a/hw/openrisc/Makefile.objs b/hw/openrisc/Makefile.objs index 61246b149b..aa04de7f5a 100644 --- a/hw/openrisc/Makefile.objs +++ b/hw/openrisc/Makefile.objs @@ -1,2 +1,2 @@ obj-y = pic_cpu.o cputimer.o -obj-y += openrisc_sim.o +obj-$(CONFIG_OR1K_SIM) += openrisc_sim.o From patchwork Sat Feb 2 07:24:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794187 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E67AE746 for ; Sat, 2 Feb 2019 07:41:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB44D32DDD for ; Sat, 2 Feb 2019 07:41:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CFCAD32EA2; Sat, 2 Feb 2019 07:41:13 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8427132DDD for ; Sat, 2 Feb 2019 07:41:13 +0000 (UTC) Received: from localhost ([127.0.0.1]:38781 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppvM-0005ed-RJ for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:41:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50923) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpphI-0001w0-W3 for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpphF-0003jc-9D for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:39 -0500 Received: from mga14.intel.com ([192.55.52.115]:56076) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpphB-0002hI-Ci for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:35 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:25:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828752" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:25:24 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:54 +0800 Message-Id: <20190202072456.6468-26-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 25/27] hw/tricore/Makefile.objs: Create CONFIG_* for tricore 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add the new configs to default-configs/tricore-sofmmu.mak. Signed-off-by: Yang Zhong Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- default-configs/tricore-softmmu.mak | 1 + hw/tricore/Makefile.objs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/default-configs/tricore-softmmu.mak b/default-configs/tricore-softmmu.mak index e69de29bb2..c397cff38a 100644 --- a/default-configs/tricore-softmmu.mak +++ b/default-configs/tricore-softmmu.mak @@ -0,0 +1 @@ +CONFIG_TRICORE=y diff --git a/hw/tricore/Makefile.objs b/hw/tricore/Makefile.objs index 435e095cff..5501f6c1a8 100644 --- a/hw/tricore/Makefile.objs +++ b/hw/tricore/Makefile.objs @@ -1 +1 @@ -obj-y += tricore_testboard.o +obj-$(CONFIG_TRICORE) += tricore_testboard.o From patchwork Sat Feb 2 07:24:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794183 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2E2D3159A for ; Sat, 2 Feb 2019 07:41:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1FC9632DDD for ; Sat, 2 Feb 2019 07:41:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 12ECC32EA2; Sat, 2 Feb 2019 07:41:04 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A9B0D32DDD for ; Sat, 2 Feb 2019 07:41:03 +0000 (UTC) Received: from localhost ([127.0.0.1]:38777 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gppvD-0005Uk-0V for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:41:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50989) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpphQ-00024O-Uq for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpphN-0003pQ-2C for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:47 -0500 Received: from mga14.intel.com ([192.55.52.115]:56070) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpphJ-0002Ky-8k for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:43 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:25:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828758" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:25:26 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:55 +0800 Message-Id: <20190202072456.6468-27-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 26/27] hw/i2c/Makefile.objs: Create new CONFIG_* variables for EEPROM and ACPI controller 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Paolo Bonzini Create separate variables for these components, they are used in many boards but not all. This allows finer-grain selection of the included code with default-configs/*.mak. Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- default-configs/arm-softmmu.mak | 1 + default-configs/i386-softmmu.mak | 2 ++ default-configs/mips-softmmu-common.mak | 2 ++ default-configs/ppc-softmmu.mak | 1 + hw/i2c/Makefile.objs | 5 +++-- 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 1db36396b1..d700d093f3 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -151,6 +151,7 @@ CONFIG_ACPI=y CONFIG_ARM_VIRT=y CONFIG_SMBIOS=y CONFIG_ASPEED_SOC=y +CONFIG_SMBUS_EEPROM=y CONFIG_GPIO_KEY=y CONFIG_MSF2=y CONFIG_FW_CFG_DMA=y diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 71c9f6fbcb..15b628757b 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -62,6 +62,8 @@ CONFIG_I82801B11=y CONFIG_SMBIOS=y CONFIG_PXB=y CONFIG_ACPI_VMGENID=y +CONFIG_ACPI_SMBUS=y +CONFIG_SMBUS_EEPROM=y CONFIG_FW_CFG_DMA=y CONFIG_I2C=y CONFIG_SEV=$(CONFIG_KVM) diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak index 479fb4d900..ded74980e1 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -39,3 +39,5 @@ CONFIG_I2C=y CONFIG_R4K=y CONFIG_MALTA=y CONFIG_MIPSSIM=y +CONFIG_ACPI_SMBUS=y +CONFIG_SMBUS_EEPROM=y diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index 7f80f0ccba..52acb7cf39 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -36,6 +36,7 @@ CONFIG_AT24C=y CONFIG_BITBANG_I2C=y CONFIG_M41T80=y CONFIG_VGA_CIRRUS=y +CONFIG_SMBUS_EEPROM=y # For Macs CONFIG_ESCC=y diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs index 82e747e1cd..cecee486f7 100644 --- a/hw/i2c/Makefile.objs +++ b/hw/i2c/Makefile.objs @@ -1,8 +1,9 @@ -common-obj-$(CONFIG_I2C) += core.o smbus.o smbus_eeprom.o +common-obj-$(CONFIG_I2C) += core.o smbus.o +common-obj-$(CONFIG_SMBUS_EEPROM) += smbus_eeprom.o common-obj-$(CONFIG_DDC) += i2c-ddc.o common-obj-$(CONFIG_VERSATILE_I2C) += versatile_i2c.o common-obj-$(CONFIG_ACPI_X86) += smbus_ich9.o -common-obj-$(CONFIG_APM) += pm_smbus.o +common-obj-$(CONFIG_ACPI_SMBUS) += pm_smbus.o common-obj-$(CONFIG_BITBANG_I2C) += bitbang_i2c.o common-obj-$(CONFIG_EXYNOS4) += exynos4210_i2c.o common-obj-$(CONFIG_IMX_I2C) += imx_i2c.o From patchwork Sat Feb 2 07:24:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Zhong X-Patchwork-Id: 10794197 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0529813B4 for ; Sat, 2 Feb 2019 07:48:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D67CC2C5EE for ; Sat, 2 Feb 2019 07:48:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C85D32C74C; Sat, 2 Feb 2019 07:48:01 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3CD2D2C5EE for ; Sat, 2 Feb 2019 07:48:01 +0000 (UTC) Received: from localhost ([127.0.0.1]:38869 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpq1w-0002Bg-Jr for patchwork-qemu-devel@patchwork.kernel.org; Sat, 02 Feb 2019 02:48:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50987) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpphQ-00024N-Um for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpphN-0003pK-1t for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:47 -0500 Received: from mga14.intel.com ([192.55.52.115]:56083) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpphJ-0002jk-6l for qemu-devel@nongnu.org; Sat, 02 Feb 2019 02:26:43 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2019 23:25:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,551,1539673200"; d="scan'208";a="111828765" Received: from he.bj.intel.com ([10.238.157.85]) by orsmga007.jf.intel.com with ESMTP; 01 Feb 2019 23:25:27 -0800 From: Yang Zhong To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2019 15:24:56 +0800 Message-Id: <20190202072456.6468-28-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190202072456.6468-1-yang.zhong@intel.com> References: <20190202072456.6468-1-yang.zhong@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 27/27] hw/vfio/Makefile.objs: Create new CONFIG_* variables for VFIO core and PCI 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: yang.zhong@intel.com, pbonzini@redhat.com, thuth@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Paolo Bonzini Make hw/vfio configurable and add new CONFIG_VFIO_* to the default-configs/s390x*-softmmu.mak. This allow a finer-grain selection of the various VFIO backends. Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- default-configs/arm-softmmu.mak | 2 ++ default-configs/pci.mak | 2 ++ default-configs/ppc64-softmmu.mak | 1 + default-configs/s390x-softmmu.mak | 5 +++-- hw/Makefile.objs | 2 +- hw/vfio/Makefile.objs | 7 +++---- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index d700d093f3..734ca721e9 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -124,6 +124,8 @@ CONFIG_VERSATILE_PCI=y CONFIG_VERSATILE_I2C=y CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y +CONFIG_VFIO=$(CONFIG_LINUX) +CONFIG_VFIO_PLATFORM=y CONFIG_VFIO_XGMAC=y CONFIG_VFIO_AMD_XGBE=y diff --git a/default-configs/pci.mak b/default-configs/pci.mak index 83738cbb65..037636fa33 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -47,3 +47,5 @@ CONFIG_VGA_PCI=y CONFIG_BOCHS_DISPLAY=y CONFIG_IVSHMEM_DEVICE=$(CONFIG_IVSHMEM) CONFIG_ROCKER=y +CONFIG_VFIO=$(CONFIG_LINUX) +CONFIG_VFIO_PCI=y diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak index 7f34ad0528..ccd7b179df 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -18,6 +18,7 @@ CONFIG_XICS_SPAPR=$(CONFIG_PSERIES) CONFIG_XICS_KVM=$(call land,$(CONFIG_PSERIES),$(CONFIG_KVM)) CONFIG_XIVE=$(CONFIG_PSERIES) CONFIG_XIVE_SPAPR=$(CONFIG_PSERIES) +CONFIG_VFIO_SPAPR=$(CONFIG_PSERIES) CONFIG_MEM_DEVICE=y CONFIG_DIMM=y CONFIG_SPAPR_RNG=y diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak index 8bb7e438c8..6f2c6cec18 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -5,7 +5,8 @@ CONFIG_SCLPCONSOLE=y CONFIG_TERMINAL3270=y CONFIG_S390_FLIC=y CONFIG_S390_FLIC_KVM=$(CONFIG_KVM) -CONFIG_VFIO_CCW=$(CONFIG_LINUX) CONFIG_WDT_DIAG288=y -CONFIG_VFIO_AP=$(CONFIG_LINUX) CONFIG_S390_CCW_VIRTIO=y +CONFIG_VFIO=$(CONFIG_LINUX) +CONFIG_VFIO_CCW=y +CONFIG_VFIO_AP=y diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 22dd211363..e2fcd6aafc 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -30,7 +30,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += ssi/ devices-dirs-$(CONFIG_SOFTMMU) += timer/ devices-dirs-$(CONFIG_TPM) += tpm/ devices-dirs-$(CONFIG_SOFTMMU) += usb/ -devices-dirs-$(CONFIG_LINUX) += vfio/ +devices-dirs-$(CONFIG_VFIO) += vfio/ devices-dirs-$(CONFIG_SOFTMMU) += virtio/ devices-dirs-$(CONFIG_SOFTMMU) += watchdog/ devices-dirs-$(CONFIG_SOFTMMU) += xen/ diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs index 91805893f7..abad8b818c 100644 --- a/hw/vfio/Makefile.objs +++ b/hw/vfio/Makefile.objs @@ -1,8 +1,7 @@ -obj-$(CONFIG_SOFTMMU) += common.o -obj-$(CONFIG_PCI) += pci.o pci-quirks.o display.o +obj-y += common.o spapr.o +obj-$(CONFIG_VFIO_PCI) += pci.o pci-quirks.o display.o obj-$(CONFIG_VFIO_CCW) += ccw.o -obj-$(CONFIG_SOFTMMU) += platform.o +obj-$(CONFIG_VFIO_PLATFORM) += platform.o obj-$(CONFIG_VFIO_XGMAC) += calxeda-xgmac.o obj-$(CONFIG_VFIO_AMD_XGBE) += amd-xgbe.o -obj-$(CONFIG_SOFTMMU) += spapr.o obj-$(CONFIG_VFIO_AP) += ap.o