[PATCH 0/3] hw: Restrict PCMCIA to ARM target

[PATCH 0/3] hw: Restrict PCMCIA to ARM target

[Philippe Mathieu-Daudé]

Only a pair of ARM PXA machines requires the PCMCIA type.
Complete the Kconfig dependencies to only build the PCMCIA
related devices when required.

Philippe Mathieu-Daudé (3):
  hw/arm/pxa2xx: Declare PCMCIA bus with Kconfig
  hw/ide: Add Kconfig dependency MICRODRIVE -> PCMCIA
  hw/pcmcia: Do not register PCMCIA type if not required

 hw/arm/Kconfig        | 1 +
 hw/ide/Kconfig        | 1 +
 hw/pcmcia/meson.build | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

-- 
2.26.3

[PATCH 1/3] hw/arm/pxa2xx: Declare PCMCIA bus with Kconfig

[Philippe Mathieu-Daudé]

The Intel XScale PXA chipsets provide a PCMCIA controller,
which expose a PCMCIA (IDE) bus. Express this dependency using
the Kconfig 'select' expression.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/arm/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 8c37cf00da7..b887f6a5b17 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -142,6 +142,7 @@ config PXA2XX
     select SD
     select SSI
     select USB_OHCI
+    select PCMCIA
 
 config GUMSTIX
     bool
-- 
2.26.3

Re: [PATCH 1/3] hw/arm/pxa2xx: Declare PCMCIA bus with Kconfig

[Warner Losh]

