* [Qemu-devel] [PATCH 0/3] hw/microblaze: Kconfig cleanup
@ 2019-04-27 14:14 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-27 14:14 UTC (permalink / raw)
To: qemu-arm, qemu-devel
Cc: Paolo Bonzini, Alistair Francis, Peter Maydell,
Edgar E. Iglesias, Thomas Huth, Philippe Mathieu-Daudé
Hi Edgar, Peter,
Few fixes while cleaning Kconfig, trying to optimize builds.
Regards,
Phil.
Philippe Mathieu-Daudé (3):
hw/Kconfig: Move the generic XLNX_ZYNQMP to the root hw/Kconfig
hw/intc: Only build the xlnx-iomod-intc device for the MicroBlaze PMU
hw/dma: Do not build the xlnx_dpdma device for the MicroBlaze machines
hw/Kconfig | 3 +++
hw/dma/Makefile.objs | 1 -
hw/intc/Makefile.objs | 2 +-
hw/timer/Kconfig | 3 ---
4 files changed, 4 insertions(+), 5 deletions(-)
--
2.20.1
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Qemu-devel] [PATCH 0/3] hw/microblaze: Kconfig cleanup
@ 2019-04-27 14:14 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-27 14:14 UTC (permalink / raw)
To: qemu-arm, qemu-devel
Cc: Peter Maydell, Thomas Huth, Alistair Francis, Edgar E. Iglesias,
Paolo Bonzini, Philippe Mathieu-Daudé
Hi Edgar, Peter,
Few fixes while cleaning Kconfig, trying to optimize builds.
Regards,
Phil.
Philippe Mathieu-Daudé (3):
hw/Kconfig: Move the generic XLNX_ZYNQMP to the root hw/Kconfig
hw/intc: Only build the xlnx-iomod-intc device for the MicroBlaze PMU
hw/dma: Do not build the xlnx_dpdma device for the MicroBlaze machines
hw/Kconfig | 3 +++
hw/dma/Makefile.objs | 1 -
hw/intc/Makefile.objs | 2 +-
hw/timer/Kconfig | 3 ---
4 files changed, 4 insertions(+), 5 deletions(-)
--
2.20.1
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Qemu-devel] [PATCH 1/3] hw/Kconfig: Move the generic XLNX_ZYNQMP to the root hw/Kconfig
@ 2019-04-27 14:14 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-27 14:14 UTC (permalink / raw)
To: qemu-arm, qemu-devel
Cc: Paolo Bonzini, Alistair Francis, Peter Maydell,
Edgar E. Iglesias, Thomas Huth, Philippe Mathieu-Daudé
The XLNX_ZYNQMP config is used in multiple subdirectories
(timer, intc). Move it to the root hw/Kconfig.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/Kconfig | 3 +++
hw/timer/Kconfig | 3 ---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/Kconfig b/hw/Kconfig
index 88b9f150070..c3c78f43eb5 100644
--- a/hw/Kconfig
+++ b/hw/Kconfig
@@ -72,3 +72,6 @@ config XILINX
config XILINX_AXI
bool
select PTIMER # for hw/dma/xilinx_axidma.c
+
+config XLNX_ZYNQMP
+ bool
diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig
index 51921eb63f1..eefc95f35ec 100644
--- a/hw/timer/Kconfig
+++ b/hw/timer/Kconfig
@@ -34,9 +34,6 @@ config TWL92230
bool
depends on I2C
-config XLNX_ZYNQMP
- bool
-
config ALTERA_TIMER
bool
select PTIMER
--
2.20.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [Qemu-devel] [PATCH 1/3] hw/Kconfig: Move the generic XLNX_ZYNQMP to the root hw/Kconfig
@ 2019-04-27 14:14 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-27 14:14 UTC (permalink / raw)
To: qemu-arm, qemu-devel
Cc: Peter Maydell, Thomas Huth, Alistair Francis, Edgar E. Iglesias,
Paolo Bonzini, Philippe Mathieu-Daudé
The XLNX_ZYNQMP config is used in multiple subdirectories
(timer, intc). Move it to the root hw/Kconfig.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/Kconfig | 3 +++
hw/timer/Kconfig | 3 ---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/Kconfig b/hw/Kconfig
index 88b9f150070..c3c78f43eb5 100644
--- a/hw/Kconfig
+++ b/hw/Kconfig
@@ -72,3 +72,6 @@ config XILINX
config XILINX_AXI
bool
select PTIMER # for hw/dma/xilinx_axidma.c
+
+config XLNX_ZYNQMP
+ bool
diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig
index 51921eb63f1..eefc95f35ec 100644
--- a/hw/timer/Kconfig
+++ b/hw/timer/Kconfig
@@ -34,9 +34,6 @@ config TWL92230
bool
depends on I2C
-config XLNX_ZYNQMP
- bool
-
config ALTERA_TIMER
bool
select PTIMER
--
2.20.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [Qemu-devel] [PATCH 2/3] hw/intc: Only build the xlnx-iomod-intc device for the MicroBlaze PMU
@ 2019-04-27 14:14 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-27 14:14 UTC (permalink / raw)
To: qemu-arm, qemu-devel
Cc: Paolo Bonzini, Alistair Francis, Peter Maydell,
Edgar E. Iglesias, Thomas Huth, Philippe Mathieu-Daudé
The Xilinx I/O Module Interrupt Controller is only used by the
MicroBlaze PMU, not by the AArch64 machine.
Move it from the generic ZynqMP object list to the PMU specific.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/intc/Makefile.objs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs
index df712c3e6c9..247e8016cb8 100644
--- a/hw/intc/Makefile.objs
+++ b/hw/intc/Makefile.objs
@@ -3,7 +3,7 @@ common-obj-$(CONFIG_I8259) += i8259_common.o i8259.o
common-obj-$(CONFIG_PL190) += pl190.o
common-obj-$(CONFIG_PUV3) += puv3_intc.o
common-obj-$(CONFIG_XILINX) += xilinx_intc.o
-common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-pmu-iomod-intc.o
+common-obj-$(CONFIG_XLNX_ZYNQMP_PMU) += xlnx-pmu-iomod-intc.o
common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp-ipi.o
common-obj-$(CONFIG_ETRAXFS) += etraxfs_pic.o
common-obj-$(CONFIG_IMX) += imx_avic.o imx_gpcv2.o
--
2.20.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [Qemu-devel] [PATCH 2/3] hw/intc: Only build the xlnx-iomod-intc device for the MicroBlaze PMU
@ 2019-04-27 14:14 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-27 14:14 UTC (permalink / raw)
To: qemu-arm, qemu-devel
Cc: Peter Maydell, Thomas Huth, Alistair Francis, Edgar E. Iglesias,
Paolo Bonzini, Philippe Mathieu-Daudé
The Xilinx I/O Module Interrupt Controller is only used by the
MicroBlaze PMU, not by the AArch64 machine.
Move it from the generic ZynqMP object list to the PMU specific.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/intc/Makefile.objs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs
index df712c3e6c9..247e8016cb8 100644
--- a/hw/intc/Makefile.objs
+++ b/hw/intc/Makefile.objs
@@ -3,7 +3,7 @@ common-obj-$(CONFIG_I8259) += i8259_common.o i8259.o
common-obj-$(CONFIG_PL190) += pl190.o
common-obj-$(CONFIG_PUV3) += puv3_intc.o
common-obj-$(CONFIG_XILINX) += xilinx_intc.o
-common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-pmu-iomod-intc.o
+common-obj-$(CONFIG_XLNX_ZYNQMP_PMU) += xlnx-pmu-iomod-intc.o
common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp-ipi.o
common-obj-$(CONFIG_ETRAXFS) += etraxfs_pic.o
common-obj-$(CONFIG_IMX) += imx_avic.o imx_gpcv2.o
--
2.20.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [Qemu-devel] [PATCH 3/3] hw/dma: Do not build the xlnx_dpdma device for the MicroBlaze machines
@ 2019-04-27 14:14 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-27 14:14 UTC (permalink / raw)
To: qemu-arm, qemu-devel
Cc: Paolo Bonzini, Alistair Francis, Peter Maydell,
Edgar E. Iglesias, Thomas Huth, Philippe Mathieu-Daudé
The xlnx_dpdma device is only used by the ZynqMP AArch64 machine
(not the MicroBlaze PMU). Remove it from the ZynqMP generic objects.
(Note, this entry was duplicated for the AArch64).
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/dma/Makefile.objs | 1 -
1 file changed, 1 deletion(-)
diff --git a/hw/dma/Makefile.objs b/hw/dma/Makefile.objs
index 79affecc390..a5b1276f52a 100644
--- a/hw/dma/Makefile.objs
+++ b/hw/dma/Makefile.objs
@@ -8,7 +8,6 @@ common-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o
common-obj-$(CONFIG_ZYNQ_DEVCFG) += xlnx-zynq-devcfg.o
common-obj-$(CONFIG_ETRAXFS) += etraxfs_dma.o
common-obj-$(CONFIG_STP2000) += sparc32_dma.o
-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx_dpdma.o
obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dpdma.o
common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zdma.o
--
2.20.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [Qemu-devel] [PATCH 3/3] hw/dma: Do not build the xlnx_dpdma device for the MicroBlaze machines
@ 2019-04-27 14:14 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-27 14:14 UTC (permalink / raw)
To: qemu-arm, qemu-devel
Cc: Peter Maydell, Thomas Huth, Alistair Francis, Edgar E. Iglesias,
Paolo Bonzini, Philippe Mathieu-Daudé
The xlnx_dpdma device is only used by the ZynqMP AArch64 machine
(not the MicroBlaze PMU). Remove it from the ZynqMP generic objects.
(Note, this entry was duplicated for the AArch64).
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/dma/Makefile.objs | 1 -
1 file changed, 1 deletion(-)
diff --git a/hw/dma/Makefile.objs b/hw/dma/Makefile.objs
index 79affecc390..a5b1276f52a 100644
--- a/hw/dma/Makefile.objs
+++ b/hw/dma/Makefile.objs
@@ -8,7 +8,6 @@ common-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o
common-obj-$(CONFIG_ZYNQ_DEVCFG) += xlnx-zynq-devcfg.o
common-obj-$(CONFIG_ETRAXFS) += etraxfs_dma.o
common-obj-$(CONFIG_STP2000) += sparc32_dma.o
-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx_dpdma.o
obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dpdma.o
common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zdma.o
--
2.20.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [Qemu-devel] [PATCH 2/3] hw/intc: Only build the xlnx-iomod-intc device for the MicroBlaze PMU
@ 2019-04-27 14:43 ` Thomas Huth
0 siblings, 0 replies; 24+ messages in thread
From: Thomas Huth @ 2019-04-27 14:43 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-arm, qemu-devel
Cc: Paolo Bonzini, Alistair Francis, Peter Maydell, Edgar E. Iglesias
On 27/04/2019 16.14, Philippe Mathieu-Daudé wrote:
> The Xilinx I/O Module Interrupt Controller is only used by the
> MicroBlaze PMU, not by the AArch64 machine.
> Move it from the generic ZynqMP object list to the PMU specific.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> hw/intc/Makefile.objs | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs
> index df712c3e6c9..247e8016cb8 100644
> --- a/hw/intc/Makefile.objs
> +++ b/hw/intc/Makefile.objs
> @@ -3,7 +3,7 @@ common-obj-$(CONFIG_I8259) += i8259_common.o i8259.o
> common-obj-$(CONFIG_PL190) += pl190.o
> common-obj-$(CONFIG_PUV3) += puv3_intc.o
> common-obj-$(CONFIG_XILINX) += xilinx_intc.o
> -common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-pmu-iomod-intc.o
> +common-obj-$(CONFIG_XLNX_ZYNQMP_PMU) += xlnx-pmu-iomod-intc.o
> common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp-ipi.o
> common-obj-$(CONFIG_ETRAXFS) += etraxfs_pic.o
> common-obj-$(CONFIG_IMX) += imx_avic.o imx_gpcv2.o
>
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Qemu-devel] [PATCH 2/3] hw/intc: Only build the xlnx-iomod-intc device for the MicroBlaze PMU
@ 2019-04-27 14:43 ` Thomas Huth
0 siblings, 0 replies; 24+ messages in thread
From: Thomas Huth @ 2019-04-27 14:43 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-arm, qemu-devel
Cc: Paolo Bonzini, Alistair Francis, Edgar E. Iglesias, Peter Maydell
On 27/04/2019 16.14, Philippe Mathieu-Daudé wrote:
> The Xilinx I/O Module Interrupt Controller is only used by the
> MicroBlaze PMU, not by the AArch64 machine.
> Move it from the generic ZynqMP object list to the PMU specific.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> hw/intc/Makefile.objs | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs
> index df712c3e6c9..247e8016cb8 100644
> --- a/hw/intc/Makefile.objs
> +++ b/hw/intc/Makefile.objs
> @@ -3,7 +3,7 @@ common-obj-$(CONFIG_I8259) += i8259_common.o i8259.o
> common-obj-$(CONFIG_PL190) += pl190.o
> common-obj-$(CONFIG_PUV3) += puv3_intc.o
> common-obj-$(CONFIG_XILINX) += xilinx_intc.o
> -common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-pmu-iomod-intc.o
> +common-obj-$(CONFIG_XLNX_ZYNQMP_PMU) += xlnx-pmu-iomod-intc.o
> common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp-ipi.o
> common-obj-$(CONFIG_ETRAXFS) += etraxfs_pic.o
> common-obj-$(CONFIG_IMX) += imx_avic.o imx_gpcv2.o
>
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Qemu-devel] [PATCH 3/3] hw/dma: Do not build the xlnx_dpdma device for the MicroBlaze machines
@ 2019-04-27 14:46 ` Thomas Huth
0 siblings, 0 replies; 24+ messages in thread
From: Thomas Huth @ 2019-04-27 14:46 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-arm, qemu-devel
Cc: Paolo Bonzini, Alistair Francis, Peter Maydell,
Edgar E. Iglesias, QEMU Trivial
On 27/04/2019 16.14, Philippe Mathieu-Daudé wrote:
> The xlnx_dpdma device is only used by the ZynqMP AArch64 machine
> (not the MicroBlaze PMU). Remove it from the ZynqMP generic objects.
> (Note, this entry was duplicated for the AArch64).
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> hw/dma/Makefile.objs | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/hw/dma/Makefile.objs b/hw/dma/Makefile.objs
> index 79affecc390..a5b1276f52a 100644
> --- a/hw/dma/Makefile.objs
> +++ b/hw/dma/Makefile.objs
> @@ -8,7 +8,6 @@ common-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o
> common-obj-$(CONFIG_ZYNQ_DEVCFG) += xlnx-zynq-devcfg.o
> common-obj-$(CONFIG_ETRAXFS) += etraxfs_dma.o
> common-obj-$(CONFIG_STP2000) += sparc32_dma.o
> -obj-$(CONFIG_XLNX_ZYNQMP) += xlnx_dpdma.o
> obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dpdma.o
> common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zdma.o
>
>
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Qemu-devel] [PATCH 3/3] hw/dma: Do not build the xlnx_dpdma device for the MicroBlaze machines
@ 2019-04-27 14:46 ` Thomas Huth
0 siblings, 0 replies; 24+ messages in thread
From: Thomas Huth @ 2019-04-27 14:46 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-arm, qemu-devel
Cc: QEMU Trivial, Paolo Bonzini, Alistair Francis, Edgar E. Iglesias,
Peter Maydell
On 27/04/2019 16.14, Philippe Mathieu-Daudé wrote:
> The xlnx_dpdma device is only used by the ZynqMP AArch64 machine
> (not the MicroBlaze PMU). Remove it from the ZynqMP generic objects.
> (Note, this entry was duplicated for the AArch64).
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> hw/dma/Makefile.objs | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/hw/dma/Makefile.objs b/hw/dma/Makefile.objs
> index 79affecc390..a5b1276f52a 100644
> --- a/hw/dma/Makefile.objs
> +++ b/hw/dma/Makefile.objs
> @@ -8,7 +8,6 @@ common-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o
> common-obj-$(CONFIG_ZYNQ_DEVCFG) += xlnx-zynq-devcfg.o
> common-obj-$(CONFIG_ETRAXFS) += etraxfs_dma.o
> common-obj-$(CONFIG_STP2000) += sparc32_dma.o
> -obj-$(CONFIG_XLNX_ZYNQMP) += xlnx_dpdma.o
> obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dpdma.o
> common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zdma.o
>
>
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Qemu-devel] [PATCH 1/3] hw/Kconfig: Move the generic XLNX_ZYNQMP to the root hw/Kconfig
@ 2019-04-29 17:28 ` Alistair Francis
0 siblings, 0 replies; 24+ messages in thread
From: Alistair Francis @ 2019-04-29 17:28 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: qemu-arm, qemu-devel@nongnu.org Developers, Peter Maydell,
Thomas Huth, Alistair Francis, Edgar E. Iglesias, Paolo Bonzini
On Sat, Apr 27, 2019 at 7:15 AM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
>
> The XLNX_ZYNQMP config is used in multiple subdirectories
> (timer, intc). Move it to the root hw/Kconfig.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> hw/Kconfig | 3 +++
> hw/timer/Kconfig | 3 ---
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/hw/Kconfig b/hw/Kconfig
> index 88b9f150070..c3c78f43eb5 100644
> --- a/hw/Kconfig
> +++ b/hw/Kconfig
> @@ -72,3 +72,6 @@ config XILINX
> config XILINX_AXI
> bool
> select PTIMER # for hw/dma/xilinx_axidma.c
> +
> +config XLNX_ZYNQMP
> + bool
> diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig
> index 51921eb63f1..eefc95f35ec 100644
> --- a/hw/timer/Kconfig
> +++ b/hw/timer/Kconfig
> @@ -34,9 +34,6 @@ config TWL92230
> bool
> depends on I2C
>
> -config XLNX_ZYNQMP
> - bool
> -
> config ALTERA_TIMER
> bool
> select PTIMER
> --
> 2.20.1
>
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Qemu-devel] [PATCH 1/3] hw/Kconfig: Move the generic XLNX_ZYNQMP to the root hw/Kconfig
@ 2019-04-29 17:28 ` Alistair Francis
0 siblings, 0 replies; 24+ messages in thread
From: Alistair Francis @ 2019-04-29 17:28 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Peter Maydell, Thomas Huth, Alistair Francis,
qemu-devel@nongnu.org Developers, qemu-arm, Paolo Bonzini,
Edgar E. Iglesias
On Sat, Apr 27, 2019 at 7:15 AM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
>
> The XLNX_ZYNQMP config is used in multiple subdirectories
> (timer, intc). Move it to the root hw/Kconfig.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> hw/Kconfig | 3 +++
> hw/timer/Kconfig | 3 ---
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/hw/Kconfig b/hw/Kconfig
> index 88b9f150070..c3c78f43eb5 100644
> --- a/hw/Kconfig
> +++ b/hw/Kconfig
> @@ -72,3 +72,6 @@ config XILINX
> config XILINX_AXI
> bool
> select PTIMER # for hw/dma/xilinx_axidma.c
> +
> +config XLNX_ZYNQMP
> + bool
> diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig
> index 51921eb63f1..eefc95f35ec 100644
> --- a/hw/timer/Kconfig
> +++ b/hw/timer/Kconfig
> @@ -34,9 +34,6 @@ config TWL92230
> bool
> depends on I2C
>
> -config XLNX_ZYNQMP
> - bool
> -
> config ALTERA_TIMER
> bool
> select PTIMER
> --
> 2.20.1
>
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Qemu-devel] [PATCH 2/3] hw/intc: Only build the xlnx-iomod-intc device for the MicroBlaze PMU
@ 2019-04-29 17:29 ` Alistair Francis
0 siblings, 0 replies; 24+ messages in thread
From: Alistair Francis @ 2019-04-29 17:29 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: qemu-arm, qemu-devel@nongnu.org Developers, Peter Maydell,
Thomas Huth, Alistair Francis, Edgar E. Iglesias, Paolo Bonzini
On Sat, Apr 27, 2019 at 7:17 AM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
>
> The Xilinx I/O Module Interrupt Controller is only used by the
> MicroBlaze PMU, not by the AArch64 machine.
> Move it from the generic ZynqMP object list to the PMU specific.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> hw/intc/Makefile.objs | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs
> index df712c3e6c9..247e8016cb8 100644
> --- a/hw/intc/Makefile.objs
> +++ b/hw/intc/Makefile.objs
> @@ -3,7 +3,7 @@ common-obj-$(CONFIG_I8259) += i8259_common.o i8259.o
> common-obj-$(CONFIG_PL190) += pl190.o
> common-obj-$(CONFIG_PUV3) += puv3_intc.o
> common-obj-$(CONFIG_XILINX) += xilinx_intc.o
> -common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-pmu-iomod-intc.o
> +common-obj-$(CONFIG_XLNX_ZYNQMP_PMU) += xlnx-pmu-iomod-intc.o
> common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp-ipi.o
> common-obj-$(CONFIG_ETRAXFS) += etraxfs_pic.o
> common-obj-$(CONFIG_IMX) += imx_avic.o imx_gpcv2.o
> --
> 2.20.1
>
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Qemu-devel] [PATCH 2/3] hw/intc: Only build the xlnx-iomod-intc device for the MicroBlaze PMU
@ 2019-04-29 17:29 ` Alistair Francis
0 siblings, 0 replies; 24+ messages in thread
From: Alistair Francis @ 2019-04-29 17:29 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Peter Maydell, Thomas Huth, Alistair Francis,
qemu-devel@nongnu.org Developers, qemu-arm, Paolo Bonzini,
Edgar E. Iglesias
On Sat, Apr 27, 2019 at 7:17 AM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
>
> The Xilinx I/O Module Interrupt Controller is only used by the
> MicroBlaze PMU, not by the AArch64 machine.
> Move it from the generic ZynqMP object list to the PMU specific.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> hw/intc/Makefile.objs | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs
> index df712c3e6c9..247e8016cb8 100644
> --- a/hw/intc/Makefile.objs
> +++ b/hw/intc/Makefile.objs
> @@ -3,7 +3,7 @@ common-obj-$(CONFIG_I8259) += i8259_common.o i8259.o
> common-obj-$(CONFIG_PL190) += pl190.o
> common-obj-$(CONFIG_PUV3) += puv3_intc.o
> common-obj-$(CONFIG_XILINX) += xilinx_intc.o
> -common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-pmu-iomod-intc.o
> +common-obj-$(CONFIG_XLNX_ZYNQMP_PMU) += xlnx-pmu-iomod-intc.o
> common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp-ipi.o
> common-obj-$(CONFIG_ETRAXFS) += etraxfs_pic.o
> common-obj-$(CONFIG_IMX) += imx_avic.o imx_gpcv2.o
> --
> 2.20.1
>
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Qemu-devel] [PATCH 3/3] hw/dma: Do not build the xlnx_dpdma device for the MicroBlaze machines
@ 2019-04-29 17:30 ` Alistair Francis
0 siblings, 0 replies; 24+ messages in thread
From: Alistair Francis @ 2019-04-29 17:30 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: qemu-arm, qemu-devel@nongnu.org Developers, Peter Maydell,
Thomas Huth, Alistair Francis, Edgar E. Iglesias, Paolo Bonzini
On Sat, Apr 27, 2019 at 7:15 AM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
>
> The xlnx_dpdma device is only used by the ZynqMP AArch64 machine
> (not the MicroBlaze PMU). Remove it from the ZynqMP generic objects.
> (Note, this entry was duplicated for the AArch64).
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> hw/dma/Makefile.objs | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/hw/dma/Makefile.objs b/hw/dma/Makefile.objs
> index 79affecc390..a5b1276f52a 100644
> --- a/hw/dma/Makefile.objs
> +++ b/hw/dma/Makefile.objs
> @@ -8,7 +8,6 @@ common-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o
> common-obj-$(CONFIG_ZYNQ_DEVCFG) += xlnx-zynq-devcfg.o
> common-obj-$(CONFIG_ETRAXFS) += etraxfs_dma.o
> common-obj-$(CONFIG_STP2000) += sparc32_dma.o
> -obj-$(CONFIG_XLNX_ZYNQMP) += xlnx_dpdma.o
> obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dpdma.o
> common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zdma.o
>
> --
> 2.20.1
>
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Qemu-devel] [PATCH 3/3] hw/dma: Do not build the xlnx_dpdma device for the MicroBlaze machines
@ 2019-04-29 17:30 ` Alistair Francis
0 siblings, 0 replies; 24+ messages in thread
From: Alistair Francis @ 2019-04-29 17:30 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Peter Maydell, Thomas Huth, Alistair Francis,
qemu-devel@nongnu.org Developers, qemu-arm, Paolo Bonzini,
Edgar E. Iglesias
On Sat, Apr 27, 2019 at 7:15 AM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
>
> The xlnx_dpdma device is only used by the ZynqMP AArch64 machine
> (not the MicroBlaze PMU). Remove it from the ZynqMP generic objects.
> (Note, this entry was duplicated for the AArch64).
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> hw/dma/Makefile.objs | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/hw/dma/Makefile.objs b/hw/dma/Makefile.objs
> index 79affecc390..a5b1276f52a 100644
> --- a/hw/dma/Makefile.objs
> +++ b/hw/dma/Makefile.objs
> @@ -8,7 +8,6 @@ common-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o
> common-obj-$(CONFIG_ZYNQ_DEVCFG) += xlnx-zynq-devcfg.o
> common-obj-$(CONFIG_ETRAXFS) += etraxfs_dma.o
> common-obj-$(CONFIG_STP2000) += sparc32_dma.o
> -obj-$(CONFIG_XLNX_ZYNQMP) += xlnx_dpdma.o
> obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dpdma.o
> common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zdma.o
>
> --
> 2.20.1
>
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Qemu-devel] [PATCH 0/3] hw/microblaze: Kconfig cleanup
@ 2019-04-30 19:55 ` Paolo Bonzini
0 siblings, 0 replies; 24+ messages in thread
From: Paolo Bonzini @ 2019-04-30 19:55 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-arm, qemu-devel
Cc: Alistair Francis, Peter Maydell, Edgar E. Iglesias, Thomas Huth
On 27/04/19 16:14, Philippe Mathieu-Daudé wrote:
> Hi Edgar, Peter,
>
> Few fixes while cleaning Kconfig, trying to optimize builds.
>
> Regards,
>
> Phil.
>
> Philippe Mathieu-Daudé (3):
> hw/Kconfig: Move the generic XLNX_ZYNQMP to the root hw/Kconfig
> hw/intc: Only build the xlnx-iomod-intc device for the MicroBlaze PMU
> hw/dma: Do not build the xlnx_dpdma device for the MicroBlaze machines
>
> hw/Kconfig | 3 +++
> hw/dma/Makefile.objs | 1 -
> hw/intc/Makefile.objs | 2 +-
> hw/timer/Kconfig | 3 ---
> 4 files changed, 4 insertions(+), 5 deletions(-)
>
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Qemu-devel] [PATCH 0/3] hw/microblaze: Kconfig cleanup
@ 2019-04-30 19:55 ` Paolo Bonzini
0 siblings, 0 replies; 24+ messages in thread
From: Paolo Bonzini @ 2019-04-30 19:55 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-arm, qemu-devel
Cc: Peter Maydell, Thomas Huth, Alistair Francis, Edgar E. Iglesias
On 27/04/19 16:14, Philippe Mathieu-Daudé wrote:
> Hi Edgar, Peter,
>
> Few fixes while cleaning Kconfig, trying to optimize builds.
>
> Regards,
>
> Phil.
>
> Philippe Mathieu-Daudé (3):
> hw/Kconfig: Move the generic XLNX_ZYNQMP to the root hw/Kconfig
> hw/intc: Only build the xlnx-iomod-intc device for the MicroBlaze PMU
> hw/dma: Do not build the xlnx_dpdma device for the MicroBlaze machines
>
> hw/Kconfig | 3 +++
> hw/dma/Makefile.objs | 1 -
> hw/intc/Makefile.objs | 2 +-
> hw/timer/Kconfig | 3 ---
> 4 files changed, 4 insertions(+), 5 deletions(-)
>
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Qemu-devel] [Qemu-trivial] [PATCH 3/3] hw/dma: Do not build the xlnx_dpdma device for the MicroBlaze machines
@ 2019-05-02 9:12 ` Laurent Vivier
0 siblings, 0 replies; 24+ messages in thread
From: Laurent Vivier @ 2019-05-02 9:12 UTC (permalink / raw)
To: Thomas Huth, Philippe Mathieu-Daudé, qemu-arm, qemu-devel
Cc: QEMU Trivial, Paolo Bonzini, Alistair Francis, Edgar E. Iglesias,
Peter Maydell
On 27/04/2019 16:46, Thomas Huth wrote:
> On 27/04/2019 16.14, Philippe Mathieu-Daudé wrote:
>> The xlnx_dpdma device is only used by the ZynqMP AArch64 machine
>> (not the MicroBlaze PMU). Remove it from the ZynqMP generic objects.
>> (Note, this entry was duplicated for the AArch64).
>>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> ---
>> hw/dma/Makefile.objs | 1 -
>> 1 file changed, 1 deletion(-)
>>
>> diff --git a/hw/dma/Makefile.objs b/hw/dma/Makefile.objs
>> index 79affecc390..a5b1276f52a 100644
>> --- a/hw/dma/Makefile.objs
>> +++ b/hw/dma/Makefile.objs
>> @@ -8,7 +8,6 @@ common-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o
>> common-obj-$(CONFIG_ZYNQ_DEVCFG) += xlnx-zynq-devcfg.o
>> common-obj-$(CONFIG_ETRAXFS) += etraxfs_dma.o
>> common-obj-$(CONFIG_STP2000) += sparc32_dma.o
>> -obj-$(CONFIG_XLNX_ZYNQMP) += xlnx_dpdma.o
>> obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dpdma.o
>> common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zdma.o
>>
>>
>
> Reviewed-by: Thomas Huth <thuth@redhat.com>
>
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Qemu-devel] [Qemu-trivial] [PATCH 3/3] hw/dma: Do not build the xlnx_dpdma device for the MicroBlaze machines
@ 2019-05-02 9:12 ` Laurent Vivier
0 siblings, 0 replies; 24+ messages in thread
From: Laurent Vivier @ 2019-05-02 9:12 UTC (permalink / raw)
To: Thomas Huth, Philippe Mathieu-Daudé, qemu-arm, qemu-devel
Cc: QEMU Trivial, Paolo Bonzini, Alistair Francis, Peter Maydell,
Edgar E. Iglesias
On 27/04/2019 16:46, Thomas Huth wrote:
> On 27/04/2019 16.14, Philippe Mathieu-Daudé wrote:
>> The xlnx_dpdma device is only used by the ZynqMP AArch64 machine
>> (not the MicroBlaze PMU). Remove it from the ZynqMP generic objects.
>> (Note, this entry was duplicated for the AArch64).
>>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> ---
>> hw/dma/Makefile.objs | 1 -
>> 1 file changed, 1 deletion(-)
>>
>> diff --git a/hw/dma/Makefile.objs b/hw/dma/Makefile.objs
>> index 79affecc390..a5b1276f52a 100644
>> --- a/hw/dma/Makefile.objs
>> +++ b/hw/dma/Makefile.objs
>> @@ -8,7 +8,6 @@ common-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o
>> common-obj-$(CONFIG_ZYNQ_DEVCFG) += xlnx-zynq-devcfg.o
>> common-obj-$(CONFIG_ETRAXFS) += etraxfs_dma.o
>> common-obj-$(CONFIG_STP2000) += sparc32_dma.o
>> -obj-$(CONFIG_XLNX_ZYNQMP) += xlnx_dpdma.o
>> obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dpdma.o
>> common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zdma.o
>>
>>
>
> Reviewed-by: Thomas Huth <thuth@redhat.com>
>
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Qemu-devel] [PATCH 0/3] hw/microblaze: Kconfig cleanup
2019-04-30 19:55 ` Paolo Bonzini
(?)
@ 2019-05-27 16:10 ` Philippe Mathieu-Daudé
2019-05-27 18:43 ` Paolo Bonzini
-1 siblings, 1 reply; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-05-27 16:10 UTC (permalink / raw)
To: Paolo Bonzini
Cc: Peter Maydell, Thomas Huth, Alistair Francis, QEMU Developers,
qemu-arm, Edgar E. Iglesias
Hi Paolo,
On Tue, Apr 30, 2019 at 9:55 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> On 27/04/19 16:14, Philippe Mathieu-Daudé wrote:
> > Hi Edgar, Peter,
> >
> > Few fixes while cleaning Kconfig, trying to optimize builds.
> >
> > Regards,
> >
> > Phil.
> >
> > Philippe Mathieu-Daudé (3):
> > hw/Kconfig: Move the generic XLNX_ZYNQMP to the root hw/Kconfig
> > hw/intc: Only build the xlnx-iomod-intc device for the MicroBlaze PMU
> > hw/dma: Do not build the xlnx_dpdma device for the MicroBlaze machines
> >
> > hw/Kconfig | 3 +++
> > hw/dma/Makefile.objs | 1 -
> > hw/intc/Makefile.objs | 2 +-
> > hw/timer/Kconfig | 3 ---
> > 4 files changed, 4 insertions(+), 5 deletions(-)
> >
>
> Queued, thanks.
I don't see these patches in your queue merged on "Fri 17 May", are
you planning to include them in your next batch?
Thanks,
Phil.
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Qemu-devel] [PATCH 0/3] hw/microblaze: Kconfig cleanup
2019-05-27 16:10 ` Philippe Mathieu-Daudé
@ 2019-05-27 18:43 ` Paolo Bonzini
0 siblings, 0 replies; 24+ messages in thread
From: Paolo Bonzini @ 2019-05-27 18:43 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Peter Maydell, Thomas Huth, Alistair Francis, QEMU Developers,
qemu-arm, Edgar E. Iglesias
On 27/05/19 18:10, Philippe Mathieu-Daudé wrote:
>>>
>> Queued, thanks.
> I don't see these patches in your queue merged on "Fri 17 May", are
> you planning to include them in your next batch?
Yes, thanks.
Paolo
^ permalink raw reply [flat|nested] 24+ messages in thread
end of thread, other threads:[~2019-05-27 18:44 UTC | newest]
Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-27 14:14 [Qemu-devel] [PATCH 0/3] hw/microblaze: Kconfig cleanup Philippe Mathieu-Daudé
2019-04-27 14:14 ` Philippe Mathieu-Daudé
2019-04-27 14:14 ` [Qemu-devel] [PATCH 1/3] hw/Kconfig: Move the generic XLNX_ZYNQMP to the root hw/Kconfig Philippe Mathieu-Daudé
2019-04-27 14:14 ` Philippe Mathieu-Daudé
2019-04-29 17:28 ` Alistair Francis
2019-04-29 17:28 ` Alistair Francis
2019-04-27 14:14 ` [Qemu-devel] [PATCH 2/3] hw/intc: Only build the xlnx-iomod-intc device for the MicroBlaze PMU Philippe Mathieu-Daudé
2019-04-27 14:14 ` Philippe Mathieu-Daudé
2019-04-27 14:43 ` Thomas Huth
2019-04-27 14:43 ` Thomas Huth
2019-04-29 17:29 ` Alistair Francis
2019-04-29 17:29 ` Alistair Francis
2019-04-27 14:14 ` [Qemu-devel] [PATCH 3/3] hw/dma: Do not build the xlnx_dpdma device for the MicroBlaze machines Philippe Mathieu-Daudé
2019-04-27 14:14 ` Philippe Mathieu-Daudé
2019-04-27 14:46 ` Thomas Huth
2019-04-27 14:46 ` Thomas Huth
2019-05-02 9:12 ` [Qemu-devel] [Qemu-trivial] " Laurent Vivier
2019-05-02 9:12 ` Laurent Vivier
2019-04-29 17:30 ` [Qemu-devel] " Alistair Francis
2019-04-29 17:30 ` Alistair Francis
2019-04-30 19:55 ` [Qemu-devel] [PATCH 0/3] hw/microblaze: Kconfig cleanup Paolo Bonzini
2019-04-30 19:55 ` Paolo Bonzini
2019-05-27 16:10 ` Philippe Mathieu-Daudé
2019-05-27 18:43 ` Paolo Bonzini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.