Skip to contentSkip to conversation

Kconfig switches

PATCH Superseded Thomas Huth 4 participants 21 messages Jul 31, 2019 – Aug 5, 2019

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

v2 cover Kconfig switches

Here are some more Kconfig patches that clean up the switches of existing devices and introduce proper config switches for some other devices that were always enabled before.

v2:
- Included Philippe's patches to avoid a conflict with XLNX_ZYNQMP
- Don't rely on indirect dependencies, always "select XYZ" if it is adequate
- Added patch for the generic loader device

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

Thomas Huth (5):
hw/core: Add a config switch for the "register" device hw/core: Add a config switch for the "or-irq" device hw/core: Add a config switch for the "split-irq" device hw/misc: Add a config switch for the "unimplemented" device hw/core: Add a config switch for the generic loader device

 hw/Kconfig            |  4 ++++
 hw/arm/Kconfig        | 15 +++++++++++++++
 hw/core/Kconfig       | 13 +++++++++++++
 hw/core/Makefile.objs |  8 ++++----
 hw/dma/Kconfig        |  1 +
 hw/dma/Makefile.objs  |  1 -
 hw/intc/Makefile.objs |  2 +-
 hw/microblaze/Kconfig |  1 +
 hw/misc/Kconfig       |  3 +++
 hw/misc/Makefile.objs |  2 +-
 hw/pci-host/Kconfig   |  3 ++-
 hw/sparc64/Kconfig    |  1 +
 hw/timer/Kconfig      |  3 ---
 13 files changed, 46 insertions(+), 11 deletions(-)
Signature · 1 line
2.21.0
#1 lore raw

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

From: Philippe Mathieu-Daudé <[email protected]>

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

Message-Id: <[email protected]>

---
 hw/Kconfig       | 3 +++
 hw/timer/Kconfig | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)
hw/Kconfig +3 -0
index 195f541e50..dbae1c0852 100644
@@ -73,3 +73,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 51921eb63f..eefc95f35e 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.21.0
#2 lore raw

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

In reply to Thomas Huth

From: Philippe Mathieu-Daudé <[email protected]>

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.

Message-Id: <[email protected]>

---
 hw/intc/Makefile.objs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/intc/Makefile.objs +1 -1
index 03019b9a03..f726d87532 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.21.0
#3 lore raw

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

In reply to Thomas Huth

From: Philippe Mathieu-Daudé <[email protected]>

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).

Message-Id: <[email protected]>

---
 hw/dma/Makefile.objs | 1 -
 1 file changed, 1 deletion(-)
hw/dma/Makefile.objs +0 -1
index 8b39f9c600..b672e7a522 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.21.0
#4 lore raw

PATCH v2 4/8 hw/core: Add a config switch for the "register" device

In reply to Thomas Huth

The "register" device is only used by certain machines. Let's add a proper config switch for it so that it only gets compiled when we really need it.

---
 hw/Kconfig            | 1 +
 hw/core/Kconfig       | 3 +++
 hw/core/Makefile.objs | 2 +-
 hw/dma/Kconfig        | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)
hw/Kconfig +1 -0
index dbae1c0852..b45db3c813 100644
@@ -76,3 +76,4 @@ config XILINX_AXI
 
 config XLNX_ZYNQMP
     bool
+    select REGISTER
hw/core/Kconfig +3 -0
index c2a1ae8122..d11920fcb3 100644
@@ -9,3 +9,6 @@ config FITLOADER
 
 config PLATFORM_BUS
     bool
+
+config REGISTER
+    bool
hw/core/Makefile.objs +1 -1
index f8481d959f..d6cfb2a81b 100644
@@ -17,7 +17,7 @@ common-obj-$(CONFIG_SOFTMMU) += machine.o
 common-obj-$(CONFIG_SOFTMMU) += loader.o
 common-obj-$(CONFIG_FITLOADER) += loader-fit.o
 common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o
-common-obj-$(CONFIG_SOFTMMU) += register.o
+common-obj-$(CONFIG_REGISTER) += register.o
 common-obj-$(CONFIG_SOFTMMU) += or-irq.o
 common-obj-$(CONFIG_SOFTMMU) += split-irq.o
 common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o
hw/dma/Kconfig +1 -0
index 751dec5426..5c61b67bc0 100644
@@ -16,6 +16,7 @@ config I8257
 
 config ZYNQ_DEVCFG
     bool
