On 09.11.2017 13:43, Marcel Apfelbaum wrote:
The PCIE-PCI bridge is specific to "pure" PCIe systems
(on QEMU we have X86 and ARM), it does not make sense to
have if in other archs.
Reported-by: Thomas Huth <address@hidden>
Signed-off-by: Marcel Apfelbaum <address@hidden>
---
V1 -> V2:
Addressed Thomas and Cornelia comments:
- Conditioned the pcie-pci-bridge compilation on
the PCIe Root CONFIG_PCIE_PORT
- Tweaked subject PCI -> PCIe
Thanks,
Marcel
hw/pci-bridge/Makefile.objs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/pci-bridge/Makefile.objs b/hw/pci-bridge/Makefile.objs
index 666db37da2..83539f02e5 100644
--- a/hw/pci-bridge/Makefile.objs
+++ b/hw/pci-bridge/Makefile.objs
@@ -1,8 +1,10 @@
-common-obj-y += pci_bridge_dev.o pcie_pci_bridge.o
+common-obj-y += pci_bridge_dev.o
common-obj-$(CONFIG_PCIE_PORT) += pcie_root_port.o gen_pcie_root_port.o
common-obj-$(CONFIG_PXB) += pci_expander_bridge.o
+common-obj-$(CONFIG_PCIE_PCI_BRIDGE) += pcie_pci_bridge.o
common-obj-$(CONFIG_XIO3130) += xio3130_upstream.o xio3130_downstream.o
common-obj-$(CONFIG_IOH3420) += ioh3420.o
common-obj-$(CONFIG_I82801B11) += i82801b11.o
# NewWorld PowerMac
common-obj-$(CONFIG_DEC_PCI) += dec.o
+CONFIG_PCIE_PCI_BRIDGE=$(CONFIG_PCIE_PORT)
Shouldn't that last line rather go into default-configs/pci.mak instead?
AFAIK we normally don't do "^CONFIG_xxx=" in normal Makefiles ... ?