Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 12/29] hw/arm: Express dependencies of the PXA2xx machines with Kconfig

[Philippe Mathieu-Daudé]

On 4/18/19 8:00 PM, Thomas Huth wrote:
> Add Kconfig dependencies for the PXA2xx machines (akita, borzoi,
> connex and verdex gumstix, tosa, mainstone, spitz, terrier and z2).
> This patch is based on earlier work by Ákos Kovács (i.e.
> his "hw/arm/Kconfig: Add ARM Kconfig" patch).
> 
> Signed-off-by: Thomas Huth <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

> ---
>  default-configs/arm-softmmu.mak | 15 ++++--------
>  hw/arm/Kconfig                  | 42 +++++++++++++++++++++++++++++++++
>  hw/arm/Makefile.objs            |  5 +++-
>  3 files changed, 51 insertions(+), 11 deletions(-)
> 
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index df7d9421e0..f39a854f2e 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -19,22 +19,20 @@ CONFIG_STELLARIS=y
>  CONFIG_REALVIEW=y
>  CONFIG_VERSATILE=y
>  CONFIG_VEXPRESS=y
> +CONFIG_MAINSTONE=y
> +CONFIG_GUMSTIX=y
> +CONFIG_SPITZ=y
> +CONFIG_TOSA=y
> +CONFIG_Z2=y
>  
>  CONFIG_VGA=y
> -CONFIG_NAND=y
> -CONFIG_ECC=y
> -CONFIG_SERIAL=y
> -CONFIG_MAX7310=y
>  CONFIG_TMP421=y
>  CONFIG_PCA9552=y
> -CONFIG_ADS7846=y
> -CONFIG_MAX111X=y
>  CONFIG_SSI_M25P80=y
>  CONFIG_ALLWINNER_EMAC=y
>  CONFIG_IMX_FEC=y
>  CONFIG_FTGMAC100=y
>  CONFIG_DS1338=y
> -CONFIG_MICRODRIVE=y
>  CONFIG_PLATFORM_BUS=y
>  CONFIG_VIRTIO_MMIO=y
>  
> @@ -42,16 +40,13 @@ CONFIG_NETDUINO2=y
>  
>  CONFIG_PL330=y
>  CONFIG_CADENCE=y
> -CONFIG_PXA2XX=y
>  CONFIG_FRAMEBUFFER=y
>  CONFIG_XILINX_SPIPS=y
>  CONFIG_ZYNQ_DEVCFG=y
>  
>  CONFIG_DIGIC=y
> -CONFIG_MAINSTONE=y
>  CONFIG_MPS2=y
>  CONFIG_RASPI=y
> -CONFIG_ZAURUS=y
>  CONFIG_ZYNQ=y
>  CONFIG_STM32F2XX_TIMER=y
>  CONFIG_STM32F2XX_USART=y
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index b786cfc5bd..101de74260 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -48,6 +48,9 @@ config INTEGRATOR
>  
>  config MAINSTONE
>      bool
> +    select PXA2XX
> +    select PFLASH_CFI01
> +    select SMC91C111
>  
>  config MUSICPAL
>      bool
> @@ -85,6 +88,43 @@ config OMAP
>  
>  config PXA2XX
>      bool
> +    select FRAMEBUFFER
> +    select I2C
> +    select SERIAL
> +    select SD
> +    select SSI
> +    select USB_OHCI
> +
> +config GUMSTIX
> +    bool
> +    select PFLASH_CFI01
> +    select SMC91C111
> +    select PXA2XX
> +
> +config TOSA
> +    bool
> +    select ZAURUS  # scoop
> +    select MICRODRIVE
> +    select PXA2XX
> +
> +config SPITZ
> +    bool
> +    select ADS7846 # display
> +    select MAX111X # A/D converter
> +    select WM8750  # audio codec
> +    select MAX7310 # GPIO expander
> +    select ZAURUS  # scoop
> +    select NAND    # memory
> +    select ECC     # Error-correcting for NAND
> +    select MICRODRIVE
> +    select PXA2XX
> +
> +config Z2
> +    bool
> +    select PFLASH_CFI01
> +    select WM8750
> +    select PL011 # UART
> +    select PXA2XX
>  
>  config REALVIEW
>      bool
> @@ -217,6 +257,8 @@ config MSF2
>  
>  config ZAURUS
>      bool
> +    select NAND
> +    select ECC
>  
>  config A9MPCORE
>      bool
> diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
> index bd0b45a799..00328d1b0b 100644
> --- a/hw/arm/Makefile.objs
> +++ b/hw/arm/Makefile.objs
> @@ -11,7 +11,10 @@ obj-$(CONFIG_NETDUINO2) += netduino2.o
>  obj-$(CONFIG_NSERIES) += nseries.o
>  obj-$(CONFIG_SX1) += omap_sx1.o
>  obj-$(CONFIG_CHEETAH) += palm.o
> -obj-$(CONFIG_PXA2XX) += gumstix.o spitz.o tosa.o z2.o
> +obj-$(CONFIG_GUMSTIX) += gumstix.o
> +obj-$(CONFIG_SPITZ) += spitz.o
> +obj-$(CONFIG_TOSA) += tosa.o
> +obj-$(CONFIG_Z2) += z2.o
>  obj-$(CONFIG_REALVIEW) += realview.o
>  obj-$(CONFIG_STELLARIS) += stellaris.o
>  obj-$(CONFIG_STRONGARM) += collie.o
>