+    select REGISTER
 
 config STP2000
     bool
Signature · 1 line
2.21.0
#5 lore raw

Re: [Qemu-arm] [PATCH v2 4/8] hw/core: Add a config switch for the "register" device

Quoted 26 lines · Thomas Huth

The "register" device is only used by certain machines. Let's add a proper config switch for it so that it only gets compiled when we really need it.

---
 hw/Kconfig            | 1 +
 hw/core/Kconfig       | 3 +++
 hw/core/Makefile.objs | 2 +-
 hw/dma/Kconfig        | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)
hw/Kconfig +1 -0
index dbae1c0852..b45db3c813 100644
@@ -76,3 +76,4 @@ config XILINX_AXI
 
 config XLNX_ZYNQMP
     bool
+    select REGISTER
hw/core/Kconfig +0 -0
index c2a1ae8122..d11920fcb3 100644

hw/core/Kconfig config FITLOADER · line 13

Quoted 5 lines
hw/core/Kconfig +2 -0
@@ -9,3 +9,6 @@ config FITLOADER
 
 config PLATFORM_BUS
     bool
+
+config REGISTER

What about naming it REGISTER_ARRAY or REGISTER_BLOCK?

The API is:

    RegisterInfoArray *register_init_block32(...);

Cc'ing Alistair for better name ideas :)

Quoted 27 lines
hw/core/Kconfig +1 -0
+    bool
hw/core/Makefile.objs +1 -1
index f8481d959f..d6cfb2a81b 100644
@@ -17,7 +17,7 @@ common-obj-$(CONFIG_SOFTMMU) += machine.o
 common-obj-$(CONFIG_SOFTMMU) += loader.o
 common-obj-$(CONFIG_FITLOADER) += loader-fit.o
 common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o
-common-obj-$(CONFIG_SOFTMMU) += register.o
+common-obj-$(CONFIG_REGISTER) += register.o
 common-obj-$(CONFIG_SOFTMMU) += or-irq.o
 common-obj-$(CONFIG_SOFTMMU) += split-irq.o
 common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o
hw/dma/Kconfig +1 -0
index 751dec5426..5c61b67bc0 100644
@@ -16,6 +16,7 @@ config I8257
 
 config ZYNQ_DEVCFG
     bool
+    select REGISTER
 
 config STP2000
     bool
#6 lore raw

Re: [Qemu-arm] [PATCH v2 4/8] hw/core: Add a config switch for the "register" device

Quoted 8 lines · Philippe Mathieu-Daudé

What about naming it REGISTER_ARRAY or REGISTER_BLOCK?

The API is:

    RegisterInfoArray *register_init_block32(...);

Cc'ing Alistair for better name ideas :)

I think REGISTER is okay. :)

Paolo

#7 lore raw

Re: [Qemu-devel] [PATCH v2 4/8] hw/core: Add a config switch for the "register" device

Quoted 4 lines · Paolo Bonzini
Quoted 2 lines · Philippe Mathieu-Daudé

What about naming it REGISTER_ARRAY or REGISTER_BLOCK?

Quoted 8 lines
Quoted 6 lines

The API is:

    RegisterInfoArray *register_init_block32(...);

Cc'ing Alistair for better name ideas :)

I think REGISTER is okay. :)

I think REGISTER is fine as well. If you really wanted something longer I would go with REGISTER_API.

Alistair

Quoted 3 lines

Paolo

#8 lore raw

PATCH v2 5/8 hw/core: Add a config switch for the "or-irq" device

In reply to Thomas Huth

The "or-irq" device is only used by certain machines. Let's add a proper config switch for it so that it only gets compiled when we really need it.

---
 hw/arm/Kconfig        | 3 +++
 hw/core/Kconfig       | 3 +++
 hw/core/Makefile.objs | 2 +-
 hw/pci-host/Kconfig   | 3 ++-
 4 files changed, 9 insertions(+), 2 deletions(-)
hw/arm/Kconfig +3 -0
index ab65ecd216..849195c3f6 100644
@@ -292,6 +292,7 @@ config RASPI
 config STM32F205_SOC
     bool
     select ARM_V7M
