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_GPT to eventually eliminate config IMX.
Signed-off-by: Bernhard Beschow <[email protected]> --- hw/arm/Kconfig | 7 +++++++ hw/timer/Kconfig | 5 +++++ hw/timer/meson.build | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 0649417305..e7ed5ea680 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -482,6 +482,7 @@ config FSL_IMX25 select IMX select IMX_AVIC select IMX_FEC + select IMX_GPT select IMX_I2C select IMX_RNG select USB_CHIPIDEA @@ -497,6 +498,7 @@ config FSL_IMX31 select SERIAL_MM select IMX select IMX_AVIC + select IMX_GPT select IMX_I2C select WDT_IMX2 select LAN9118 @@ -511,6 +513,7 @@ config FSL_IMX6 select FSL_IMX7_SNVS select IMX select IMX_FEC + select IMX_GPT select IMX_I2C select IMX_USBPHY select CAN_FLEXCAN @@ -591,6 +594,7 @@ config FSL_IMX7 select IMX select IMX_FEC select IMX_GPCV2 + select IMX_GPT select IMX_I2C select WDT_IMX2 select PCI_EXPRESS_DESIGNWARE @@ -610,6 +614,7 @@ config FSL_IMX8MP select FSL_IMX8MP_CCM select IMX select IMX_FEC + select IMX_GPT select IMX_I2C select OR_IRQ select PCI_EXPRESS_DESIGNWARE @@ -636,6 +641,7 @@ config FSL_IMX8MM select FSL_IMX8MP_CCM select IMX select IMX_FEC + select IMX_GPT select IMX_I2C select OR_IRQ select SDHCI @@ -678,6 +684,7 @@ config FSL_IMX6UL select IMX6UL_LCDIF select IMX_FEC select IMX_GPCV2 + select IMX_GPT select IMX_I2C select IMX_USBPHY select WDT_IMX2 diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index e1b751a54a..49a4d20e55 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -23,6 +23,11 @@ config I8254 bool depends on ISA_BUS +config IMX_GPT + bool + depends on IMX_CCM + select PTIMER + config ALLWINNER_A10_PIT bool select PTIMER diff --git a/hw/timer/meson.build b/hw/timer/meson.build index 8323efaf46..477dd47486 100644 --- a/hw/timer/meson.build +++ b/hw/timer/meson.build @@ -16,7 +16,7 @@ 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', if_true: files('imx_gpt.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')) system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_timer.c')) -- 2.55.0
