[v6] Support Kconfig in QEMU

[Qemu-devel] [PATCH 47/51] sparc64-softmmu.mak: express dependencies with Kconfig

Paolo Bonzini posted 51 patches 6 years, 10 months ago

Diff against v1 v2 v3 v4 v5
Download mbox

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

Expand all Fold all

[Qemu-devel] [PATCH 47/51] sparc64-softmmu.mak: express dependencies with Kconfig

Posted by Paolo Bonzini 6 years, 10 months ago

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

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 default-configs/sparc64-softmmu.mak | 23 ++++++++---------------
 hw/sparc64/Kconfig                  | 13 +++++++++++++
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak
index 528af8f..e50030a 100644
--- a/default-configs/sparc64-softmmu.mak
+++ b/default-configs/sparc64-softmmu.mak
@@ -1,19 +1,12 @@
 # Default configuration for sparc64-softmmu
 
-CONFIG_PCI=y
-CONFIG_PCI_DEVICES=y
-CONFIG_M48T59=y
-CONFIG_SERIAL=y
-CONFIG_SERIAL_ISA=y
-CONFIG_PARALLEL=y
-CONFIG_PCKBD=y
-CONFIG_FDC=y
-CONFIG_IDE_CMD646=y
-CONFIG_PCI_SABRE=y
-CONFIG_SIMBA=y
-CONFIG_SUNHME=y
-CONFIG_MC146818RTC=y
-CONFIG_TEST_DEVICES=y
-CONFIG_SUN4V_RTC=y
+# Uncomment the following lines to disable these optional devices:
+#
+#CONFIG_PCI_DEVICES=n
+#CONFIG_SUNHME=n
+#CONFIG_TEST_DEVICES=n
+
+# Boards:
+#
 CONFIG_SUN4U=y
 CONFIG_NIAGARA=y
diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig
index 41f7295..4a8166e 100644
--- a/hw/sparc64/Kconfig
+++ b/hw/sparc64/Kconfig
@@ -1,6 +1,19 @@
 config SUN4U
     bool
+    imply PCI_DEVICES
+    imply SUNHME
+    imply TEST_DEVICES
+    select M48T59
     select ISA_BUS
+    select FDC
+    select SERIAL_ISA
+    select PCI_SABRE
+    select IDE_CMD646
+    select PARALLEL
+    select PCKBD
+    select SIMBA
 
 config NIAGARA
     bool
+    select EMPTY_SLOT
+    select SUN4V_RTC
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH 47/51] sparc64-softmmu.mak: express dependencies with Kconfig

Posted by Mark Cave-Ayland 6 years, 10 months ago

On 07/02/2019 17:57, 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/sparc64-softmmu.mak | 23 ++++++++---------------
>  hw/sparc64/Kconfig                  | 13 +++++++++++++
>  2 files changed, 21 insertions(+), 15 deletions(-)
> 
> diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak
> index 528af8f..e50030a 100644
> --- a/default-configs/sparc64-softmmu.mak
> +++ b/default-configs/sparc64-softmmu.mak
> @@ -1,19 +1,12 @@
>  # Default configuration for sparc64-softmmu
>  
> -CONFIG_PCI=y
> -CONFIG_PCI_DEVICES=y
> -CONFIG_M48T59=y
> -CONFIG_SERIAL=y
> -CONFIG_SERIAL_ISA=y
> -CONFIG_PARALLEL=y
> -CONFIG_PCKBD=y
> -CONFIG_FDC=y
> -CONFIG_IDE_CMD646=y
> -CONFIG_PCI_SABRE=y
> -CONFIG_SIMBA=y
> -CONFIG_SUNHME=y
> -CONFIG_MC146818RTC=y
> -CONFIG_TEST_DEVICES=y
> -CONFIG_SUN4V_RTC=y
> +# Uncomment the following lines to disable these optional devices:
> +#
> +#CONFIG_PCI_DEVICES=n
> +#CONFIG_SUNHME=n

Again I'm not sure what you mean by optional? sunhme has been the default NIC for the
sun4u machine for several QEMU releases now.

> +#CONFIG_TEST_DEVICES=n
> +
> +# Boards:
> +#
>  CONFIG_SUN4U=y
>  CONFIG_NIAGARA=y
> diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig
> index 41f7295..4a8166e 100644
> --- a/hw/sparc64/Kconfig
> +++ b/hw/sparc64/Kconfig
> @@ -1,6 +1,19 @@
>  config SUN4U
>      bool
> +    imply PCI_DEVICES
> +    imply SUNHME
> +    imply TEST_DEVICES
> +    select M48T59
>      select ISA_BUS
> +    select FDC
> +    select SERIAL_ISA
> +    select PCI_SABRE
> +    select IDE_CMD646
> +    select PARALLEL
> +    select PCKBD
> +    select SIMBA
>  
>  config NIAGARA
>      bool
> +    select EMPTY_SLOT
> +    select SUN4V_RTC
> 


ATB,

Mark.