The 'NIOS2' Kconfig symbol is used to select an generic interrupt controller, and has not much to do with the Nios2 target. Rename the symbol as 'ALTERA_IIC'.
Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> --- hw/intc/Kconfig | 3 +++ hw/intc/meson.build | 2 +- hw/nios2/Kconfig | 7 ++----- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index d07954086a..d940c09cde 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -73,3 +73,6 @@ config SIFIVE_CLINT config SIFIVE_PLIC bool + +config ALTERA_IIC + bool diff --git a/hw/intc/meson.build b/hw/intc/meson.build index 3f82cc230a..47c6726b8e 100644 --- a/hw/intc/meson.build +++ b/hw/intc/meson.build @@ -37,7 +37,7 @@ specific_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_plic.c')) specific_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic.c')) specific_ss.add(when: 'CONFIG_LOONGSON_LIOINTC', if_true: files('loongson_liointc.c')) specific_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_gic.c')) -specific_ss.add(when: 'CONFIG_NIOS2', if_true: files('nios2_iic.c')) +specific_ss.add(when: 'CONFIG_ALTERA_IIC', if_true: files('nios2_iic.c')) specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_intc.c')) specific_ss.add(when: 'CONFIG_OMPIC', if_true: files('ompic.c')) specific_ss.add(when: 'CONFIG_OPENPIC_KVM', if_true: files('openpic_kvm.c')) diff --git a/hw/nios2/Kconfig b/hw/nios2/Kconfig index b10ea640da..95e72186af 100644 --- a/hw/nios2/Kconfig +++ b/hw/nios2/Kconfig @@ -1,12 +1,9 @@ config NIOS2_10M50 bool - select NIOS2 + select ALTERA_IIC select SERIAL select ALTERA_TIMER config NIOS2_GENERIC_NOMMU bool - select NIOS2 - -config NIOS2 - bool + select ALTERA_IIC -- 2.26.2