Message ID | 20190817101931.28386-8-thuth@redhat.com |
---|---|
State | New |
Headers | show |
Series | Kconfig switches | expand |
On 8/17/19 12:19 PM, Thomas Huth wrote: > 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. > > Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/arm/Kconfig | 11 +++++++++++ > hw/microblaze/Kconfig | 1 + > hw/misc/Kconfig | 3 +++ > hw/misc/Makefile.objs | 2 +- > hw/sparc64/Kconfig | 1 + > 5 files changed, 17 insertions(+), 1 deletion(-) > > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig > index 6e24c73b54..76a2a6bcbf 100644 > --- a/hw/arm/Kconfig > +++ b/hw/arm/Kconfig > @@ -82,6 +82,7 @@ config MUSCA > select PL011 > select PL031 > select SPLIT_IRQ > + select UNIMP > > config MUSICPAL > bool > @@ -217,6 +218,7 @@ config STELLARIS > select SSI_SD > select STELLARIS_INPUT > select STELLARIS_ENET # ethernet > + select UNIMP > > config STRONGARM > bool > @@ -283,6 +285,7 @@ config ALLWINNER_A10 > select ALLWINNER_A10_PIC > select ALLWINNER_EMAC > select SERIAL > + select UNIMP > > config RASPI > bool > @@ -320,6 +323,7 @@ config XLNX_VERSAL > select PL011 > select CADENCE > select VIRTIO_MMIO > + select UNIMP > > config FSL_IMX25 > bool > @@ -355,6 +359,7 @@ config ASPEED_SOC > select SSI_M25P80 > select TMP105 > select TMP421 > + select UNIMP > > config MPS2 > bool > @@ -366,6 +371,7 @@ config MPS2 > select PL022 # Serial port > select PL080 # DMA controller > select SPLIT_IRQ > + select UNIMP > > config FSL_IMX7 > bool > @@ -378,6 +384,7 @@ config FSL_IMX7 > select IMX_I2C > select PCI_EXPRESS_DESIGNWARE > select SDHCI > + select UNIMP > > config ARM_SMMUV3 > bool > @@ -389,6 +396,7 @@ config FSL_IMX6UL > select IMX_FEC > select IMX_I2C > select SDHCI > + select UNIMP > > config MICROBIT > bool > @@ -398,6 +406,7 @@ config NRF51_SOC > bool > select I2C > select ARM_V7M > + select UNIMP > > config EMCRAFT_SF2 > bool > @@ -410,6 +419,7 @@ config MSF2 > select PTIMER > select SERIAL > select SSI > + select UNIMP > > config ZAURUS > bool > @@ -448,6 +458,7 @@ config ARMSSE > select TZ_MPC > select TZ_MSC > select TZ_PPC > + select UNIMP > > config ARMSSE_CPUID > bool > diff --git a/hw/microblaze/Kconfig b/hw/microblaze/Kconfig > index c4dc120973..e2697ced9c 100644 > --- a/hw/microblaze/Kconfig > +++ b/hw/microblaze/Kconfig > @@ -4,6 +4,7 @@ config PETALOGIX_S3ADSP1800 > select XILINX > select XILINX_AXI > select XILINX_ETHLITE > + select UNIMP > > config PETALOGIX_ML605 > bool > diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig > index 385e1b0cec..51754bb47c 100644 > --- a/hw/misc/Kconfig > +++ b/hw/misc/Kconfig > @@ -117,4 +117,7 @@ config AUX > bool > select I2C > > +config UNIMP > + bool > + > source macio/Kconfig > diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs > index e9aab519a1..e4aad707fb 100644 > --- a/hw/misc/Makefile.objs > +++ b/hw/misc/Makefile.objs > @@ -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 > diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig > index d4d76a89be..f9f8b0f73a 100644 > --- a/hw/sparc64/Kconfig > +++ b/hw/sparc64/Kconfig > @@ -17,3 +17,4 @@ config NIAGARA > bool > select EMPTY_SLOT > select SUN4V_RTC > + select UNIMP >
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 6e24c73b54..76a2a6bcbf 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -82,6 +82,7 @@ config MUSCA select PL011 select PL031 select SPLIT_IRQ + select UNIMP config MUSICPAL bool @@ -217,6 +218,7 @@ config STELLARIS select SSI_SD select STELLARIS_INPUT select STELLARIS_ENET # ethernet + select UNIMP config STRONGARM bool @@ -283,6 +285,7 @@ config ALLWINNER_A10 select ALLWINNER_A10_PIC select ALLWINNER_EMAC select SERIAL + select UNIMP config RASPI bool @@ -320,6 +323,7 @@ config XLNX_VERSAL select PL011 select CADENCE select VIRTIO_MMIO + select UNIMP config FSL_IMX25 bool @@ -355,6 +359,7 @@ config ASPEED_SOC select SSI_M25P80 select TMP105 select TMP421 + select UNIMP config MPS2 bool @@ -366,6 +371,7 @@ config MPS2 select PL022 # Serial port select PL080 # DMA controller select SPLIT_IRQ + select UNIMP config FSL_IMX7 bool @@ -378,6 +384,7 @@ config FSL_IMX7 select IMX_I2C select PCI_EXPRESS_DESIGNWARE select SDHCI + select UNIMP config ARM_SMMUV3 bool @@ -389,6 +396,7 @@ config FSL_IMX6UL select IMX_FEC select IMX_I2C select SDHCI + select UNIMP config MICROBIT bool @@ -398,6 +406,7 @@ config NRF51_SOC bool select I2C select ARM_V7M + select UNIMP config EMCRAFT_SF2 bool @@ -410,6 +419,7 @@ config MSF2 select PTIMER select SERIAL select SSI + select UNIMP config ZAURUS bool @@ -448,6 +458,7 @@ config ARMSSE select TZ_MPC select TZ_MSC select TZ_PPC + select UNIMP config ARMSSE_CPUID bool diff --git a/hw/microblaze/Kconfig b/hw/microblaze/Kconfig index c4dc120973..e2697ced9c 100644 --- a/hw/microblaze/Kconfig +++ b/hw/microblaze/Kconfig @@ -4,6 +4,7 @@ config PETALOGIX_S3ADSP1800 select XILINX select XILINX_AXI select XILINX_ETHLITE + select UNIMP config PETALOGIX_ML605 bool diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 385e1b0cec..51754bb47c 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -117,4 +117,7 @@ config AUX bool select I2C +config UNIMP + bool + source macio/Kconfig diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index e9aab519a1..e4aad707fb 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -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 diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig index d4d76a89be..f9f8b0f73a 100644 --- a/hw/sparc64/Kconfig +++ b/hw/sparc64/Kconfig @@ -17,3 +17,4 @@ config NIAGARA bool select EMPTY_SLOT select SUN4V_RTC + select UNIMP
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. Signed-off-by: Thomas Huth <thuth@redhat.com> --- hw/arm/Kconfig | 11 +++++++++++ hw/microblaze/Kconfig | 1 + hw/misc/Kconfig | 3 +++ hw/misc/Makefile.objs | 2 +- hw/sparc64/Kconfig | 1 + 5 files changed, 17 insertions(+), 1 deletion(-)