diff options
| -rw-r--r-- | hw/Makefile.objs | 11 | ||||
| -rw-r--r-- | hw/i386/Makefile.objs | 2 | ||||
| -rw-r--r-- | hw/pci/Makefile.objs | 7 | ||||
| -rw-r--r-- | hw/pci/msi.c (renamed from hw/msi.c) | 0 | ||||
| -rw-r--r-- | hw/pci/msi.h (renamed from hw/msi.h) | 0 | ||||
| -rw-r--r-- | hw/pci/msix.c (renamed from hw/msix.c) | 0 | ||||
| -rw-r--r-- | hw/pci/msix.h (renamed from hw/msix.h) | 0 | ||||
| -rw-r--r-- | hw/pci/pci-hotplug.c (renamed from hw/pci-hotplug.c) | 0 | ||||
| -rw-r--r-- | hw/pci/pci-stub.c (renamed from hw/pci-stub.c) | 0 | ||||
| -rw-r--r-- | hw/pci/pci.c (renamed from hw/pci.c) | 0 | ||||
| -rw-r--r-- | hw/pci/pci.h (renamed from hw/pci.h) | 0 | ||||
| -rw-r--r-- | hw/pci/pci_bridge.c (renamed from hw/pci_bridge.c) | 0 | ||||
| -rw-r--r-- | hw/pci/pci_bridge.h (renamed from hw/pci_bridge.h) | 0 | ||||
| -rw-r--r-- | hw/pci/pci_host.c (renamed from hw/pci_host.c) | 0 | ||||
| -rw-r--r-- | hw/pci/pci_host.h (renamed from hw/pci_host.h) | 0 | ||||
| -rw-r--r-- | hw/pci/pci_ids.h (renamed from hw/pci_ids.h) | 0 | ||||
| -rw-r--r-- | hw/pci/pci_internals.h (renamed from hw/pci_internals.h) | 0 | ||||
| -rw-r--r-- | hw/pci/pci_regs.h (renamed from hw/pci_regs.h) | 0 | ||||
| -rw-r--r-- | hw/pci/pcie.c (renamed from hw/pcie.c) | 0 | ||||
| -rw-r--r-- | hw/pci/pcie.h (renamed from hw/pcie.h) | 0 | ||||
| -rw-r--r-- | hw/pci/pcie_aer.c (renamed from hw/pcie_aer.c) | 0 | ||||
| -rw-r--r-- | hw/pci/pcie_aer.h (renamed from hw/pcie_aer.h) | 0 | ||||
| -rw-r--r-- | hw/pci/pcie_host.c (renamed from hw/pcie_host.c) | 0 | ||||
| -rw-r--r-- | hw/pci/pcie_host.h (renamed from hw/pcie_host.h) | 0 | ||||
| -rw-r--r-- | hw/pci/pcie_port.c (renamed from hw/pcie_port.c) | 0 | ||||
| -rw-r--r-- | hw/pci/pcie_port.h (renamed from hw/pcie_port.h) | 0 | ||||
| -rw-r--r-- | hw/pci/pcie_regs.h (renamed from hw/pcie_regs.h) | 0 | ||||
| -rw-r--r-- | hw/pci/shpc.c (renamed from hw/shpc.c) | 0 | ||||
| -rw-r--r-- | hw/pci/shpc.h (renamed from hw/shpc.h) | 0 | ||||
| -rw-r--r-- | hw/pci/slotid_cap.c (renamed from hw/slotid_cap.c) | 0 | ||||
| -rw-r--r-- | hw/pci/slotid_cap.h (renamed from hw/slotid_cap.h) | 0 | ||||
| -rw-r--r-- | hw/ppc/Makefile.objs | 2 |
32 files changed, 11 insertions, 11 deletions
diff --git a/hw/Makefile.objs b/hw/Makefile.objs index d581d8d..9d33b18 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -1,14 +1,10 @@ -common-obj-y = usb/ ide/ +common-obj-y = usb/ ide/ pci/ common-obj-y += loader.o common-obj-$(CONFIG_VIRTIO) += virtio-console.o common-obj-$(CONFIG_VIRTIO) += virtio-rng.o common-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o common-obj-y += fw_cfg.o -common-obj-$(CONFIG_PCI) += pci.o pci_bridge.o pci_bridge_dev.o -common-obj-$(CONFIG_PCI) += msix.o msi.o -common-obj-$(CONFIG_PCI) += shpc.o -common-obj-$(CONFIG_PCI) += slotid_cap.o -common-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o +common-obj-$(CONFIG_PCI) += pci_bridge_dev.o common-obj-$(CONFIG_PCI) += ioh3420.o xio3130_upstream.o xio3130_downstream.o common-obj-$(CONFIG_PCI) += i82801b11.o common-obj-y += watchdog.o @@ -102,8 +98,6 @@ common-obj-$(CONFIG_XGMAC) += xgmac.o # PCI watchdog devices common-obj-$(CONFIG_PCI) += wdt_i6300esb.o -common-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o pcie_port.o - # PCI network cards common-obj-$(CONFIG_NE2000_PCI) += ne2000.o common-obj-$(CONFIG_EEPRO100_PCI) += eepro100.o @@ -199,7 +193,6 @@ obj-$(CONFIG_VIRTIO) += virtio-serial-bus.o virtio-scsi.o obj-$(CONFIG_SOFTMMU) += vhost_net.o obj-$(CONFIG_VHOST_NET) += vhost.o obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/ -obj-$(CONFIG_NO_PCI) += pci-stub.o obj-$(CONFIG_VGA) += vga.o obj-$(CONFIG_SOFTMMU) += device-hotplug.o obj-$(CONFIG_XEN) += xen_domainbuild.o xen_machine_pv.o diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 0d3f6a8..257f3c1 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -2,7 +2,7 @@ obj-y += mc146818rtc.o pc.o obj-y += apic_common.o apic.o kvmvapic.o obj-y += sga.o ioapic_common.o ioapic.o piix_pci.o obj-y += vmport.o -obj-y += pci-hotplug.o smbios.o wdt_ib700.o +obj-y += pci/pci-hotplug.o smbios.o wdt_ib700.o obj-y += debugcon.o multiboot.o obj-y += pc_piix.o obj-y += pc_sysfw.o diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs new file mode 100644 index 0000000..aa7a0e8 --- /dev/null +++ b/hw/pci/Makefile.objs @@ -0,0 +1,7 @@ +common-obj-$(CONFIG_PCI) += pci.o pci_bridge.o +common-obj-$(CONFIG_PCI) += msix.o msi.o +common-obj-$(CONFIG_PCI) += shpc.o +common-obj-$(CONFIG_PCI) += slotid_cap.o +common-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o +common-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o pcie_port.o +common-obj-$(CONFIG_NO_PCI) += pci-stub.o diff --git a/hw/msix.c b/hw/pci/msix.c index 136ef09..136ef09 100644 --- a/hw/msix.c +++ b/hw/pci/msix.c diff --git a/hw/msix.h b/hw/pci/msix.h index 15211cb..15211cb 100644 --- a/hw/msix.h +++ b/hw/pci/msix.h diff --git a/hw/pci-hotplug.c b/hw/pci/pci-hotplug.c index 3bcfdcc..3bcfdcc 100644 --- a/hw/pci-hotplug.c +++ b/hw/pci/pci-hotplug.c diff --git a/hw/pci-stub.c b/hw/pci/pci-stub.c index 134c448..134c448 100644 --- a/hw/pci-stub.c +++ b/hw/pci/pci-stub.c diff --git a/hw/pci_bridge.c b/hw/pci/pci_bridge.c index 4680501..4680501 100644 --- a/hw/pci_bridge.c +++ b/hw/pci/pci_bridge.c diff --git a/hw/pci_bridge.h b/hw/pci/pci_bridge.h index a00accc..a00accc 100644 --- a/hw/pci_bridge.h +++ b/hw/pci/pci_bridge.h diff --git a/hw/pci_host.c b/hw/pci/pci_host.c index 68e328c..68e328c 100644 --- a/hw/pci_host.c +++ b/hw/pci/pci_host.c diff --git a/hw/pci_host.h b/hw/pci/pci_host.h index 4b9c300..4b9c300 100644 --- a/hw/pci_host.h +++ b/hw/pci/pci_host.h diff --git a/hw/pci_ids.h b/hw/pci/pci_ids.h index 5df7245..5df7245 100644 --- a/hw/pci_ids.h +++ b/hw/pci/pci_ids.h diff --git a/hw/pci_internals.h b/hw/pci/pci_internals.h index 21d0ce6..21d0ce6 100644 --- a/hw/pci_internals.h +++ b/hw/pci/pci_internals.h diff --git a/hw/pci_regs.h b/hw/pci/pci_regs.h index 56a404b..56a404b 100644 --- a/hw/pci_regs.h +++ b/hw/pci/pci_regs.h diff --git a/hw/pcie.c b/hw/pci/pcie.c index 7c92f19..7c92f19 100644 --- a/hw/pcie.c +++ b/hw/pci/pcie.c diff --git a/hw/pcie.h b/hw/pci/pcie.h index 4889194..4889194 100644 --- a/hw/pcie.h +++ b/hw/pci/pcie.h diff --git a/hw/pcie_aer.c b/hw/pci/pcie_aer.c index b04c164..b04c164 100644 --- a/hw/pcie_aer.c +++ b/hw/pci/pcie_aer.c diff --git a/hw/pcie_aer.h b/hw/pci/pcie_aer.h index 7539500..7539500 100644 --- a/hw/pcie_aer.h +++ b/hw/pci/pcie_aer.h diff --git a/hw/pcie_host.c b/hw/pci/pcie_host.c index c257fb4..c257fb4 100644 --- a/hw/pcie_host.c +++ b/hw/pci/pcie_host.c diff --git a/hw/pcie_host.h b/hw/pci/pcie_host.h index 3921935..3921935 100644 --- a/hw/pcie_host.h +++ b/hw/pci/pcie_host.h diff --git a/hw/pcie_port.c b/hw/pci/pcie_port.c index d6350e5..d6350e5 100644 --- a/hw/pcie_port.c +++ b/hw/pci/pcie_port.c diff --git a/hw/pcie_port.h b/hw/pci/pcie_port.h index 3709583..3709583 100644 --- a/hw/pcie_port.h +++ b/hw/pci/pcie_port.h diff --git a/hw/pcie_regs.h b/hw/pci/pcie_regs.h index 4d123d9..4d123d9 100644 --- a/hw/pcie_regs.h +++ b/hw/pci/pcie_regs.h diff --git a/hw/shpc.c b/hw/pci/shpc.c index 4597bbd..4597bbd 100644 --- a/hw/shpc.c +++ b/hw/pci/shpc.c diff --git a/hw/shpc.h b/hw/pci/shpc.h index 130b71d..130b71d 100644 --- a/hw/shpc.h +++ b/hw/pci/shpc.h diff --git a/hw/slotid_cap.c b/hw/pci/slotid_cap.c index 0106452..0106452 100644 --- a/hw/slotid_cap.c +++ b/hw/pci/slotid_cap.c diff --git a/hw/slotid_cap.h b/hw/pci/slotid_cap.h index 70db047..70db047 100644 --- a/hw/slotid_cap.h +++ b/hw/pci/slotid_cap.h diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 8fe2123..cb7cf8f 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -10,7 +10,7 @@ obj-y += ppc_newworld.o # IBM pSeries (sPAPR) obj-$(CONFIG_PSERIES) += spapr.o spapr_hcall.o spapr_rtas.o spapr_vio.o obj-$(CONFIG_PSERIES) += xics.o spapr_vty.o spapr_llan.o spapr_vscsi.o -obj-$(CONFIG_PSERIES) += spapr_pci.o pci-hotplug.o spapr_iommu.o +obj-$(CONFIG_PSERIES) += spapr_pci.o pci/pci-hotplug.o spapr_iommu.o obj-$(CONFIG_PSERIES) += spapr_events.o # PowerPC 4xx boards obj-y += ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o |