hw/pci-bridge: make building pcie-to-pci bridge configurable

Commit Message

Sebastian Ott May 15, 2023, 2:28 p.m. UTC

Introduce a CONFIG option to build the pcie-to-pci bridge. No
functional change since it's enabled per default for PCIE_PORT=y.

Signed-off-by: Sebastian Ott <[e-mail]>
---
  hw/pci-bridge/Kconfig     | 5 +++++
  hw/pci-bridge/meson.build | 3 ++-
  2 files changed, 7 insertions(+), 1 deletion(-)

Patch

diff --git a/hw/pci-bridge/Kconfig b/hw/pci-bridge/Kconfig
index 02614f49aa..67077366cc 100644
--- a/hw/pci-bridge/Kconfig
+++ b/hw/pci-bridge/Kconfig
@@ -3,6 +3,11 @@  config PCIE_PORT
      default y if PCI_DEVICES
      depends on PCI_EXPRESS && MSI_NONBROKEN

+config PCIE_PCI_BRIDGE
+    bool
+    default y if PCIE_PORT
+    depends on PCIE_PORT
+
  config PXB
      bool
      default y if Q35 || ARM_VIRT
diff --git a/hw/pci-bridge/meson.build b/hw/pci-bridge/meson.build
index fe92d43de6..0edc6c7cbf 100644
--- a/hw/pci-bridge/meson.build
+++ b/hw/pci-bridge/meson.build
@@ -2,7 +2,8 @@  pci_ss = ss.source_set()
  pci_ss.add(files('pci_bridge_dev.c'))
  pci_ss.add(when: 'CONFIG_I82801B11', if_true: files('i82801b11.c'))
  pci_ss.add(when: 'CONFIG_IOH3420', if_true: files('ioh3420.c'))
-pci_ss.add(when: 'CONFIG_PCIE_PORT', if_true: files('pcie_root_port.c', 'gen_pcie_root_port.c', 'pcie_pci_bridge.c'))
+pci_ss.add(when: 'CONFIG_PCIE_PORT', if_true: files('pcie_root_port.c', 'gen_pcie_root_port.c'))
+pci_ss.add(when: 'CONFIG_PCIE_PCI_BRIDGE', if_true: files('pcie_pci_bridge.c'))
  pci_ss.add(when: 'CONFIG_PXB', if_true: files('pci_expander_bridge.c'),
                                 if_false: files('pci_expander_bridge_stubs.c'))
  pci_ss.add(when: 'CONFIG_XIO3130', if_true: files('xio3130_upstream.c', 'xio3130_downstream.c'))