+    select OR_IRQ
     select STM32F2XX_TIMER
     select STM32F2XX_USART
     select STM32F2XX_SYSCFG
@@ -360,6 +361,7 @@ config MPS2
     select LAN9118
     select MPS2_FPGAIO
     select MPS2_SCC
+    select OR_IRQ
     select PL022    # Serial port
     select PL080    # DMA controller
 
@@ -439,6 +441,7 @@ config ARMSSE
     select IOTKIT_SECCTL
     select IOTKIT_SYSCTL
     select IOTKIT_SYSINFO
+    select OR_IRQ
     select TZ_MPC
     select TZ_MSC
     select TZ_PPC
hw/core/Kconfig +3 -0
index d11920fcb3..984143456a 100644
@@ -7,6 +7,9 @@ config PTIMER
 config FITLOADER
     bool
 
+config OR_IRQ
+    bool
+
 config PLATFORM_BUS
     bool
 
hw/core/Makefile.objs +1 -1
index d6cfb2a81b..ce337bd7c9 100644
@@ -18,7 +18,7 @@ common-obj-$(CONFIG_SOFTMMU) += loader.o
 common-obj-$(CONFIG_FITLOADER) += loader-fit.o
 common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o
 common-obj-$(CONFIG_REGISTER) += register.o
-common-obj-$(CONFIG_SOFTMMU) += or-irq.o
+common-obj-$(CONFIG_OR_IRQ) += or-irq.o
 common-obj-$(CONFIG_SOFTMMU) += split-irq.o
 common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o
 common-obj-$(CONFIG_SOFTMMU) += generic-loader.o
hw/pci-host/Kconfig +2 -1
index 8c16d96b3f..1edc1a31d4 100644
@@ -2,8 +2,9 @@ config PAM
     bool
 
 config PREP_PCI
-    select PCI
     bool
+    select PCI
+    select OR_IRQ
 
 config GRACKLE_PCI
     select PCI
Signature · 1 line
2.21.0
Reviewed-by on v2 5/8
#9 lore raw

Re: [Qemu-arm] [PATCH v2 5/8] hw/core: Add a config switch for the "or-irq" device

Quoted 5 lines · Thomas Huth

The "or-irq" device is only used by certain machines. Let's add a proper config switch for it so that it only gets compiled when we really need it.

Quoted 78 lines
---
 hw/arm/Kconfig        | 3 +++
 hw/core/Kconfig       | 3 +++
 hw/core/Makefile.objs | 2 +-
 hw/pci-host/Kconfig   | 3 ++-
 4 files changed, 9 insertions(+), 2 deletions(-)
hw/arm/Kconfig +3 -0
index ab65ecd216..849195c3f6 100644
@@ -292,6 +292,7 @@ config RASPI
 config STM32F205_SOC
     bool
     select ARM_V7M
+    select OR_IRQ
     select STM32F2XX_TIMER
     select STM32F2XX_USART
     select STM32F2XX_SYSCFG
@@ -360,6 +361,7 @@ config MPS2
     select LAN9118
     select MPS2_FPGAIO
     select MPS2_SCC
+    select OR_IRQ
     select PL022    # Serial port
     select PL080    # DMA controller
 
@@ -439,6 +441,7 @@ config ARMSSE
     select IOTKIT_SECCTL
     select IOTKIT_SYSCTL
     select IOTKIT_SYSINFO
+    select OR_IRQ
     select TZ_MPC
     select TZ_MSC
     select TZ_PPC
hw/core/Kconfig +3 -0
index d11920fcb3..984143456a 100644
@@ -7,6 +7,9 @@ config PTIMER
 config FITLOADER
     bool
 
+config OR_IRQ
+    bool
+
 config PLATFORM_BUS
     bool
 
hw/core/Makefile.objs +1 -1
index d6cfb2a81b..ce337bd7c9 100644
@@ -18,7 +18,7 @@ common-obj-$(CONFIG_SOFTMMU) += loader.o
 common-obj-$(CONFIG_FITLOADER) += loader-fit.o
 common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o
 common-obj-$(CONFIG_REGISTER) += register.o
-common-obj-$(CONFIG_SOFTMMU) += or-irq.o
+common-obj-$(CONFIG_OR_IRQ) += or-irq.o
 common-obj-$(CONFIG_SOFTMMU) += split-irq.o
 common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o
 common-obj-$(CONFIG_SOFTMMU) += generic-loader.o
