From nobody Fri Jun 28 05:30:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548226863941352.14890756110026; Tue, 22 Jan 2019 23:01:03 -0800 (PST) Received: from localhost ([127.0.0.1]:56747 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmCWl-0004pB-LX for importer@patchew.org; Wed, 23 Jan 2019 02:00:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59522) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmCUj-0003Xh-7i for qemu-devel@nongnu.org; Wed, 23 Jan 2019 01:58:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmCUf-0002QU-MD for qemu-devel@nongnu.org; Wed, 23 Jan 2019 01:58:40 -0500 Received: from mga18.intel.com ([134.134.136.126]:36921) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmCUW-0002NF-NC for qemu-devel@nongnu.org; Wed, 23 Jan 2019 01:58:30 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Jan 2019 22:58:20 -0800 Received: from he.bj.intel.com ([10.238.157.85]) by orsmga001.jf.intel.com with ESMTP; 22 Jan 2019 22:58:18 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,510,1539673200"; d="scan'208";a="129980625" From: Yang Zhong To: qemu-devel@nongnu.org Date: Wed, 23 Jan 2019 14:55:35 +0800 Message-Id: <20190123065618.3520-2-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190123065618.3520-1-yang.zhong@intel.com> References: <20190123065618.3520-1-yang.zhong@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.126 Subject: [Qemu-devel] [RFC PATCH v4 01/44] 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, peter.maydell@linaro.org, thuth@redhat.com, ehabkost@redhat.com, "Michael S . Tsirkin" , pbonzini@redhat.com, sameo@linux.intel.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Change the CONFIGs for PCI EXPRESS and make module name more clear for code files. Signed-off-by: Yang Zhong Cc: Michael S. Tsirkin --- 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 2420491aac..a978320da3 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -123,7 +123,7 @@ CONFIG_VERSATILE=3Dy CONFIG_VERSATILE_PCI=3Dy CONFIG_VERSATILE_I2C=3Dy =20 -CONFIG_PCI_GENERIC=3Dy +CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy CONFIG_VFIO_XGMAC=3Dy CONFIG_VFIO_AMD_XGBE=3Dy =20 @@ -154,7 +154,7 @@ CONFIG_GPIO_KEY=3Dy CONFIG_MSF2=3Dy CONFIG_FW_CFG_DMA=3Dy CONFIG_XILINX_AXI=3Dy -CONFIG_PCI_DESIGNWARE=3Dy +CONFIG_PCI_EXPRESS_DESIGNWARE=3Dy =20 CONFIG_STRONGARM=3Dy CONFIG_HIGHBANK=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 64c998c4c8..2f919df346 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -47,7 +47,7 @@ CONFIG_ISA_TESTDEV=3Dy CONFIG_VMPORT=3Dy CONFIG_SGA=3Dy CONFIG_LPC_ICH9=3Dy -CONFIG_PCI_Q35=3Dy +CONFIG_PCI_EXPRESS_Q35=3Dy CONFIG_APIC=3Dy CONFIG_IOAPIC=3Dy CONFIG_PVPANIC=3Dy diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64e= l-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=3Dy CONFIG_VT82C686=3Dy CONFIG_MIPS_BOSTON=3Dy CONFIG_FITLOADER=3Dy -CONFIG_PCI_XILINX=3Dy +CONFIG_PCI_EXPRESS_XILINX=3Dy 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=3Dy CONFIG_MPTSAS_SCSI_PCI=3Dy CONFIG_RTL8139_PCI=3Dy CONFIG_E1000_PCI=3Dy -CONFIG_E1000E_PCI=3Dy +CONFIG_E1000E_PCI_EXPRESS=3Dy CONFIG_IDE_CORE=3Dy CONFIG_IDE_QDEV=3Dy CONFIG_IDE_PCI=3Dy 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=3Dy =20 CONFIG_CADENCE=3Dy =20 -CONFIG_PCI_GENERIC=3Dy +CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy =20 CONFIG_VGA=3Dy CONFIG_VGA_PCI=3Dy 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=3Dy =20 CONFIG_CADENCE=3Dy =20 -CONFIG_PCI_GENERIC=3Dy +CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy =20 CONFIG_VGA=3Dy CONFIG_VGA_PCI=3Dy 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) +=3D eepro100.o common-obj-$(CONFIG_PCNET_PCI) +=3D pcnet-pci.o common-obj-$(CONFIG_PCNET_COMMON) +=3D pcnet.o common-obj-$(CONFIG_E1000_PCI) +=3D e1000.o e1000x_common.o -common-obj-$(CONFIG_E1000E_PCI) +=3D net_tx_pkt.o net_rx_pkt.o -common-obj-$(CONFIG_E1000E_PCI) +=3D e1000e.o e1000e_core.o e1000x_common.o +common-obj-$(CONFIG_E1000E_PCI_EXPRESS) +=3D net_tx_pkt.o net_rx_pkt.o +common-obj-$(CONFIG_E1000E_PCI_EXPRESS) +=3D e1000e.o e1000e_core.o e1000x= _common.o common-obj-$(CONFIG_RTL8139_PCI) +=3D rtl8139.o common-obj-$(CONFIG_VMXNET3_PCI) +=3D net_tx_pkt.o net_rx_pkt.o common-obj-$(CONFIG_VMXNET3_PCI) +=3D 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) +=3D versatile.o common-obj-$(CONFIG_PCI_SABRE) +=3D sabre.o common-obj-$(CONFIG_FULONG) +=3D bonito.o common-obj-$(CONFIG_PCI_PIIX) +=3D piix.o -common-obj-$(CONFIG_PCI_Q35) +=3D q35.o -common-obj-$(CONFIG_PCI_GENERIC) +=3D gpex.o -common-obj-$(CONFIG_PCI_XILINX) +=3D xilinx-pcie.o +common-obj-$(CONFIG_PCI_EXPRESS_Q35) +=3D q35.o +common-obj-$(CONFIG_PCI_EXPRESS_GENERIC_BRIDGE) +=3D gpex.o +common-obj-$(CONFIG_PCI_EXPRESS_XILINX) +=3D xilinx-pcie.o =20 -common-obj-$(CONFIG_PCI_DESIGNWARE) +=3D designware.o +common-obj-$(CONFIG_PCI_EXPRESS_DESIGNWARE) +=3D designware.o --=20 2.17.1