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_GPCV2 to eventually eliminate config IMX.
Signed-off-by: Bernhard Beschow <[email protected]> --- hw/arm/Kconfig | 2 ++ hw/intc/Kconfig | 3 +++ hw/intc/meson.build | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 0b8414501c..1ea4210ccb 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -580,6 +580,7 @@ config FSL_IMX7 select PCI select IMX select IMX_FEC + select IMX_GPCV2 select IMX_I2C select WDT_IMX2 select PCI_EXPRESS_DESIGNWARE @@ -661,6 +662,7 @@ config FSL_IMX6UL select IMX select IMX6UL_LCDIF select IMX_FEC + select IMX_GPCV2 select IMX_I2C select IMX_USBPHY select WDT_IMX2 diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index 97355f9df7..98dba7efb8 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -8,6 +8,9 @@ config I8259 config IMX_AVIC bool +config IMX_GPCV2 + bool + config PL190 bool diff --git a/hw/intc/meson.build b/hw/intc/meson.build index 74d84b8ddc..2ac575095f 100644 --- a/hw/intc/meson.build +++ b/hw/intc/meson.build @@ -24,7 +24,7 @@ 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_AVIC', if_true: files('imx_avic.c')) -system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpcv2.c')) +system_ss.add(when: 'CONFIG_IMX_GPCV2', 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