hw/pci-host/Kconfig +2 -1
index 8c16d96b3f..1edc1a31d4 100644
@@ -2,8 +2,9 @@ config PAM
     bool
 
 config PREP_PCI
-    select PCI
     bool
+    select PCI
+    select OR_IRQ
 
 config GRACKLE_PCI
     select PCI
#10 lore raw

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

In reply to Thomas Huth

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.

---
 hw/arm/Kconfig        | 3 +++
 hw/core/Kconfig       | 3 +++
 hw/core/Makefile.objs | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)
hw/arm/Kconfig +3 -0
index 849195c3f6..6e24c73b54 100644
@@ -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
hw/core/Kconfig +3 -0
index 984143456a..fffb3d62b2 100644
@@ -15,3 +15,6 @@ config PLATFORM_BUS
 
 config REGISTER
     bool
+
+config SPLIT_IRQ
+    bool
hw/core/Makefile.objs +1 -1
index ce337bd7c9..bb1afe422a 100644
@@ -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
Signature · 1 line
2.21.0
Reviewed-by on v2 6/8
#11 lore raw

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

Quoted 5 lines · Thomas Huth

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.

Quoted 59 lines
---
 hw/arm/Kconfig        | 3 +++
 hw/core/Kconfig       | 3 +++
 hw/core/Makefile.objs | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)
hw/arm/Kconfig +3 -0
index 849195c3f6..6e24c73b54 100644
@@ -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
hw/core/Kconfig +3 -0
index 984143456a..fffb3d62b2 100644
@@ -15,3 +15,6 @@ config PLATFORM_BUS
 
 config REGISTER
     bool
+
+config SPLIT_IRQ
+    bool
hw/core/Makefile.objs +1 -1
index ce337bd7c9..bb1afe422a 100644
@@ -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
#12 lore raw

PATCH v2 7/8 hw/misc: Add a config switch for the "unimplemented" device

In reply to Thomas Huth

The device is only used by some few boards. Let's use a proper Kconfig switch so that we only compile this code if we really need it.

---
 hw/arm/Kconfig        | 9 +++++++++
 hw/microblaze/Kconfig | 1 +
 hw/misc/Kconfig       | 3 +++
 hw/misc/Makefile.objs | 2 +-
 hw/sparc64/Kconfig    | 1 +
 5 files changed, 15 insertions(+), 1 deletion(-)
hw/arm/Kconfig +9 -0
index 6e24c73b54..ab9e592d74 100644
@@ -217,6 +217,7 @@ config STELLARIS
     select SSI_SD
     select STELLARIS_INPUT
     select STELLARIS_ENET # ethernet
+    select UNIMP
 
 config STRONGARM
     bool
@@ -283,6 +284,7 @@ config ALLWINNER_A10
     select ALLWINNER_A10_PIC
     select ALLWINNER_EMAC
     select SERIAL
+    select UNIMP
 
 config RASPI
     bool
@@ -320,6 +322,7 @@ config XLNX_VERSAL
     select PL011
     select CADENCE
     select VIRTIO_MMIO
+    select UNIMP
 
 config FSL_IMX25
     bool
@@ -355,6 +358,7 @@ config ASPEED_SOC
     select SSI_M25P80
     select TMP105
     select TMP421
+    select UNIMP
 
 config MPS2
     bool
@@ -378,6 +382,7 @@ config FSL_IMX7
     select IMX_I2C
     select PCI_EXPRESS_DESIGNWARE
     select SDHCI
+    select UNIMP
 
 config ARM_SMMUV3
     bool
@@ -389,6 +394,7 @@ config FSL_IMX6UL
     select IMX_FEC
     select IMX_I2C
     select SDHCI
+    select UNIMP
 
 config MICROBIT
     bool
@@ -398,6 +404,7 @@ config NRF51_SOC
     bool
     select I2C
     select ARM_V7M
+    select UNIMP
 
 config EMCRAFT_SF2
     bool
@@ -410,6 +417,7 @@ config MSF2
     select PTIMER
     select SERIAL
     select SSI
+    select UNIMP
 
 config ZAURUS
     bool
@@ -448,6 +456,7 @@ config ARMSSE
     select TZ_MPC
     select TZ_MSC
     select TZ_PPC
