Over time, QEMU has grown a number of i.MX boards and the monolithic config IMX drags in unneeded dependencies into each SoC model. Extract config IMX_SPI to eventually eliminate config IMX.
Signed-off-by: Bernhard Beschow <[email protected]> --- hw/arm/Kconfig | 5 +++++ hw/misc/Kconfig | 1 - hw/ssi/Kconfig | 4 ++++ hw/ssi/meson.build | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 25eee42c52..3510e4a6d4 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -521,6 +521,7 @@ config FSL_IMX6 select IMX_FEC select IMX_GPT select IMX_I2C + select IMX_SPI select IMX_USBPHY select CAN_FLEXCAN select WDT_IMX2 @@ -603,6 +604,7 @@ config FSL_IMX7 select IMX_GPCV2 select IMX_GPT select IMX_I2C + select IMX_SPI select WDT_IMX2 select PCI_EXPRESS_DESIGNWARE select SDHCI @@ -624,6 +626,7 @@ config FSL_IMX8MP select IMX_FEC select IMX_GPT select IMX_I2C + select IMX_SPI select OR_IRQ select PCI_EXPRESS_DESIGNWARE select PCI_EXPRESS_FSL_IMX8M_PHY @@ -652,6 +655,7 @@ config FSL_IMX8MM select IMX_FEC select IMX_GPT select IMX_I2C + select IMX_SPI select OR_IRQ select SDHCI select PCI_EXPRESS_DESIGNWARE @@ -697,6 +701,7 @@ config FSL_IMX6UL select IMX_GPCV2 select IMX_GPT select IMX_I2C + select IMX_SPI select IMX_USBPHY select WDT_IMX2 select SDHCI diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index dbdef58505..ab238767b8 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -91,7 +91,6 @@ config ECCMEMCTL config IMX bool - select SSI config IMX_CCM bool diff --git a/hw/ssi/Kconfig b/hw/ssi/Kconfig index 1bd56463c1..d477d20e9b 100644 --- a/hw/ssi/Kconfig +++ b/hw/ssi/Kconfig @@ -32,3 +32,7 @@ config PNV_SPI config ALLWINNER_A10_SPI bool select SSI + +config IMX_SPI + bool + select SSI diff --git a/hw/ssi/meson.build b/hw/ssi/meson.build index 6afb1ea200..f334e48e2f 100644 --- a/hw/ssi/meson.build +++ b/hw/ssi/meson.build @@ -9,7 +9,7 @@ system_ss.add(when: 'CONFIG_STM32F2XX_SPI', if_true: files('stm32f2xx_spi.c')) system_ss.add(when: 'CONFIG_XILINX_SPI', if_true: files('xilinx_spi.c')) system_ss.add(when: 'CONFIG_XILINX_SPIPS', if_true: files('xilinx_spips.c')) system_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal-ospi.c')) -system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_spi.c')) +system_ss.add(when: 'CONFIG_IMX_SPI', if_true: files('imx_spi.c')) system_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_spi_host.c')) system_ss.add(when: 'CONFIG_BCM2835_SPI', if_true: files('bcm2835_spi.c')) system_ss.add(when: 'CONFIG_PNV_SPI', if_true: files('pnv_spi.c')) -- 2.55.0
