diff mbox series

[3/5] hw/ppc/ppc4xx_pci: Declare PPC4XX_PCI in Kconfig

Message ID 20231011132427.65001-4-philmd@linaro.org
State New
Headers show
Series hw/pci-host: Build ppc4xx_pci.c/ppc440_pcix.c once | expand

Commit Message

Philippe Mathieu-Daudé Oct. 11, 2023, 1:24 p.m. UTC 
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/pci-host/Kconfig | 4 ++++
 hw/ppc/Kconfig      | 2 +-
 hw/ppc/meson.build  | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

Comments

BALATON Zoltan Oct. 11, 2023, 1:42 p.m. UTC | #1 
On Wed, 11 Oct 2023, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Should this be squashed with next patch? It looks strange to have config 
defined in hw/pci-host/Kconfig but used in hw/ppc/meson.build.

Regards,
BALATON Zoltan

> ---
> hw/pci-host/Kconfig | 4 ++++
> hw/ppc/Kconfig      | 2 +-
> hw/ppc/meson.build  | 2 +-
> 3 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig
> index a07070eddf..a9030a433b 100644
> --- a/hw/pci-host/Kconfig
> +++ b/hw/pci-host/Kconfig
> @@ -6,6 +6,10 @@ config XEN_IGD_PASSTHROUGH
>     default y
>     depends on XEN && PCI_I440FX
>
> +config PPC4XX_PCI
> +    bool
> +    select PCI
> +
> config RAVEN_PCI
>     bool
>     select PCI
> diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
> index 5dfbf47ef5..e4e76e87a2 100644
> --- a/hw/ppc/Kconfig
> +++ b/hw/ppc/Kconfig
> @@ -53,7 +53,7 @@ config PPC440
> config PPC4XX
>     bool
>     select BITBANG_I2C
> -    select PCI
> +    select PPC4XX_PCI
>     select PPC_UIC
>
> config SAM460EX
> diff --git a/hw/ppc/meson.build b/hw/ppc/meson.build
> index 7c2c52434a..6931ba88b4 100644
> --- a/hw/ppc/meson.build
> +++ b/hw/ppc/meson.build
> @@ -60,8 +60,8 @@ ppc_ss.add(when: 'CONFIG_PPC440', if_true: files(
>   'ppc440_pcix.c', 'ppc440_uc.c'))
> ppc_ss.add(when: 'CONFIG_PPC4XX', if_true: files(
>   'ppc4xx_devs.c',
> -  'ppc4xx_pci.c',
>   'ppc4xx_sdram.c'))
> +ppc_ss.add(when: 'CONFIG_PPC4XX_PCI', if_true: files('ppc4xx_pci.c'))
> ppc_ss.add(when: 'CONFIG_SAM460EX', if_true: files('sam460ex.c'))
> # PReP
> ppc_ss.add(when: 'CONFIG_PREP', if_true: files('prep.c'))
>
Philippe Mathieu-Daudé Oct. 11, 2023, 2:10 p.m. UTC | #2 
On 11/10/23 15:42, BALATON Zoltan wrote:
> On Wed, 11 Oct 2023, Philippe Mathieu-Daudé wrote:
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> 
> Should this be squashed with next patch? It looks strange to have config 
> defined in hw/pci-host/Kconfig but used in hw/ppc/meson.build.

OK.

> Regards,
> BALATON Zoltan
diff mbox series

Patch

diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig
index a07070eddf..a9030a433b 100644
--- a/hw/pci-host/Kconfig
+++ b/hw/pci-host/Kconfig
@@ -6,6 +6,10 @@  config XEN_IGD_PASSTHROUGH
     default y
     depends on XEN && PCI_I440FX
 
+config PPC4XX_PCI
+    bool
+    select PCI
+
 config RAVEN_PCI
     bool
     select PCI
diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
index 5dfbf47ef5..e4e76e87a2 100644
--- a/hw/ppc/Kconfig
+++ b/hw/ppc/Kconfig
@@ -53,7 +53,7 @@  config PPC440
 config PPC4XX
     bool
     select BITBANG_I2C
-    select PCI
+    select PPC4XX_PCI
     select PPC_UIC
 
 config SAM460EX
diff --git a/hw/ppc/meson.build b/hw/ppc/meson.build
index 7c2c52434a..6931ba88b4 100644
--- a/hw/ppc/meson.build
+++ b/hw/ppc/meson.build
@@ -60,8 +60,8 @@  ppc_ss.add(when: 'CONFIG_PPC440', if_true: files(
   'ppc440_pcix.c', 'ppc440_uc.c'))
 ppc_ss.add(when: 'CONFIG_PPC4XX', if_true: files(
   'ppc4xx_devs.c',
-  'ppc4xx_pci.c',
   'ppc4xx_sdram.c'))
+ppc_ss.add(when: 'CONFIG_PPC4XX_PCI', if_true: files('ppc4xx_pci.c'))
 ppc_ss.add(when: 'CONFIG_SAM460EX', if_true: files('sam460ex.c'))
 # PReP
 ppc_ss.add(when: 'CONFIG_PREP', if_true: files('prep.c'))