+    select UNIMP
 
 config ARMSSE_CPUID
     bool
hw/microblaze/Kconfig +1 -0
index c4dc120973..e2697ced9c 100644
@@ -4,6 +4,7 @@ config PETALOGIX_S3ADSP1800
     select XILINX
     select XILINX_AXI
     select XILINX_ETHLITE
+    select UNIMP
 
 config PETALOGIX_ML605
     bool
hw/misc/Kconfig +3 -0
index 385e1b0cec..51754bb47c 100644
@@ -117,4 +117,7 @@ config AUX
     bool
     select I2C
 
+config UNIMP
+    bool
+
 source macio/Kconfig
hw/misc/Makefile.objs +1 -1
index e9aab519a1..e4aad707fb 100644
@@ -9,7 +9,7 @@ common-obj-$(CONFIG_PCI_TESTDEV) += pci-testdev.o
 common-obj-$(CONFIG_EDU) += edu.o
 common-obj-$(CONFIG_PCA9552) += pca9552.o
 
-common-obj-y += unimp.o
+common-obj-$(CONFIG_UNIMP) += unimp.o
 common-obj-$(CONFIG_FW_CFG_DMA) += vmcoreinfo.o
 
 # ARM devices
hw/sparc64/Kconfig +1 -0
index d4d76a89be..f9f8b0f73a 100644
@@ -17,3 +17,4 @@ config NIAGARA
     bool
     select EMPTY_SLOT
     select SUN4V_RTC
+    select UNIMP
Signature · 1 line
2.21.0
#13 lore raw

Re: [Qemu-arm] [PATCH v2 7/8] hw/misc: Add a config switch for the "unimplemented" device

Quoted 2 lines · Thomas Huth

The device is only used by some few boards. Let's use a proper Kconfig switch so that we only compile this code if we really need it.

I'd prefer having the UnimpDevice user-creatable and always present as a core device...

Maybe this can be solved by using 'default y':

config UNIMP
bool
default y

Quoted 132 lines
---
 hw/arm/Kconfig        | 9 +++++++++
 hw/microblaze/Kconfig | 1 +
 hw/misc/Kconfig       | 3 +++
 hw/misc/Makefile.objs | 2 +-
 hw/sparc64/Kconfig    | 1 +
 5 files changed, 15 insertions(+), 1 deletion(-)
hw/arm/Kconfig +9 -0
index 6e24c73b54..ab9e592d74 100644
@@ -217,6 +217,7 @@ config STELLARIS
     select SSI_SD
     select STELLARIS_INPUT
     select STELLARIS_ENET # ethernet
+    select UNIMP
 
 config STRONGARM
     bool
@@ -283,6 +284,7 @@ config ALLWINNER_A10
     select ALLWINNER_A10_PIC
     select ALLWINNER_EMAC
     select SERIAL
+    select UNIMP
 
 config RASPI
     bool
@@ -320,6 +322,7 @@ config XLNX_VERSAL
     select PL011
     select CADENCE
     select VIRTIO_MMIO
+    select UNIMP
 
 config FSL_IMX25
     bool
@@ -355,6 +358,7 @@ config ASPEED_SOC
     select SSI_M25P80
     select TMP105
     select TMP421
+    select UNIMP
 
 config MPS2
     bool
@@ -378,6 +382,7 @@ config FSL_IMX7
     select IMX_I2C
     select PCI_EXPRESS_DESIGNWARE
     select SDHCI
+    select UNIMP
 
 config ARM_SMMUV3
     bool
@@ -389,6 +394,7 @@ config FSL_IMX6UL
     select IMX_FEC
     select IMX_I2C
     select SDHCI
+    select UNIMP
 
 config MICROBIT
     bool
@@ -398,6 +404,7 @@ config NRF51_SOC
     bool
     select I2C
     select ARM_V7M
+    select UNIMP
 
 config EMCRAFT_SF2
     bool
@@ -410,6 +417,7 @@ config MSF2
     select PTIMER
     select SERIAL
     select SSI
+    select UNIMP
 
 config ZAURUS
     bool
@@ -448,6 +456,7 @@ config ARMSSE
     select TZ_MPC
     select TZ_MSC
     select TZ_PPC
+    select UNIMP
 
 config ARMSSE_CPUID
     bool
