[v5] Kconfig dependencies for ARM machines

[Qemu-devel] [PATCH for-QEMU-4.1 v5 07/29] hw/arm: Express dependencies of the fsl-imx31 machine with Kconfig

Posted by Thomas Huth 6 years, 9 months ago

Add Kconfig dependencies for the fsl-imx31 / kzm machine.
This patch is slightly based on earlier work by Ákos Kovács (i.e.
his "hw/arm/Kconfig: Add ARM Kconfig" patch).

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 default-configs/arm-softmmu.mak | 3 +--
 hw/arm/Kconfig                  | 4 ++++
 hw/misc/Kconfig                 | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 6195b75f48..7f94811ccb 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -10,6 +10,7 @@ CONFIG_PCI_TESTDEV=y
 CONFIG_EXYNOS4=y
 CONFIG_HIGHBANK=y
 CONFIG_INTEGRATOR=y
+CONFIG_FSL_IMX31=y
 
 CONFIG_VGA=y
 CONFIG_NAND=y
@@ -68,7 +69,6 @@ CONFIG_TSC210X=y
 CONFIG_BLIZZARD=y
 CONFIG_ONENAND=y
 CONFIG_TUSB6010=y
-CONFIG_IMX=y
 CONFIG_MAINSTONE=y
 CONFIG_MPS2=y
 CONFIG_MUSCA=y
@@ -115,7 +115,6 @@ CONFIG_ALLWINNER_A10_PIC=y
 CONFIG_ALLWINNER_A10=y
 
 CONFIG_FSL_IMX6=y
-CONFIG_FSL_IMX31=y
 CONFIG_FSL_IMX25=y
 CONFIG_FSL_IMX7=y
 CONFIG_FSL_IMX6UL=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index ad3b1f9b40..9087b7d714 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -98,6 +98,10 @@ config FSL_IMX25
 
 config FSL_IMX31
     bool
+    select SERIAL
+    select IMX
+    select IMX_I2C
+    select LAN9118
 
 config FSL_IMX6
     bool
diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig
index 5f67d0d6d9..385e1b0cec 100644
--- a/hw/misc/Kconfig
+++ b/hw/misc/Kconfig
@@ -76,6 +76,8 @@ config ECCMEMCTL
 config IMX
     bool
     select PTIMER
+    select SSI
+    select USB_EHCI_SYSBUS
 
 config STM32F2XX_SYSCFG
     bool
-- 
2.21.0

Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 07/29] hw/arm: Express dependencies of the fsl-imx31 machine with Kconfig

Posted by Chubb, Peter (Data61, Kensington NSW) 6 years, 9 months ago

>>>>> "Thomas" == Thomas Huth <thuth@redhat.com> writes:

Thomas> Add Kconfig dependencies for the fsl-imx31 / kzm machine.
Thomas> This patch is slightly based on earlier work by Ákos Kovács
Thomas> (i.e.  his "hw/arm/Kconfig: Add ARM Kconfig" patch).

Thomas> Signed-off-by: Thomas Huth <thuth@redhat.com> 
Reviewed-by: Peter Chubb <peter.chubb@data61.csiro.au>
--
Dr Peter Chubb         Tel: +61 2 9490 5852      http://ts.data61.csiro.au/
Trustworthy Systems Group                     Data61, CSIRO (formerly NICTA)

Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 07/29] hw/arm: Express dependencies of the fsl-imx31 machine with Kconfig

Posted by Philippe Mathieu-Daudé 6 years, 9 months ago

On 4/18/19 8:00 PM, Thomas Huth wrote:
> Add Kconfig dependencies for the fsl-imx31 / kzm machine.
> This patch is slightly based on earlier work by Ákos Kovács (i.e.
> his "hw/arm/Kconfig: Add ARM Kconfig" patch).
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  default-configs/arm-softmmu.mak | 3 +--
>  hw/arm/Kconfig                  | 4 ++++
>  hw/misc/Kconfig                 | 2 ++
>  3 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 6195b75f48..7f94811ccb 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -10,6 +10,7 @@ CONFIG_PCI_TESTDEV=y
>  CONFIG_EXYNOS4=y
>  CONFIG_HIGHBANK=y
>  CONFIG_INTEGRATOR=y
> +CONFIG_FSL_IMX31=y
>  
>  CONFIG_VGA=y
>  CONFIG_NAND=y
> @@ -68,7 +69,6 @@ CONFIG_TSC210X=y
>  CONFIG_BLIZZARD=y
>  CONFIG_ONENAND=y
>  CONFIG_TUSB6010=y
> -CONFIG_IMX=y
>  CONFIG_MAINSTONE=y
>  CONFIG_MPS2=y
>  CONFIG_MUSCA=y
> @@ -115,7 +115,6 @@ CONFIG_ALLWINNER_A10_PIC=y
>  CONFIG_ALLWINNER_A10=y
>  
>  CONFIG_FSL_IMX6=y
> -CONFIG_FSL_IMX31=y
>  CONFIG_FSL_IMX25=y
>  CONFIG_FSL_IMX7=y
>  CONFIG_FSL_IMX6UL=y
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index ad3b1f9b40..9087b7d714 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -98,6 +98,10 @@ config FSL_IMX25
>  
>  config FSL_IMX31
>      bool
> +    select SERIAL
> +    select IMX
> +    select IMX_I2C
> +    select LAN9118

Similarly to my comment on patch 6 of this series:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

>  
>  config FSL_IMX6
>      bool
> diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig
> index 5f67d0d6d9..385e1b0cec 100644
> --- a/hw/misc/Kconfig
> +++ b/hw/misc/Kconfig
> @@ -76,6 +76,8 @@ config ECCMEMCTL
>  config IMX
>      bool
>      select PTIMER
> +    select SSI
> +    select USB_EHCI_SYSBUS
>  
>  config STM32F2XX_SYSCFG
>      bool
>