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 SoC-specific config FSL_IMXx_CCM to eventually eliminate config IMX.
Note that config IMX_CCM represents a base class for i.MX clock control modules which is used in i.MX timers and FlexCAN. Signed-off-by: Bernhard Beschow <[email protected]> --- hw/arm/Kconfig | 5 +++++ hw/misc/Kconfig | 25 +++++++++++++++++++++++++ hw/misc/meson.build | 14 ++++++-------- hw/net/Kconfig | 2 +- 4 files changed, 37 insertions(+), 9 deletions(-) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index cd9ddeb822..0649417305 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -478,6 +478,7 @@ config FSL_IMX25 default y depends on TCG && ARM imply I2C_DEVICES + select FSL_IMX25_CCM select IMX select IMX_AVIC select IMX_FEC @@ -492,6 +493,7 @@ config FSL_IMX31 default y depends on TCG && ARM imply I2C_DEVICES + select FSL_IMX31_CCM select SERIAL_MM select IMX select IMX_AVIC @@ -504,6 +506,7 @@ config FSL_IMX6 imply PCIE_DEVICES imply I2C_DEVICES select A9MPCORE + select FSL_IMX6_CCM select FSL_IMX6_SRC select FSL_IMX7_SNVS select IMX @@ -580,6 +583,7 @@ config FSL_IMX7 imply TEST_DEVICES imply I2C_DEVICES select A15MPCORE + select FSL_IMX7_CCM select FSL_IMX7_GPR select FSL_IMX7_SNVS select FSL_IMX7_SRC @@ -668,6 +672,7 @@ config FSL_IMX6UL imply I2C_DEVICES select A15MPCORE select FSL_IMX6_SRC + select FSL_IMX6UL_CCM select FSL_IMX7_SNVS select IMX select IMX6UL_LCDIF diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 4d47de6a02..a2095d64ae 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -91,15 +91,39 @@ config ECCMEMCTL config IMX bool + depends on IMX_CCM select PTIMER select SSI +config IMX_CCM + bool + config IMX_RNG bool +config FSL_IMX25_CCM + bool + select IMX_CCM + +config FSL_IMX31_CCM + bool + select IMX_CCM + +config FSL_IMX6_CCM + bool + select IMX_CCM + config FSL_IMX6_SRC bool +config FSL_IMX6UL_CCM + bool + select IMX_CCM + +config FSL_IMX7_CCM + bool + select IMX_CCM + config FSL_IMX7_GPR bool @@ -114,6 +138,7 @@ config FSL_IMX8MP_ANALOG config FSL_IMX8MP_CCM bool + select IMX_CCM config STM32_RCC bool diff --git a/hw/misc/meson.build b/hw/misc/meson.build index 48c5c20455..6ff31183a6 100644 --- a/hw/misc/meson.build +++ b/hw/misc/meson.build @@ -60,21 +60,19 @@ system_ss.add(when: 'CONFIG_AXP2XX_PMU', if_true: files('axp2xx.c')) system_ss.add(when: 'CONFIG_REALVIEW', if_true: files('arm_sysctl.c')) system_ss.add(when: 'CONFIG_ECCMEMCTL', if_true: files('eccmemctl.c')) system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_pmu.c', 'exynos4210_clk.c', 'exynos4210_rng.c')) +system_ss.add(when: 'CONFIG_FSL_IMX25_CCM', if_true: files('imx25_ccm.c')) +system_ss.add(when: 'CONFIG_FSL_IMX31_CCM', if_true: files('imx31_ccm.c')) +system_ss.add(when: 'CONFIG_FSL_IMX6_CCM', if_true: files('imx6_ccm.c')) system_ss.add(when: 'CONFIG_FSL_IMX6_SRC', if_true: files('imx6_src.c')) +system_ss.add(when: 'CONFIG_FSL_IMX6UL_CCM', if_true: files('imx6ul_ccm.c')) +system_ss.add(when: 'CONFIG_FSL_IMX7_CCM', if_true: files('imx7_ccm.c')) system_ss.add(when: 'CONFIG_FSL_IMX7_GPR', if_true: files('imx7_gpr.c')) system_ss.add(when: 'CONFIG_FSL_IMX7_SNVS', if_true: files('imx7_snvs.c')) system_ss.add(when: 'CONFIG_FSL_IMX7_SRC', if_true: files('imx7_src.c')) system_ss.add(when: 'CONFIG_FSL_IMX8MP_ANALOG', if_true: files('imx8mp_analog.c')) system_ss.add(when: 'CONFIG_FSL_IMX8MP_CCM', if_true: files('imx8mp_ccm.c')) +system_ss.add(when: 'CONFIG_IMX_CCM', if_true: files('imx_ccm.c')) system_ss.add(when: 'CONFIG_IMX_RNG', if_true: files('imx_rngc.c')) -system_ss.add(when: 'CONFIG_IMX', if_true: files( - 'imx25_ccm.c', - 'imx31_ccm.c', - 'imx6_ccm.c', - 'imx6ul_ccm.c', - 'imx7_ccm.c', - 'imx_ccm.c', -)) system_ss.add(when: 'CONFIG_MAX78000_AES', if_true: files('max78000_aes.c')) system_ss.add(when: 'CONFIG_MAX78000_GCR', if_true: files('max78000_gcr.c')) system_ss.add(when: 'CONFIG_MAX78000_ICC', if_true: files('max78000_icc.c')) diff --git a/hw/net/Kconfig b/hw/net/Kconfig index b56a173eed..4a2cacbcd2 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -160,5 +160,5 @@ config CAN_CTUCANFD_PCI config CAN_FLEXCAN bool - depends on IMX + depends on IMX_CCM select CAN_BUS -- 2.55.0