hw/microblaze/Kconfig +1 -0
index c4dc120973..e2697ced9c 100644
@@ -4,6 +4,7 @@ config PETALOGIX_S3ADSP1800
     select XILINX
     select XILINX_AXI
     select XILINX_ETHLITE
+    select UNIMP
 
 config PETALOGIX_ML605
     bool
hw/misc/Kconfig +3 -0
index 385e1b0cec..51754bb47c 100644
@@ -117,4 +117,7 @@ config AUX
     bool
     select I2C
 
+config UNIMP
+    bool
+
 source macio/Kconfig
hw/misc/Makefile.objs +1 -1
index e9aab519a1..e4aad707fb 100644
@@ -9,7 +9,7 @@ common-obj-$(CONFIG_PCI_TESTDEV) += pci-testdev.o
 common-obj-$(CONFIG_EDU) += edu.o
 common-obj-$(CONFIG_PCA9552) += pca9552.o
 
-common-obj-y += unimp.o
+common-obj-$(CONFIG_UNIMP) += unimp.o
 common-obj-$(CONFIG_FW_CFG_DMA) += vmcoreinfo.o
 
 # ARM devices
hw/sparc64/Kconfig +1 -0
index d4d76a89be..f9f8b0f73a 100644
@@ -17,3 +17,4 @@ config NIAGARA
     bool
     select EMPTY_SLOT
     select SUN4V_RTC
+    select UNIMP
#14 lore raw

Re: [Qemu-arm] [PATCH v2 7/8] hw/misc: Add a config switch for the "unimplemented" device

Quoted 6 lines · Philippe Mathieu-Daudé
Quoted 2 lines · Thomas Huth

The device is only used by some few boards. Let's use a proper Kconfig switch so that we only compile this code if we really need it.

I'd prefer having the UnimpDevice user-creatable and always present as a core device...

Why? This is a sysbus device that needs to be wired up in code, so I don't see a reason for making this user-creatable right now.

Anyway, that's a different subject, so this should not be part of this patch.

Thomas

#15 lore raw

Re: [Qemu-arm] [PATCH v2 7/8] hw/misc: Add a config switch for the "unimplemented" device

Quoted 10 lines · Thomas Huth
Quoted 6 lines · Philippe Mathieu-Daudé
Quoted 2 lines · Thomas Huth

The device is only used by some few boards. Let's use a proper Kconfig switch so that we only compile this code if we really need it.

I'd prefer having the UnimpDevice user-creatable and always present as a core device...

Why? This is a sysbus device that needs to be wired up in code, so I don't see a reason for making this user-creatable right now.

Right now no.

Quoted 2 lines

Anyway, that's a different subject, so this should not be part of this patch.

Fair enough.

#16 lore raw

Re: [Qemu-arm] [PATCH v2 7/8] hw/misc: Add a config switch for the "unimplemented" device

Quoted 12 lines · Philippe Mathieu-Daudé
Quoted 10 lines · Thomas Huth
Quoted 6 lines · Philippe Mathieu-Daudé
Quoted 2 lines · Thomas Huth

The device is only used by some few boards. Let's use a proper Kconfig switch so that we only compile this code if we really need it.

I'd prefer having the UnimpDevice user-creatable and always present as a core device...

Why? This is a sysbus device that needs to be wired up in code, so I don't see a reason for making this user-creatable right now.

Quoted 8 lines

Right now no.

Quoted 2 lines

Anyway, that's a different subject, so this should not be part of this patch.

Fair enough.

Err, you missed MUSCA and MPS2.

#17 lore raw

Re: [Qemu-arm] [Qemu-devel] [PATCH v2 7/8] hw/misc: Add a config switch for the "unimplemented" device

Quoted 16 lines · Philippe Mathieu-Daudé
Quoted 14 lines · Philippe Mathieu-Daudé
Quoted 10 lines · Thomas Huth
Quoted 6 lines · Philippe Mathieu-Daudé
Quoted 2 lines · Thomas Huth

The device is only used by some few boards. Let's use a proper Kconfig switch so that we only compile this code if we really need it.

I'd prefer having the UnimpDevice user-creatable and always present as a core device...

Why? This is a sysbus device that needs to be wired up in code, so I don't see a reason for making this user-creatable right now.

Right now no.

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

