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 GPIO_IMX to eventually eliminate config IMX.
Reviewed-by: Bin Meng <[email protected]> Signed-off-by: Bernhard Beschow <[email protected]> --- hw/arm/Kconfig | 7 +++++++ hw/gpio/Kconfig | 3 +++ hw/gpio/meson.build | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 1d3026dea9..c21ad260a1 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -480,6 +480,7 @@ config FSL_IMX25 depends on TCG && ARM imply I2C_DEVICES select FSL_IMX25_CCM + select GPIO_IMX select IMX select IMX_AVIC select IMX_EPIT @@ -497,6 +498,7 @@ config FSL_IMX31 depends on TCG && ARM imply I2C_DEVICES select FSL_IMX31_CCM + select GPIO_IMX select SERIAL_MM select IMX select IMX_AVIC @@ -514,6 +516,7 @@ config FSL_IMX6 select FSL_IMX6_CCM select FSL_IMX6_SRC select FSL_IMX7_SNVS + select GPIO_IMX select IMX select IMX_EPIT select IMX_FEC @@ -594,6 +597,7 @@ config FSL_IMX7 select FSL_IMX7_GPR select FSL_IMX7_SNVS select FSL_IMX7_SRC + select GPIO_IMX select PCI select IMX select IMX_FEC @@ -616,6 +620,7 @@ config FSL_IMX8MP select FSL_IMX7_SNVS select FSL_IMX8MP_ANALOG select FSL_IMX8MP_CCM + select GPIO_IMX select IMX select IMX_FEC select IMX_GPT @@ -643,6 +648,7 @@ config FSL_IMX8MM select FSL_IMX7_SNVS select FSL_IMX8MP_ANALOG select FSL_IMX8MP_CCM + select GPIO_IMX select IMX select IMX_FEC select IMX_GPT @@ -683,6 +689,7 @@ config FSL_IMX6UL select FSL_IMX6_SRC select FSL_IMX6UL_CCM select FSL_IMX7_SNVS + select GPIO_IMX select IMX select IMX6UL_LCDIF select IMX_EPIT diff --git a/hw/gpio/Kconfig b/hw/gpio/Kconfig index ea0fb72b40..5ea2c5f427 100644 --- a/hw/gpio/Kconfig +++ b/hw/gpio/Kconfig @@ -1,6 +1,9 @@ config PL061 bool +config GPIO_IMX + bool + config GPIO_KEY bool diff --git a/hw/gpio/meson.build b/hw/gpio/meson.build index 8ede5e88ae..d60dc42ab3 100644 --- a/hw/gpio/meson.build +++ b/hw/gpio/meson.build @@ -1,3 +1,4 @@ +system_ss.add(when: 'CONFIG_GPIO_IMX', if_true: files('imx_gpio.c')) system_ss.add(when: 'CONFIG_GPIO_KEY', if_true: files('gpio_key.c')) system_ss.add(when: 'CONFIG_GPIO_MPC8XXX', if_true: files('mpc8xxx.c')) system_ss.add(when: 'CONFIG_GPIO_PWR', if_true: files('gpio_pwr.c')) @@ -6,7 +7,6 @@ system_ss.add(when: 'CONFIG_PCA9554', if_true: files('pca9554.c')) system_ss.add(when: 'CONFIG_PL061', if_true: files('pl061.c')) system_ss.add(when: 'CONFIG_ZAURUS_SCOOP', if_true: files('zaurus.c')) -system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpio.c')) system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_gpio.c')) system_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_gpio.c')) system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_gpio.c')) -- 2.56.0
