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_AVIC to eventually eliminate config IMX.
Signed-off-by: Bernhard Beschow <[email protected]> --- hw/arm/Kconfig | 2 ++ hw/intc/Kconfig | 3 +++ hw/intc/meson.build | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index ad4b997abb..0b8414501c 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -479,6 +479,7 @@ config FSL_IMX25 depends on TCG && ARM imply I2C_DEVICES select IMX + select IMX_AVIC select IMX_FEC select IMX_I2C select USB_CHIPIDEA @@ -492,6 +493,7 @@ config FSL_IMX31 imply I2C_DEVICES select SERIAL_MM select IMX + select IMX_AVIC select IMX_I2C select WDT_IMX2 select LAN9118 diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index 05e697967d..97355f9df7 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -5,6 +5,9 @@ config I8259 bool select ISA_BUS +config IMX_AVIC + bool + config PL190 bool diff --git a/hw/intc/meson.build b/hw/intc/meson.build index 0620b0792a..74d84b8ddc 100644 --- a/hw/intc/meson.build +++ b/hw/intc/meson.build @@ -23,7 +23,8 @@ system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_gic.c', 'exynos system_ss.add(when: 'CONFIG_GOLDFISH_PIC', if_true: files('goldfish_pic.c')) system_ss.add(when: 'CONFIG_HEATHROW_PIC', if_true: files('heathrow_pic.c')) system_ss.add(when: 'CONFIG_I8259', if_true: files('i8259_common.c', 'i8259.c')) -system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_avic.c', 'imx_gpcv2.c')) +system_ss.add(when: 'CONFIG_IMX_AVIC', if_true: files('imx_avic.c')) +system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpcv2.c')) system_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic_common.c'), if_false: files('ioapic-stub.c')) system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_intc.c')) system_ss.add(when: 'CONFIG_OPENPIC', if_true: files('openpic.c')) -- 2.55.0
