commit c64bd101fe1c47d550d02ee19543c9e400af9258
author Philippe Mathieu-Daudé <f4bug@amsat.org> Sun Feb 21 19:56:35 2021 +0100
committer Philippe Mathieu-Daudé <f4bug@amsat.org> Sat Mar 06 16:18:42 2021 +0100
tree a5058cb5dd364921fc33ec5851d8820b6b58245e
parent 475e70bde6cbde2d38d612b19107229a4ff42f11

hw/pci-host: Introduce SH_PCI Kconfig entry

We want to be able to use the 'SH4' config for architecture
specific features. Add more fine-grained selection by adding
a CONFIG_SH_PCI selector for the SH4 PCI controller.
Move the file with the other PCI host devices in hw/pci-host
and add its missing MAINTAINERS entries.

Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210222141514.2646278-8-f4bug@amsat.org>

MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 109890a..f22d83c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1400,6 +1400,7 @@
 F: hw/char/sh_serial.c
 F: hw/sh4/r2d.c
 F: hw/intc/sh_intc.c
+F: hw/pci-host/sh_pci.c
 F: hw/timer/sh_timer.c
 F: include/hw/sh4/sh_intc.h
 

hw/pci-host/Kconfig

diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig
index 8b8c763..2ccc96f 100644
--- a/hw/pci-host/Kconfig
+++ b/hw/pci-host/Kconfig
@@ -68,3 +68,7 @@
 
 config REMOTE_PCIHOST
     bool
+
+config SH_PCI
+    bool
+    select PCI

hw/pci-host/meson.build

diff --git a/hw/pci-host/meson.build b/hw/pci-host/meson.build
index 1847c69..87a8969 100644
--- a/hw/pci-host/meson.build
+++ b/hw/pci-host/meson.build
@@ -10,6 +10,7 @@
 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'))
 pci_ss.add(when: 'CONFIG_REMOTE_PCIHOST', if_true: files('remote.c'))
+pci_ss.add(when: 'CONFIG_SH_PCI', if_true: files('sh_pci.c'))
 
 # PPC devices
 pci_ss.add(when: 'CONFIG_PREP_PCI', if_true: files('prep.c'))

hw/pci-host/sh_pci.c

diff --git a/hw/sh4/sh_pci.c b/hw/pci-host/sh_pci.c
similarity index 100%
rename from hw/sh4/sh_pci.c
rename to hw/pci-host/sh_pci.c

hw/sh4/Kconfig

diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig
index 34c01da..b9f0538 100644
--- a/hw/sh4/Kconfig
+++ b/hw/sh4/Kconfig
@@ -11,6 +11,7 @@
     select SM501
     select SH4
     select SH7750
+    select SH_PCI
 
 config SHIX
     bool

hw/sh4/meson.build

diff --git a/hw/sh4/meson.build b/hw/sh4/meson.build
index 303c0f4..424d567 100644
--- a/hw/sh4/meson.build
+++ b/hw/sh4/meson.build
@@ -2,7 +2,6 @@
 sh4_ss.add(files(
   'sh7750.c',
   'sh7750_regnames.c',
-  'sh_pci.c'
 ))
 sh4_ss.add(when: 'CONFIG_R2D', if_true: files('r2d.c'))
 sh4_ss.add(when: 'CONFIG_SHIX', if_true: files('shix.c'))