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_IMX{6,7}_SRC to eventually eliminate config
IMX.Signed-off-by: Bernhard Beschow <[email protected]> --- hw/arm/Kconfig | 3 +++ hw/misc/Kconfig | 6 ++++++ hw/misc/meson.build | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index d3dda015c4..7e909485e6 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -504,6 +504,7 @@ config FSL_IMX6 imply PCIE_DEVICES imply I2C_DEVICES select A9MPCORE + select FSL_IMX6_SRC select IMX select IMX_FEC select IMX_I2C @@ -579,6 +580,7 @@ config FSL_IMX7 imply I2C_DEVICES select A15MPCORE select FSL_IMX7_GPR + select FSL_IMX7_SRC select PCI select IMX select IMX_FEC @@ -661,6 +663,7 @@ config FSL_IMX6UL depends on TCG && ARM imply I2C_DEVICES select A15MPCORE + select FSL_IMX6_SRC select IMX select IMX6UL_LCDIF select IMX_FEC diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index cf9ea68219..193a6b5f56 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -97,9 +97,15 @@ config IMX config IMX_RNG bool +config FSL_IMX6_SRC + bool + config FSL_IMX7_GPR bool +config FSL_IMX7_SRC + bool + config FSL_IMX8MP_ANALOG bool diff --git a/hw/misc/meson.build b/hw/misc/meson.build index c31c173e5a..477fbd60fa 100644 --- a/hw/misc/meson.build +++ b/hw/misc/meson.build @@ -60,7 +60,9 @@ 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_IMX6_SRC', if_true: files('imx6_src.c')) system_ss.add(when: 'CONFIG_FSL_IMX7_GPR', if_true: files('imx7_gpr.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_RNG', if_true: files('imx_rngc.c')) @@ -68,10 +70,8 @@ system_ss.add(when: 'CONFIG_IMX', if_true: files( 'imx25_ccm.c', 'imx31_ccm.c', 'imx6_ccm.c', - 'imx6_src.c', 'imx6ul_ccm.c', 'imx7_ccm.c', - 'imx7_src.c', 'imx7_snvs.c', 'imx_ccm.c', )) -- 2.55.0
