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>
This commit is contained in:
Philippe Mathieu-Daudé 2021-02-21 19:56:35 +01:00
parent 475e70bde6
commit c64bd101fe
6 changed files with 7 additions and 1 deletions

View File

@ -1400,6 +1400,7 @@ S: Odd Fixes
F: hw/char/sh_serial.c F: hw/char/sh_serial.c
F: hw/sh4/r2d.c F: hw/sh4/r2d.c
F: hw/intc/sh_intc.c F: hw/intc/sh_intc.c
F: hw/pci-host/sh_pci.c
F: hw/timer/sh_timer.c F: hw/timer/sh_timer.c
F: include/hw/sh4/sh_intc.h F: include/hw/sh4/sh_intc.h

View File

@ -68,3 +68,7 @@ config PCI_POWERNV
config REMOTE_PCIHOST config REMOTE_PCIHOST
bool bool
config SH_PCI
bool
select PCI

View File

@ -10,6 +10,7 @@ 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_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_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_REMOTE_PCIHOST', if_true: files('remote.c'))
pci_ss.add(when: 'CONFIG_SH_PCI', if_true: files('sh_pci.c'))
# PPC devices # PPC devices
pci_ss.add(when: 'CONFIG_PREP_PCI', if_true: files('prep.c')) pci_ss.add(when: 'CONFIG_PREP_PCI', if_true: files('prep.c'))

View File

@ -11,6 +11,7 @@ config R2D
select SM501 select SM501
select SH4 select SH4
select SH7750 select SH7750
select SH_PCI
config SHIX config SHIX
bool bool

View File

@ -2,7 +2,6 @@ sh4_ss = ss.source_set()
sh4_ss.add(files( sh4_ss.add(files(
'sh7750.c', 'sh7750.c',
'sh7750_regnames.c', 'sh7750_regnames.c',
'sh_pci.c'
)) ))
sh4_ss.add(when: 'CONFIG_R2D', if_true: files('r2d.c')) sh4_ss.add(when: 'CONFIG_R2D', if_true: files('r2d.c'))
sh4_ss.add(when: 'CONFIG_SHIX', if_true: files('shix.c')) sh4_ss.add(when: 'CONFIG_SHIX', if_true: files('shix.c'))