51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
|
From 55ea1e473095ea5be692bb4ba2e44131a4a88e73 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Zhang Jiao <zhangjiao2_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Wed, 23 Oct 2024 13:40:51 +0800
|
||
|
|
Subject: [PATCH] hw/pci-bridge: Add a Kconfig switch for the normal PCI bridge
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
cheery-pick from e779e5c05ad5d8237e2a7d8ba8b432cd24c1708b
|
||
|
|
|
||
|
|
The pci-bridge device is not usable on s390x, so introduce a Kconfig
|
||
|
|
switch that allows to disable it.
|
||
|
|
|
||
|
|
Message-ID: <20240913144844.427899-1-thuth@redhat.com>
|
||
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
||
|
|
Reviewed-by: Cédric Le Goater <clg@redhat.com>
|
||
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
Signed-off-by: Zhang Jiao <zhangjiao2_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
hw/pci-bridge/Kconfig | 5 +++++
|
||
|
|
hw/pci-bridge/meson.build | 2 +-
|
||
|
|
2 files changed, 6 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/hw/pci-bridge/Kconfig b/hw/pci-bridge/Kconfig
|
||
|
|
index 67077366cc..449ec98643 100644
|
||
|
|
--- a/hw/pci-bridge/Kconfig
|
||
|
|
+++ b/hw/pci-bridge/Kconfig
|
||
|
|
@@ -1,3 +1,8 @@
|
||
|
|
+config PCI_BRIDGE
|
||
|
|
+ bool
|
||
|
|
+ default y if PCI_DEVICES
|
||
|
|
+ depends on PCI
|
||
|
|
+
|
||
|
|
config PCIE_PORT
|
||
|
|
bool
|
||
|
|
default y if PCI_DEVICES
|
||
|
|
diff --git a/hw/pci-bridge/meson.build b/hw/pci-bridge/meson.build
|
||
|
|
index 6d5ad9f37b..a8b88e9099 100644
|
||
|
|
--- a/hw/pci-bridge/meson.build
|
||
|
|
+++ b/hw/pci-bridge/meson.build
|
||
|
|
@@ -1,5 +1,5 @@
|
||
|
|
pci_ss = ss.source_set()
|
||
|
|
-pci_ss.add(files('pci_bridge_dev.c'))
|
||
|
|
+pci_ss.add(when: 'CONFIG_PCI_BRIDGE', if_true: 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'))
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|