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_EPIT to eventually eliminate config IMX.
Signed-off-by: Bernhard Beschow <[email protected]> --- hw/arm/Kconfig | 4 ++++ hw/misc/Kconfig | 2 -- hw/timer/Kconfig | 5 +++++ hw/timer/meson.build | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index e7ed5ea680..a2d94e238d 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -481,6 +481,7 @@ config FSL_IMX25 select FSL_IMX25_CCM select IMX select IMX_AVIC + select IMX_EPIT select IMX_FEC select IMX_GPT select IMX_I2C @@ -498,6 +499,7 @@ config FSL_IMX31 select SERIAL_MM select IMX select IMX_AVIC + select IMX_EPIT select IMX_GPT select IMX_I2C select WDT_IMX2 @@ -512,6 +514,7 @@ config FSL_IMX6 select FSL_IMX6_SRC select FSL_IMX7_SNVS select IMX + select IMX_EPIT select IMX_FEC select IMX_GPT select IMX_I2C @@ -682,6 +685,7 @@ config FSL_IMX6UL select FSL_IMX7_SNVS select IMX select IMX6UL_LCDIF + select IMX_EPIT select IMX_FEC select IMX_GPCV2 select IMX_GPT diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index a2095d64ae..dbdef58505 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -91,8 +91,6 @@ config ECCMEMCTL config IMX bool - depends on IMX_CCM - select PTIMER select SSI config IMX_CCM diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index 49a4d20e55..e098376d40 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -23,6 +23,11 @@ config I8254 bool depends on ISA_BUS +config IMX_EPIT + bool + depends on IMX_CCM + select PTIMER + config IMX_GPT bool depends on IMX_CCM diff --git a/hw/timer/meson.build b/hw/timer/meson.build index 477dd47486..e2bcdbdf65 100644 --- a/hw/timer/meson.build +++ b/hw/timer/meson.build @@ -15,7 +15,7 @@ system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_pwm.c')) system_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_gptimer.c')) system_ss.add(when: 'CONFIG_HPET_C', if_true: files('hpet.c')) system_ss.add(when: 'CONFIG_I8254', if_true: files('i8254_common.c', 'i8254.c')) -system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_epit.c')) +system_ss.add(when: 'CONFIG_IMX_EPIT', if_true: files('imx_epit.c')) system_ss.add(when: 'CONFIG_IMX_GPT', if_true: files('imx_gpt.c')) system_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_gictimer.c')) system_ss.add(when: 'CONFIG_MSF2', if_true: files('mss-timer.c')) -- 2.55.0
