[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 49/77] hw/pci-host/Makefile.objs: make CONFIGS clear
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 49/77] hw/pci-host/Makefile.objs: make CONFIGS clear for PCI EXPRESS |
Date: |
Mon, 4 Feb 2019 19:35:51 +0100 |
From: Yang Zhong <address@hidden>
Change the CONFIGs for PCI EXPRESS and make module name more
clear for code files.
Signed-off-by: Yang Zhong <address@hidden>
Cc: Michael S. Tsirkin <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
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 d7b540c..32f4a4a 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 64c998c..2f919df 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 c2ae313..9eb1208 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 6c7be12..83738cb 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 c9c5971..fbfd1d4 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 c9c5971..fbfd1d4 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 fa461d4..a43351a 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 6d6597c..073d512 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
--
1.8.3.1
- [Qemu-devel] [PULL 36/77] unify len and addr type for memory/address APIs, (continued)
- [Qemu-devel] [PULL 36/77] unify len and addr type for memory/address APIs, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 34/77] crypto: finish removing TABs, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 39/77] i386: allow to load initrd below 4 GB for recent linux, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 35/77] ui: vnc: finish removing TABs, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 41/77] i386: hvf: Don't miss 16-bit displacement, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 43/77] scsi-generic: avoid possible out-of-bounds access to r->buf, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 42/77] gdbstub: Fix i386/x86_64 machine description and add control registers, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 48/77] vfio: move conditional up to hw/Makefile.objs, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 44/77] Remove deprecated -enable-hax option, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 46/77] arm: disable CONFIG_SERIAL_ISA, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 49/77] hw/pci-host/Makefile.objs: make CONFIGS clear for PCI EXPRESS,
Paolo Bonzini <=
- [Qemu-devel] [PULL 47/77] ide: split ioport registration to a separate file, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 45/77] qemu-options: Remove deprecated "-virtioconsole" option, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 50/77] build: actually use CONFIG_PAM, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 51/77] hw/i386/Makefile.objs: Build pc_piix* and pc_q35 boards, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 54/77] hw/microblaze/Makefile.objs: Create configs for petalogix and xilinx boards, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 52/77] hw/arm/Makefile.objs: CONFIG_ARM_VIRT created for virt board, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 53/77] hw/m68k/Makefile.objs: Conditionally build boards, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 56/77] hw/ppc/Makefile.objs: Build all boards conditinally with CONFIG_*, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 57/77] hw/sh4/Makefile.objs: New CONFIG_* varibales created for sh4 boards and device, Paolo Bonzini, 2019/02/04