* [PATCH] hw/intc: Rename NIOS2 kconfig as ALTERA_IIC
@ 2020-10-07 13:00 Philippe Mathieu-Daudé
2020-10-15 18:09 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 2+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-10-07 13:00 UTC (permalink / raw)
To: qemu-devel
Cc: Marek Vasut, qemu-trivial, Chris Wulff, Philippe Mathieu-Daudé
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é <f4bug@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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] hw/intc: Rename NIOS2 kconfig as ALTERA_IIC
2020-10-07 13:00 [PATCH] hw/intc: Rename NIOS2 kconfig as ALTERA_IIC Philippe Mathieu-Daudé
@ 2020-10-15 18:09 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 2+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-10-15 18:09 UTC (permalink / raw)
To: qemu-devel, Sandra Loosemore, Julian Brown, Andrew Jenner
Cc: Marek Vasut, qemu-trivial, Chris Wulff
ping?
On 10/7/20 3:00 PM, Philippe Mathieu-Daudé wrote:
> 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é <f4bug@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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-15 18:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-07 13:00 [PATCH] hw/intc: Rename NIOS2 kconfig as ALTERA_IIC Philippe Mathieu-Daudé
2020-10-15 18:09 ` Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).