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_RNG 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 1ea4210ccb..1436c05c98 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -482,6 +482,7 @@ config FSL_IMX25 select IMX_AVIC select IMX_FEC select IMX_I2C + select IMX_RNG select USB_CHIPIDEA select WDT_IMX2 select SDHCI diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index d1711433ef..3f17d29053 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -94,6 +94,9 @@ config IMX select PTIMER select SSI +config IMX_RNG + bool + config FSL_IMX8MP_ANALOG bool diff --git a/hw/misc/meson.build b/hw/misc/meson.build index 9790afa104..61e128ab7a 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_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')) system_ss.add(when: 'CONFIG_IMX', if_true: files( 'imx25_ccm.c', 'imx31_ccm.c', @@ -73,7 +74,6 @@ system_ss.add(when: 'CONFIG_IMX', if_true: files( 'imx7_gpr.c', 'imx7_snvs.c', 'imx_ccm.c', - 'imx_rngc.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')) -- 2.55.0
