[Qemu-devel] [PATCH v2 6/8] hw/core: Add a config switch for the "split-irq" device

Thomas Huth posted 8 patches 6 years, 6 months ago
Maintainers: Peter Maydell <peter.maydell@linaro.org>, Artyom Tarasenko <atar4qemu@gmail.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
There is a newer version of this series
[Qemu-devel] [PATCH v2 6/8] hw/core: Add a config switch for the "split-irq" device
Posted by Thomas Huth 6 years, 6 months ago
The "split-irq" device is currently only used by machines that use
CONFIG_ARMSSE. Let's add a proper CONFIG_SPLIT_IRQ switch for this
so that it only gets compiled when we really need it.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 hw/arm/Kconfig        | 3 +++
 hw/core/Kconfig       | 3 +++
 hw/core/Makefile.objs | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 849195c3f6..6e24c73b54 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -81,6 +81,7 @@ config MUSCA
     select ARMSSE
     select PL011
     select PL031
+    select SPLIT_IRQ
 
 config MUSICPAL
     bool
@@ -364,6 +365,7 @@ config MPS2
     select OR_IRQ
     select PL022    # Serial port
     select PL080    # DMA controller
+    select SPLIT_IRQ
 
 config FSL_IMX7
     bool
@@ -442,6 +444,7 @@ config ARMSSE
     select IOTKIT_SYSCTL
     select IOTKIT_SYSINFO
     select OR_IRQ
+    select SPLIT_IRQ
     select TZ_MPC
     select TZ_MSC
     select TZ_PPC
diff --git a/hw/core/Kconfig b/hw/core/Kconfig
index 984143456a..fffb3d62b2 100644
--- a/hw/core/Kconfig
+++ b/hw/core/Kconfig
@@ -15,3 +15,6 @@ config PLATFORM_BUS
 
 config REGISTER
     bool
+
+config SPLIT_IRQ
+    bool
diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs
index ce337bd7c9..bb1afe422a 100644
--- a/hw/core/Makefile.objs
+++ b/hw/core/Makefile.objs
@@ -19,7 +19,7 @@ common-obj-$(CONFIG_FITLOADER) += loader-fit.o
 common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o
 common-obj-$(CONFIG_REGISTER) += register.o
 common-obj-$(CONFIG_OR_IRQ) += or-irq.o
-common-obj-$(CONFIG_SOFTMMU) += split-irq.o
+common-obj-$(CONFIG_SPLIT_IRQ) += split-irq.o
 common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o
 common-obj-$(CONFIG_SOFTMMU) += generic-loader.o
 common-obj-$(CONFIG_SOFTMMU) += null-machine.o
-- 
2.21.0


Re: [Qemu-devel] [PATCH v2 6/8] hw/core: Add a config switch for the "split-irq" device
Posted by Philippe Mathieu-Daudé 6 years, 6 months ago
On 7/31/19 9:56 AM, Thomas Huth wrote:
> The "split-irq" device is currently only used by machines that use
> CONFIG_ARMSSE. Let's add a proper CONFIG_SPLIT_IRQ switch for this
> so that it only gets compiled when we really need it.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> ---
>  hw/arm/Kconfig        | 3 +++
>  hw/core/Kconfig       | 3 +++
>  hw/core/Makefile.objs | 2 +-
>  3 files changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index 849195c3f6..6e24c73b54 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -81,6 +81,7 @@ config MUSCA
>      select ARMSSE
>      select PL011
>      select PL031
> +    select SPLIT_IRQ
>  
>  config MUSICPAL
>      bool
> @@ -364,6 +365,7 @@ config MPS2
>      select OR_IRQ
>      select PL022    # Serial port
>      select PL080    # DMA controller
> +    select SPLIT_IRQ
>  
>  config FSL_IMX7
>      bool
> @@ -442,6 +444,7 @@ config ARMSSE
>      select IOTKIT_SYSCTL
>      select IOTKIT_SYSINFO
>      select OR_IRQ
> +    select SPLIT_IRQ
>      select TZ_MPC
>      select TZ_MSC
>      select TZ_PPC
> diff --git a/hw/core/Kconfig b/hw/core/Kconfig
> index 984143456a..fffb3d62b2 100644
> --- a/hw/core/Kconfig
> +++ b/hw/core/Kconfig
> @@ -15,3 +15,6 @@ config PLATFORM_BUS
>  
>  config REGISTER
>      bool
> +
> +config SPLIT_IRQ
> +    bool
> diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs
> index ce337bd7c9..bb1afe422a 100644
> --- a/hw/core/Makefile.objs
> +++ b/hw/core/Makefile.objs
> @@ -19,7 +19,7 @@ common-obj-$(CONFIG_FITLOADER) += loader-fit.o
>  common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o
>  common-obj-$(CONFIG_REGISTER) += register.o
>  common-obj-$(CONFIG_OR_IRQ) += or-irq.o
> -common-obj-$(CONFIG_SOFTMMU) += split-irq.o
> +common-obj-$(CONFIG_SPLIT_IRQ) += split-irq.o
>  common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o
>  common-obj-$(CONFIG_SOFTMMU) += generic-loader.o
>  common-obj-$(CONFIG_SOFTMMU) += null-machine.o
>