[-- Attachment #1: Type: text/plain, Size: 871 bytes --]

On Sat, Apr 24, 2021 at 4:22 PM Philippe Mathieu-Daudé <f4bug@amsat.org>
wrote:

> The Intel XScale PXA chipsets provide a PCMCIA controller,
> which expose a PCMCIA (IDE) bus. Express this dependency using
> the Kconfig 'select' expression.
>

I'd consider dropping the (IDE) in the description of the PCMCIA
bus since I think it's more confusing than helpful...

Reviewed-by: Warner Losh <imp@bsdimp.com>


> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/arm/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index 8c37cf00da7..b887f6a5b17 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -142,6 +142,7 @@ config PXA2XX
>      select SD
>      select SSI
>      select USB_OHCI
> +    select PCMCIA
>
>  config GUMSTIX
>      bool
> --
> 2.26.3
>
>
>

[-- Attachment #2: Type: text/html, Size: 1537 bytes --]

Re: [PATCH 1/3] hw/arm/pxa2xx: Declare PCMCIA bus with Kconfig

[Laurent Vivier]

Le 25/04/2021 à 00:20, Philippe Mathieu-Daudé a écrit :
> The Intel XScale PXA chipsets provide a PCMCIA controller,
> which expose a PCMCIA (IDE) bus. Express this dependency using
> the Kconfig 'select' expression.
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/arm/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index 8c37cf00da7..b887f6a5b17 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -142,6 +142,7 @@ config PXA2XX
>      select SD
>      select SSI
>      select USB_OHCI
> +    select PCMCIA
>  
>  config GUMSTIX
>      bool
> 

Applied to my trivial-patches branch.

Thanks,
Laurent

[PATCH 2/3] hw/ide: Add Kconfig dependency MICRODRIVE -> PCMCIA

[Philippe Mathieu-Daudé]

The Microdrive Compact Flash can be plugged on a PCMCIA bus.
Express the dependency using the 'depends on' Kconfig expression.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/ide/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig
index 5d9106b1ac2..8e2c8934549 100644
--- a/hw/ide/Kconfig
+++ b/hw/ide/Kconfig
@@ -41,6 +41,7 @@ config IDE_VIA
 config MICRODRIVE
     bool
     select IDE_QDEV
+    depends on PCMCIA
 
 config AHCI
     bool
-- 
2.26.3

Re: [PATCH 2/3] hw/ide: Add Kconfig dependency MICRODRIVE -> PCMCIA

[Warner Losh]

[-- Attachment #1: Type: text/plain, Size: 715 bytes --]

On Sat, Apr 24, 2021 at 4:24 PM Philippe Mathieu-Daudé <f4bug@amsat.org>
wrote:

> The Microdrive Compact Flash can be plugged on a PCMCIA bus.
> Express the dependency using the 'depends on' Kconfig expression.
>

Reviewed-by: Warner Losh <imp@bsdimp.com>


> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/ide/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig
> index 5d9106b1ac2..8e2c8934549 100644
> --- a/hw/ide/Kconfig
> +++ b/hw/ide/Kconfig
> @@ -41,6 +41,7 @@ config IDE_VIA
>  config MICRODRIVE
>      bool
>      select IDE_QDEV
> +    depends on PCMCIA
>
>  config AHCI
>      bool
> --
> 2.26.3
>
>
>

[-- Attachment #2: Type: text/html, Size: 1348 bytes --]

Re: [PATCH 2/3] hw/ide: Add Kconfig dependency MICRODRIVE -> PCMCIA

[Laurent Vivier]

Le 25/04/2021 à 00:20, Philippe Mathieu-Daudé a écrit :
> The Microdrive Compact Flash can be plugged on a PCMCIA bus.
> Express the dependency using the 'depends on' Kconfig expression.
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/ide/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig
> index 5d9106b1ac2..8e2c8934549 100644
> --- a/hw/ide/Kconfig
> +++ b/hw/ide/Kconfig
> @@ -41,6 +41,7 @@ config IDE_VIA
>  config MICRODRIVE
>      bool
>      select IDE_QDEV
> +    depends on PCMCIA
>  
>  config AHCI
>      bool
> 

Applied to my trivial-patches branch.

Thanks,
Laurent

[PATCH 3/3] hw/pcmcia: Do not register PCMCIA type if not required

[Philippe Mathieu-Daudé]

If the Kconfig 'PCMCIA' value is not selected, it is pointless
to build the PCMCIA core components.

(Currently only one machine of the ARM targets requires this).

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/pcmcia/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/pcmcia/meson.build b/hw/pcmcia/meson.build
index ab50bd325d6..51f2512b8ed 100644
--- a/hw/pcmcia/meson.build
+++ b/hw/pcmcia/meson.build
@@ -1,2 +1,2 @@
-softmmu_ss.add(files('pcmcia.c'))
+softmmu_ss.add(when: 'CONFIG_PCMCIA', if_true: files('pcmcia.c'))
 softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx.c'))
-- 
2.26.3

Re: [PATCH 3/3] hw/pcmcia: Do not register PCMCIA type if not required

[Laurent Vivier]

Le 25/04/2021 à 00:20, Philippe Mathieu-Daudé a écrit :
> If the Kconfig 'PCMCIA' value is not selected, it is pointless
> to build the PCMCIA core components.
> 
> (Currently only one machine of the ARM targets requires this).
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/pcmcia/meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/pcmcia/meson.build b/hw/pcmcia/meson.build
> index ab50bd325d6..51f2512b8ed 100644
> --- a/hw/pcmcia/meson.build
> +++ b/hw/pcmcia/meson.build
> @@ -1,2 +1,2 @@
> -softmmu_ss.add(files('pcmcia.c'))
> +softmmu_ss.add(when: 'CONFIG_PCMCIA', if_true: files('pcmcia.c'))
>  softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx.c'))
> 

Applied to my trivial-patches branch.

Thanks,
Laurent

Re: [PATCH 0/3] hw: Restrict PCMCIA to ARM target

[Richard Henderson]

On 4/24/21 3:20 PM, Philippe Mathieu-Daudé wrote:
> Philippe Mathieu-Daudé (3):
>    hw/arm/pxa2xx: Declare PCMCIA bus with Kconfig
>    hw/ide: Add Kconfig dependency MICRODRIVE -> PCMCIA
>    hw/pcmcia: Do not register PCMCIA type if not required

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~