[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 086/142] meson: convert hw/pci-host
From: |
Paolo Bonzini |
Subject: |
[PATCH 086/142] meson: convert hw/pci-host |
Date: |
Tue, 28 Jan 2020 18:52:46 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/Makefile.objs | 2 +-
hw/meson.build | 1 +
hw/pci-host/Makefile.objs | 22 ----------------------
hw/pci-host/meson.build | 23 +++++++++++++++++++++++
4 files changed, 25 insertions(+), 23 deletions(-)
delete mode 100644 hw/pci-host/Makefile.objs
create mode 100644 hw/pci-host/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 21d3f6045c..ef4c5e503e 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -22,7 +22,7 @@ devices-dirs-y += net/
devices-dirs-y += rdma/
devices-dirs-y += nvram/
devices-dirs-y += pci/
-devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/
+devices-dirs-$(CONFIG_PCI) += pci-bridge/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/meson.build b/hw/meson.build
index ed25644237..ca36e486e7 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,6 +1,7 @@
subdir('core')
subdir('mem')
subdir('nubus')
+subdir('pci-host')
subdir('pcmcia')
subdir('rtc')
subdir('scsi')
diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs
deleted file mode 100644
index 9c466fab01..0000000000
--- a/hw/pci-host/Makefile.objs
+++ /dev/null
@@ -1,22 +0,0 @@
-common-obj-$(CONFIG_PAM) += pam.o
-
-# PPC devices
-common-obj-$(CONFIG_PREP_PCI) += prep.o
-common-obj-$(CONFIG_GRACKLE_PCI) += grackle.o
-# NewWorld PowerMac
-common-obj-$(CONFIG_UNIN_PCI) += uninorth.o
-# PowerPC E500 boards
-common-obj-$(CONFIG_PPCE500_PCI) += ppce500.o
-
-# ARM devices
-common-obj-$(CONFIG_VERSATILE_PCI) += versatile.o
-
-common-obj-$(CONFIG_PCI_SABRE) += sabre.o
-common-obj-$(CONFIG_FULONG) += bonito.o
-common-obj-$(CONFIG_PCI_I440FX) += i440fx.o
-common-obj-$(CONFIG_XEN_IGD_PASSTHROUGH) += xen_igd_pt.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_EXPRESS_DESIGNWARE) += designware.o
diff --git a/hw/pci-host/meson.build b/hw/pci-host/meson.build
new file mode 100644
index 0000000000..ad5d8ad4e0
--- /dev/null
+++ b/hw/pci-host/meson.build
@@ -0,0 +1,23 @@
+pci_ss = ss.source_set()
+pci_ss.add(when: 'CONFIG_FULONG', if_true: files('bonito.c'))
+pci_ss.add(when: 'CONFIG_PAM', if_true: files('pam.c'))
+pci_ss.add(when: 'CONFIG_PCI_EXPRESS_DESIGNWARE', if_true:
files('designware.c'))
+pci_ss.add(when: 'CONFIG_PCI_EXPRESS_GENERIC_BRIDGE', if_true: files('gpex.c'))
+pci_ss.add(when: 'CONFIG_PCI_EXPRESS_Q35', if_true: files('q35.c'))
+pci_ss.add(when: 'CONFIG_PCI_EXPRESS_XILINX', if_true: files('xilinx-pcie.c'))
+pci_ss.add(when: 'CONFIG_PCI_I440FX', if_true: files('i440fx.c'))
+pci_ss.add(when: 'CONFIG_PCI_SABRE', if_true: files('sabre.c'))
+pci_ss.add(when: 'CONFIG_XEN_IGD_PASSTHROUGH', if_true: files('xen_igd_pt.c'))
+
+# PPC devices
+pci_ss.add(when: 'CONFIG_PREP_PCI', if_true: files('prep.c'))
+pci_ss.add(when: 'CONFIG_GRACKLE_PCI', if_true: files('grackle.c'))
+# NewWorld PowerMac
+pci_ss.add(when: 'CONFIG_UNIN_PCI', if_true: files('uninorth.c'))
+# PowerPC E500 boards
+pci_ss.add(when: 'CONFIG_PPCE500_PCI', if_true: files('ppce500.c'))
+
+# ARM devices
+pci_ss.add(when: 'CONFIG_VERSATILE_PCI', if_true: files('versatile.c'))
+
+softmmu_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss)
--
2.21.0
- [PATCH 076/142] meson: convert hw/virtio, (continued)
- [PATCH 076/142] meson: convert hw/virtio, Paolo Bonzini, 2020/01/28
- [PATCH 078/142] meson: convert hw/usb, Paolo Bonzini, 2020/01/28
- [PATCH 079/142] meson: convert hw/tpm, Paolo Bonzini, 2020/01/28
- [PATCH 077/142] meson: convert hw/vfio, Paolo Bonzini, 2020/01/28
- [PATCH 080/142] meson: convert hw/timer, Paolo Bonzini, 2020/01/28
- [PATCH 081/142] meson: convert hw/rtc, Paolo Bonzini, 2020/01/28
- [PATCH 082/142] meson: convert hw/ssi, Paolo Bonzini, 2020/01/28
- [PATCH 083/142] meson: convert hw/sd, Paolo Bonzini, 2020/01/28
- [PATCH 084/142] meson: convert hw/scsi, Paolo Bonzini, 2020/01/28
- [PATCH 085/142] meson: convert hw/pcmcia, Paolo Bonzini, 2020/01/28
- [PATCH 086/142] meson: convert hw/pci-host,
Paolo Bonzini <=
- [PATCH 087/142] meson: convert hw/pci-bridge, Paolo Bonzini, 2020/01/28
- [PATCH 088/142] meson: convert hw/pci, Paolo Bonzini, 2020/01/28
- [PATCH 089/142] meson: convert hw/nvram, Paolo Bonzini, 2020/01/28
- [PATCH 090/142] meson: convert hw/rdma, Paolo Bonzini, 2020/01/28
- [PATCH 091/142] meson: convert hw/net, Paolo Bonzini, 2020/01/28
- [PATCH 092/142] meson: convert hw/misc, Paolo Bonzini, 2020/01/28
- [PATCH 093/142] meson: convert hw/isa, Paolo Bonzini, 2020/01/28
- [PATCH 094/142] meson: convert hw/ipmi, Paolo Bonzini, 2020/01/28
- [PATCH 095/142] meson: convert hw/ipack, Paolo Bonzini, 2020/01/28
- [PATCH 096/142] meson: convert hw/intc, Paolo Bonzini, 2020/01/28