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 FSL_IMX7_GPR to eventually eliminate config IMX.
Signed-off-by: Bernhard Beschow <[email protected]> --- hw/arm/Kconfig | 1 + hw/misc/Kconfig | 3 +++ hw/misc/meson.build | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 1436c05c98..d3dda015c4 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -578,6 +578,7 @@ config FSL_IMX7 imply TEST_DEVICES imply I2C_DEVICES select A15MPCORE + select FSL_IMX7_GPR select PCI select IMX select IMX_FEC diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 3f17d29053..cf9ea68219 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -97,6 +97,9 @@ config IMX config IMX_RNG bool +config FSL_IMX7_GPR + bool + config FSL_IMX8MP_ANALOG bool diff --git a/hw/misc/meson.build b/hw/misc/meson.build index 61e128ab7a..c31c173e5a 100644 --- a/hw/misc/meson.build +++ b/hw/misc/meson.build @@ -60,6 +60,7 @@ 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_IMX7_GPR', if_true: files('imx7_gpr.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')) @@ -71,7 +72,6 @@ system_ss.add(when: 'CONFIG_IMX', if_true: files( 'imx6ul_ccm.c', 'imx7_ccm.c', 'imx7_src.c', - 'imx7_gpr.c', 'imx7_snvs.c', 'imx_ccm.c', )) -- 2.55.0