Anyway, that's a different subject, so this should not be part of this patch.

Fair enough.

Err, you missed MUSCA and MPS2.

Ah, well, that's another one of those indirections that we discussed in v1 and which I apparently forgot to add now in v2 ... both select ARMSSE which in turn select UNIMP, so it's not completely missing. I'll send a v3 with a fix.

Thanks for noticing!

Thomas

#18 lore raw

PATCH v2 8/8 hw/core: Add a config switch for the generic loader device

In reply to Thomas Huth

The generic loader device is completely optional. Let's add a proper config switch for it so that people can disable it if they don't need it and want to create a minimalistic QEMU binary.

---
 hw/core/Kconfig       | 4 ++++
 hw/core/Makefile.objs | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
hw/core/Kconfig +4 -0
index fffb3d62b2..fdf03514d7 100644
@@ -7,6 +7,10 @@ config PTIMER
 config FITLOADER
     bool
 
+config GENERIC_LOADER
+    bool
+    default y
+
 config OR_IRQ
     bool
 
hw/core/Makefile.objs +1 -1
index bb1afe422a..b49f880a0c 100644
@@ -21,7 +21,7 @@ common-obj-$(CONFIG_REGISTER) += register.o
 common-obj-$(CONFIG_OR_IRQ) += or-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_GENERIC_LOADER) += generic-loader.o
 common-obj-$(CONFIG_SOFTMMU) += null-machine.o
 
 obj-$(CONFIG_SOFTMMU) += machine-qmp-cmds.o
Signature · 1 line
2.21.0
Reviewed-by on v2 8/8
#19 lore raw

Re: [Qemu-arm] [PATCH v2 8/8] hw/core: Add a config switch for the generic loader device

Quoted 5 lines · Thomas Huth

The generic loader device is completely optional. Let's add a proper config switch for it so that people can disable it if they don't need it and want to create a minimalistic QEMU binary.

Quoted 34 lines
---
 hw/core/Kconfig       | 4 ++++
 hw/core/Makefile.objs | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
hw/core/Kconfig +4 -0
index fffb3d62b2..fdf03514d7 100644
@@ -7,6 +7,10 @@ config PTIMER
 config FITLOADER
     bool
 
+config GENERIC_LOADER
+    bool
+    default y
+
 config OR_IRQ
     bool
 
hw/core/Makefile.objs +1 -1
index bb1afe422a..b49f880a0c 100644
@@ -21,7 +21,7 @@ common-obj-$(CONFIG_REGISTER) += register.o
 common-obj-$(CONFIG_OR_IRQ) += or-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_GENERIC_LOADER) += generic-loader.o
 common-obj-$(CONFIG_SOFTMMU) += null-machine.o
 
 obj-$(CONFIG_SOFTMMU) += machine-qmp-cmds.o
#20 lore raw
In reply to Thomas Huth
Quoted 22 lines · Thomas Huth

Here are some more Kconfig patches that clean up the switches of existing devices and introduce proper config switches for some other devices that were always enabled before.

v2:
- Included Philippe's patches to avoid a conflict with XLNX_ZYNQMP
- Don't rely on indirect dependencies, always "select XYZ" if it is adequate
- Added patch for the generic loader device

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

Thomas Huth (5):
hw/core: Add a config switch for the "register" device hw/core: Add a config switch for the "or-irq" device hw/core: Add a config switch for the "split-irq" device hw/misc: Add a config switch for the "unimplemented" device hw/core: Add a config switch for the generic loader device

Quoted 15 lines
 hw/Kconfig            |  4 ++++
 hw/arm/Kconfig        | 15 +++++++++++++++
 hw/core/Kconfig       | 13 +++++++++++++
 hw/core/Makefile.objs |  8 ++++----
 hw/dma/Kconfig        |  1 +
 hw/dma/Makefile.objs  |  1 -
 hw/intc/Makefile.objs |  2 +-
 hw/microblaze/Kconfig |  1 +
 hw/misc/Kconfig       |  3 +++
 hw/misc/Makefile.objs |  2 +-
 hw/pci-host/Kconfig   |  3 ++-
 hw/sparc64/Kconfig    |  1 +
 hw/timer/Kconfig      |  3 ---
 13 files changed, 46 insertions(+), 11 deletions(-)

Looks good. Peter, are you picking it?

Paolo