Skip to contentSkip to conversation

hw/microblaze: Kconfig cleanup

PATCH Applied Philippe Mathieu-Daudé 5 participants 13 messages Apr 27, 2019 – May 27, 2019

lore
Share & tools
lore
#0 lore raw

cover hw/microblaze: Kconfig cleanup

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(-)
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/3 hw/Kconfig: Move the generic XLNX_ZYNQMP to the root hw/Kconfig

The XLNX_ZYNQMP config is used in multiple subdirectories (timer, intc). Move it to the root hw/Kconfig.

---
 hw/Kconfig       | 3 +++
 hw/timer/Kconfig | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)
hw/Kconfig +3 -0
index 88b9f150070..c3c78f43eb5 100644
@@ -72,3 +72,6 @@ config XILINX
 config XILINX_AXI
     bool
     select PTIMER # for hw/dma/xilinx_axidma.c
+
+config XLNX_ZYNQMP
+    bool
hw/timer/Kconfig +0 -3
index 51921eb63f1..eefc95f35ec 100644
@@ -34,9 +34,6 @@ config TWL92230
     bool
     depends on I2C
 
-config XLNX_ZYNQMP
-    bool
-
 config ALTERA_TIMER
     bool
     select PTIMER
Signature · 1 line
2.20.1
Reviewed-by on v1 1/3
#2 lore raw

Re: [Qemu-arm] [Qemu-devel] [PATCH 1/3] hw/Kconfig: Move the generic XLNX_ZYNQMP to the root hw/Kconfig

Quoted 5 lines · Philippe Mathieu-Daudé

The XLNX_ZYNQMP config is used in multiple subdirectories (timer, intc). Move it to the root hw/Kconfig.

Alistair

Quoted 34 lines
---
 hw/Kconfig       | 3 +++
 hw/timer/Kconfig | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)
hw/Kconfig +3 -0
index 88b9f150070..c3c78f43eb5 100644
@@ -72,3 +72,6 @@ config XILINX
 config XILINX_AXI
     bool
     select PTIMER # for hw/dma/xilinx_axidma.c
+
+config XLNX_ZYNQMP
+    bool
hw/timer/Kconfig +0 -4
index 51921eb63f1..eefc95f35ec 100644
@@ -34,9 +34,6 @@ config TWL92230
     bool
     depends on I2C
 
-config XLNX_ZYNQMP
-    bool
-
 config ALTERA_TIMER
     bool
     select PTIMER
--

2.20.1

#3 lore raw

PATCH 2/3 hw/intc: Only build the xlnx-iomod-intc device for the MicroBlaze PMU

In reply to 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.

---
 hw/intc/Makefile.objs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/intc/Makefile.objs +1 -1
index df712c3e6c9..247e8016cb8 100644
@@ -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
Signature · 1 line
2.20.1
Reviewed-by on v1 2/3
#4 lore raw

Re: [Qemu-arm] [PATCH 2/3] hw/intc: Only build the xlnx-iomod-intc device for the MicroBlaze PMU

Quoted 15 lines · 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.

---
 hw/intc/Makefile.objs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/intc/Makefile.objs +0 -0
index df712c3e6c9..247e8016cb8 100644

hw/intc/Makefile.objs common-obj-$(CONFIG_I8259) += i8259_common.o i8259.o · line 9

Quoted 8 lines
hw/intc/Makefile.objs +1 -1
@@ -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 on v1 2/3
#5 lore raw

Re: [Qemu-devel] [PATCH 2/3] hw/intc: Only build the xlnx-iomod-intc device for the MicroBlaze PMU

In reply to Philippe Mathieu-Daudé
Quoted 6 lines · 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.

Alistair

Quoted 21 lines
---
 hw/intc/Makefile.objs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/intc/Makefile.objs +1 -2
index df712c3e6c9..247e8016cb8 100644
@@ -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

#6 lore raw

PATCH 3/3 hw/dma: Do not build the xlnx_dpdma device for the MicroBlaze machines

In reply to 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).

---
 hw/dma/Makefile.objs | 1 -
 1 file changed, 1 deletion(-)
hw/dma/Makefile.objs +0 -1
index 79affecc390..a5b1276f52a 100644
@@ -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
 
Signature · 1 line
2.20.1
Reviewed-by on v1 3/3
#7 lore raw

Re: [Qemu-arm] [PATCH 3/3] hw/dma: Do not build the xlnx_dpdma device for the MicroBlaze machines

Quoted 15 lines · 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).

---
 hw/dma/Makefile.objs | 1 -
 1 file changed, 1 deletion(-)
hw/dma/Makefile.objs +0 -0
index 79affecc390..a5b1276f52a 100644

hw/dma/Makefile.objs common-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o · line 13

Quoted 7 lines
hw/dma/Makefile.objs +0 -1
@@ -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
 
#8 lore raw

Re: [Qemu-arm] [Qemu-trivial] [PATCH 3/3] hw/dma: Do not build the xlnx_dpdma device for the MicroBlaze machines

Quoted 10 lines · Thomas Huth
Quoted 9 lines · 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).

---
 hw/dma/Makefile.objs | 1 -
 1 file changed, 1 deletion(-)
Quoted 16 lines

hw/dma/Makefile.objs common-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o · line 13

Quoted 13 lines
hw/dma/Makefile.objs +0 -1
index 79affecc390..a5b1276f52a 100644
@@ -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
 

Applied to my trivial-patches branch.

Thanks,
Laurent

Reviewed-by on v1 3/3
#9 lore raw

Re: [Qemu-arm] [Qemu-devel] [PATCH 3/3] hw/dma: Do not build the xlnx_dpdma device for the MicroBlaze machines

In reply to Philippe Mathieu-Daudé
Quoted 6 lines · 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).

Alistair

Quoted 20 lines
---
 hw/dma/Makefile.objs | 1 -
 1 file changed, 1 deletion(-)
hw/dma/Makefile.objs +0 -2
index 79affecc390..a5b1276f52a 100644
@@ -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

#10 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 13 lines · 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

Quoted 6 lines
 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

#11 lore raw

Hi Paolo,

Quoted 15 lines · Paolo Bonzini
Quoted 13 lines · 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

Quoted 8 lines
Quoted 6 lines
 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.

#12 lore raw
Quoted 4 lines · Philippe Mathieu-Daudé
Quoted 2 lines
Quoted 1 line

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