[v1] Kconfig dependencies for ARM machines

[Qemu-devel] [PATCH 20/25] hw/arm: Express dependencies of the MSF2 machine with Kconfig

Posted by Thomas Huth 6 years, 12 months ago

Add Kconfig dependencies for the emcraft-sf2 machine.

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

diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index f6193b1..729e4b8 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -30,9 +30,9 @@ CONFIG_MPS2=y
 CONFIG_RASPI=y
 CONFIG_DIGIC=y
 CONFIG_SABRELITE=y
+CONFIG_MSF2=y
 
 CONFIG_VGA=y
-CONFIG_SSI_M25P80=y
 CONFIG_IMX_FEC=y
 
 CONFIG_NRF51_SOC=y
@@ -45,5 +45,4 @@ CONFIG_PCIE_PORT=y
 CONFIG_XIO3130=y
 CONFIG_IOH3420=y
 CONFIG_I82801B11=y
-CONFIG_MSF2=y
 CONFIG_PCI_EXPRESS_DESIGNWARE=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index d98d39e..7823a16 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -362,7 +362,11 @@ config NRF51_SOC
 
 config MSF2
     bool
+    select ARM_V7M
     select PTIMER
+    select SERIAL
+    select SSI
+    select SSI_M25P80
 
 config ZAURUS
     bool
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH 20/25] hw/arm: Express dependencies of the MSF2 machine with Kconfig

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

Hi Thomas,

On 2/9/19 7:39 AM, Thomas Huth wrote:
> Add Kconfig dependencies for the emcraft-sf2 machine.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  default-configs/arm-softmmu.mak | 3 +--
>  hw/arm/Kconfig                  | 4 ++++
>  2 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index f6193b1..729e4b8 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -30,9 +30,9 @@ CONFIG_MPS2=y
>  CONFIG_RASPI=y
>  CONFIG_DIGIC=y
>  CONFIG_SABRELITE=y
> +CONFIG_MSF2=y
>  
>  CONFIG_VGA=y
> -CONFIG_SSI_M25P80=y
>  CONFIG_IMX_FEC=y
>  
>  CONFIG_NRF51_SOC=y
> @@ -45,5 +45,4 @@ CONFIG_PCIE_PORT=y
>  CONFIG_XIO3130=y
>  CONFIG_IOH3420=y
>  CONFIG_I82801B11=y
> -CONFIG_MSF2=y
>  CONFIG_PCI_EXPRESS_DESIGNWARE=y
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index d98d39e..7823a16 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -362,7 +362,11 @@ config NRF51_SOC
>  

I'd split the SoC:

>  config MSF2
>      bool
> +    select ARM_V7M
>      select PTIMER
> +    select SERIAL
> +    select SSI

from the board, moving SSI_M25P80 to:

config EMCRAFT_SF2
    bool
    select MSF2
    select SSI_M25P80

>  
>  config ZAURUS
>      bool
>