[v1] Kconfig conversion, excluding ARM and MIPS

[Qemu-devel] [PULL 40/54] lm32-softmmu.mak: express dependencies with Kconfig

Paolo Bonzini posted 54 patches 6 years, 7 months ago

Diff against v2 v3
Download mbox

Maintainers: Alberto Garcia <berto@igalia.com>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Greg Kurz <groug@kaod.org>, "Alex Bennée" <alex.bennee@linaro.org>, Peter Maydell <peter.maydell@linaro.org>, Helge Deller <deller@gmx.de>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, Cleber Rosa <crosa@redhat.com>, Halil Pasic <pasic@linux.ibm.com>, Eduardo Habkost <ehabkost@redhat.com>, Stafford Horne <shorne@gmail.com>, "Michael S. Tsirkin" <mst@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, Chris Wulff <crwulff@gmail.com>, Alistair Francis <Alistair.Francis@wdc.com>, Aleksandar Markovic <amarkovic@wavecomp.com>, Corey Minyard <minyard@acm.org>, Cornelia Huck <cohuck@redhat.com>, Richard Henderson <rth@twiddle.net>, Palmer Dabbelt <palmer@sifive.com>, Kevin Wolf <kwolf@redhat.com>, Alex Williamson <alex.williamson@redhat.com>, Guan Xuetao <gxt@mprc.pku.edu.cn>, Sagar Karandikar <sagark@eecs.berkeley.edu>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Anthony Green <green@moxielogic.com>, David Hildenbrand <david@redhat.com>, Jason Wang <jasowang@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Aleksandar Rikalo <arikalo@wavecomp.com>, Igor Mammedov <imammedo@redhat.com>, Max Filippov <jcmvbkbc@gmail.com>, Gerd Hoffmann <kraxel@redhat.com>, Fam Zheng <fam@euphon.net>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Stefan Berger <stefanb@linux.ibm.com>, Aurelien Jarno <aurelien@aurel32.net>, Bastian Koppelmann <kbastian@mail.uni-paderborn.de>, Max Reitz <mreitz@redhat.com>, Artyom Tarasenko <atar4qemu@gmail.com>, Michael Walle <michael@walle.cc>, Marek Vasut <marex@denx.de>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, David Gibson <david@gibson.dropbear.id.au>, Alistair Francis <alistair@alistair23.me>, Christian Borntraeger <borntraeger@de.ibm.com>, John Snow <jsnow@redhat.com>

There is a newer version of this series

Expand all Fold all

[Qemu-devel] [PULL 40/54] lm32-softmmu.mak: express dependencies with Kconfig

Posted by Paolo Bonzini 6 years, 7 months ago

%-softmmu.mak only keep boards and optional device
definitions in Kconfig mode.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 default-configs/lm32-softmmu.mak | 10 ++++++----
 hw/display/Kconfig               |  3 +--
 hw/lm32/Kconfig                  |  6 ++++++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/default-configs/lm32-softmmu.mak b/default-configs/lm32-softmmu.mak
index f489838..6d25966 100644
--- a/default-configs/lm32-softmmu.mak
+++ b/default-configs/lm32-softmmu.mak
@@ -1,8 +1,10 @@
 # Default configuration for lm32-softmmu
 
+# Uncomment the following lines to disable these optional devices:
+#
+#CONFIG_MILKYMIST_TMU2=n        # disabling it actually causes compile-time failures
+
+# Boards:
+#
 CONFIG_LM32=y
 CONFIG_MILKYMIST=y
-CONFIG_FRAMEBUFFER=y
-CONFIG_PFLASH_CFI01=y
-CONFIG_PFLASH_CFI02=y
-CONFIG_SD=y
diff --git a/hw/display/Kconfig b/hw/display/Kconfig
index e126cbb..a96ea76 100644
--- a/hw/display/Kconfig
+++ b/hw/display/Kconfig
@@ -70,8 +70,7 @@ config FRAMEBUFFER
 
 config MILKYMIST_TMU2
     bool
-    default y
-    depends on OPENGL && X11 && MILKYMIST
+    depends on OPENGL && X11
 
 config SM501
     bool
diff --git a/hw/lm32/Kconfig b/hw/lm32/Kconfig
index 4f45840..3d09c2d 100644
--- a/hw/lm32/Kconfig
+++ b/hw/lm32/Kconfig
@@ -1,7 +1,13 @@
 config LM32
     bool
     select PTIMER
+    select PFLASH_CFI02
 
 config MILKYMIST
     bool
+    # FIXME: disabling it results in compile-time errors
+    select MILKYMIST_TMU2 if OPENGL && X11
     select PTIMER
+    select PFLASH_CFI01
+    select FRAMEBUFFER
+    select SD
-- 
1.8.3.1

Re: [Qemu-devel] [PULL 40/54] lm32-softmmu.mak: express dependencies with Kconfig

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

On 3/4/19 7:20 PM, Paolo Bonzini wrote:
> %-softmmu.mak only keep boards and optional device
> definitions in Kconfig mode.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  default-configs/lm32-softmmu.mak | 10 ++++++----
>  hw/display/Kconfig               |  3 +--
>  hw/lm32/Kconfig                  |  6 ++++++
>  3 files changed, 13 insertions(+), 6 deletions(-)
> 
> diff --git a/default-configs/lm32-softmmu.mak b/default-configs/lm32-softmmu.mak
> index f489838..6d25966 100644
> --- a/default-configs/lm32-softmmu.mak
> +++ b/default-configs/lm32-softmmu.mak
> @@ -1,8 +1,10 @@
>  # Default configuration for lm32-softmmu
>  
> +# Uncomment the following lines to disable these optional devices:
> +#
> +#CONFIG_MILKYMIST_TMU2=n        # disabling it actually causes compile-time failures
> +
> +# Boards:
> +#
>  CONFIG_LM32=y
>  CONFIG_MILKYMIST=y
> -CONFIG_FRAMEBUFFER=y
> -CONFIG_PFLASH_CFI01=y
> -CONFIG_PFLASH_CFI02=y
> -CONFIG_SD=y
> diff --git a/hw/display/Kconfig b/hw/display/Kconfig
> index e126cbb..a96ea76 100644
> --- a/hw/display/Kconfig
> +++ b/hw/display/Kconfig
> @@ -70,8 +70,7 @@ config FRAMEBUFFER
>  
>  config MILKYMIST_TMU2
>      bool
> -    default y
> -    depends on OPENGL && X11 && MILKYMIST
> +    depends on OPENGL && X11
>  
>  config SM501
>      bool
> diff --git a/hw/lm32/Kconfig b/hw/lm32/Kconfig
> index 4f45840..3d09c2d 100644
> --- a/hw/lm32/Kconfig
> +++ b/hw/lm32/Kconfig
> @@ -1,7 +1,13 @@
>  config LM32
>      bool
>      select PTIMER
> +    select PFLASH_CFI02
>  
>  config MILKYMIST
>      bool
> +    # FIXME: disabling it results in compile-time errors
> +    select MILKYMIST_TMU2 if OPENGL && X11

This should be fixed by 57d434407a... which got merged recently, maybe
you didn't tried again after rebasing?

>      select PTIMER
> +    select PFLASH_CFI01
> +    select FRAMEBUFFER
> +    select SD
>