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_SERIAL to eventually eliminate config IMX.
Reviewed-by: Bin Meng <[email protected]> Signed-off-by: Bernhard Beschow <[email protected]> --- hw/arm/Kconfig | 7 +++++++ hw/char/Kconfig | 3 +++ hw/char/meson.build | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 3f502685f4..543220be6b 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -488,6 +488,7 @@ config FSL_IMX25 select IMX_GPT select IMX_I2C select IMX_RNG + select IMX_SERIAL select USB_CHIPIDEA select WDT_IMX2 select SDHCI @@ -505,6 +506,7 @@ config FSL_IMX31 select IMX_EPIT select IMX_GPT select IMX_I2C + select IMX_SERIAL select WDT_IMX2 select LAN9118 @@ -522,6 +524,7 @@ config FSL_IMX6 select IMX_FEC select IMX_GPT select IMX_I2C + select IMX_SERIAL select IMX_SPI select IMX_USBPHY select CAN_FLEXCAN @@ -605,6 +608,7 @@ config FSL_IMX7 select IMX_GPCV2 select IMX_GPT select IMX_I2C + select IMX_SERIAL select IMX_SPI select WDT_IMX2 select PCI_EXPRESS_DESIGNWARE @@ -627,6 +631,7 @@ config FSL_IMX8MP select IMX_FEC select IMX_GPT select IMX_I2C + select IMX_SERIAL select IMX_SPI select OR_IRQ select PCI_EXPRESS_DESIGNWARE @@ -656,6 +661,7 @@ config FSL_IMX8MM select IMX_FEC select IMX_GPT select IMX_I2C + select IMX_SERIAL select IMX_SPI select OR_IRQ select SDHCI @@ -701,6 +707,7 @@ config FSL_IMX6UL select IMX_GPCV2 select IMX_GPT select IMX_I2C + select IMX_SERIAL select IMX_SPI select IMX_USBPHY select WDT_IMX2 diff --git a/hw/char/Kconfig b/hw/char/Kconfig index 020c0a84bb..54f9936534 100644 --- a/hw/char/Kconfig +++ b/hw/char/Kconfig @@ -48,6 +48,9 @@ config VIRTIO_SERIAL default y depends on VIRTIO +config IMX_SERIAL + bool + config MAX78000_UART bool diff --git a/hw/char/meson.build b/hw/char/meson.build index fc3d7ee506..65351c39de 100644 --- a/hw/char/meson.build +++ b/hw/char/meson.build @@ -3,7 +3,7 @@ system_ss.add(when: 'CONFIG_CMSDK_APB_UART', if_true: files('cmsdk-apb-uart.c')) system_ss.add(when: 'CONFIG_ESCC', if_true: files('escc.c')) system_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_apbuart.c')) system_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_uart.c')) -system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_serial.c')) +system_ss.add(when: 'CONFIG_IMX_SERIAL', if_true: files('imx_serial.c')) system_ss.add(when: 'CONFIG_IP_OCTAL_232', if_true: files('ipoctal232.c')) system_ss.add(when: 'CONFIG_ISA_BUS', if_true: files('parallel-isa.c')) system_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugcon.c')) -- 2.56.0
