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_SNVS to eventually eliminate config IMX.
Signed-off-by: Bernhard Beschow <[email protected]> --- hw/arm/Kconfig | 5 +++++ hw/misc/Kconfig | 3 +++ hw/misc/meson.build | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 7e909485e6..cd9ddeb822 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -505,6 +505,7 @@ config FSL_IMX6 imply I2C_DEVICES select A9MPCORE select FSL_IMX6_SRC + select FSL_IMX7_SNVS select IMX select IMX_FEC select IMX_I2C @@ -580,6 +581,7 @@ config FSL_IMX7 imply I2C_DEVICES select A15MPCORE select FSL_IMX7_GPR + select FSL_IMX7_SNVS select FSL_IMX7_SRC select PCI select IMX @@ -599,6 +601,7 @@ config FSL_IMX8MP imply PCI_DEVICES select ARM_GIC select CAN_FLEXCAN + select FSL_IMX7_SNVS select FSL_IMX8MP_ANALOG select FSL_IMX8MP_CCM select IMX @@ -624,6 +627,7 @@ config FSL_IMX8MM imply PCI_DEVICES imply I2C_DEVICES select ARM_GIC + select FSL_IMX7_SNVS select FSL_IMX8MP_ANALOG select FSL_IMX8MP_CCM select IMX @@ -664,6 +668,7 @@ config FSL_IMX6UL imply I2C_DEVICES select A15MPCORE select FSL_IMX6_SRC + select FSL_IMX7_SNVS select IMX select IMX6UL_LCDIF select IMX_FEC diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 193a6b5f56..4d47de6a02 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -103,6 +103,9 @@ config FSL_IMX6_SRC config FSL_IMX7_GPR bool +config FSL_IMX7_SNVS + bool + config FSL_IMX7_SRC bool diff --git a/hw/misc/meson.build b/hw/misc/meson.build index 477fbd60fa..48c5c20455 100644 --- a/hw/misc/meson.build +++ b/hw/misc/meson.build @@ -62,6 +62,7 @@ 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_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')) @@ -72,7 +73,6 @@ system_ss.add(when: 'CONFIG_IMX', if_true: files( 'imx6_ccm.c', 'imx6ul_ccm.c', 'imx7_ccm.c', - 'imx7_snvs.c', 'imx_ccm.c', )) system_ss.add(when: 'CONFIG_MAX78000_AES', if_true: files('max78000_aes.c')) -- 2.55.0
