| Message ID | 20190311005618.19007-4-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Kconfig dependencies for MIPS machines (but Malta) | expand |
On 11/03/2019 01.56, Philippe Mathieu-Daudé wrote: > This platform use standard PC devices connected to an ISA bus. > Networking is provided by a ne2000 chipset. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > v3: remove CONFIG_NE2000_ISA (Thomas) > add PFLASH_CFI01 > --- > default-configs/mips-softmmu-common.mak | 1 - > hw/mips/Kconfig | 11 +++++++++++ > 2 files changed, 11 insertions(+), 1 deletion(-) > > diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak > index caebafd416..2ca57bfee1 100644 > --- a/default-configs/mips-softmmu-common.mak > +++ b/default-configs/mips-softmmu-common.mak > @@ -24,7 +24,6 @@ CONFIG_I8257=y > CONFIG_PIIX4=y > CONFIG_IDE_ISA=y > CONFIG_IDE_PIIX=y > -CONFIG_NE2000_ISA=y > CONFIG_PFLASH_CFI01=y > CONFIG_I8259=y > CONFIG_MC146818RTC=y > diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig > index ab006477c7..5678c9cf15 100644 > --- a/hw/mips/Kconfig > +++ b/hw/mips/Kconfig > @@ -1,5 +1,16 @@ > config R4K > bool > + select ISA_BUS > + select SERIAL_ISA > + select I8259 > + select I8254 > + select MC146818RTC > + select VGA_ISA > + select NE2000_ISA Since Paolo now also introduced the "imply" keyword, I think you should use "imply" instead of "select" for both, VGA_ISA and NE2000_ISA, since the r4k machine can work without both when you specify -vga none and -net none. Thomas
On 3/11/19 7:58 AM, Thomas Huth wrote: > On 11/03/2019 01.56, Philippe Mathieu-Daudé wrote: >> This platform use standard PC devices connected to an ISA bus. >> Networking is provided by a ne2000 chipset. >> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> >> --- >> v3: remove CONFIG_NE2000_ISA (Thomas) >> add PFLASH_CFI01 >> --- >> default-configs/mips-softmmu-common.mak | 1 - >> hw/mips/Kconfig | 11 +++++++++++ >> 2 files changed, 11 insertions(+), 1 deletion(-) >> >> diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak >> index caebafd416..2ca57bfee1 100644 >> --- a/default-configs/mips-softmmu-common.mak >> +++ b/default-configs/mips-softmmu-common.mak >> @@ -24,7 +24,6 @@ CONFIG_I8257=y >> CONFIG_PIIX4=y >> CONFIG_IDE_ISA=y >> CONFIG_IDE_PIIX=y >> -CONFIG_NE2000_ISA=y >> CONFIG_PFLASH_CFI01=y >> CONFIG_I8259=y >> CONFIG_MC146818RTC=y >> diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig >> index ab006477c7..5678c9cf15 100644 >> --- a/hw/mips/Kconfig >> +++ b/hw/mips/Kconfig >> @@ -1,5 +1,16 @@ >> config R4K >> bool >> + select ISA_BUS >> + select SERIAL_ISA >> + select I8259 >> + select I8254 >> + select MC146818RTC >> + select VGA_ISA >> + select NE2000_ISA > > Since Paolo now also introduced the "imply" keyword, I think you should > use "imply" instead of "select" for both, VGA_ISA and NE2000_ISA, since > the r4k machine can work without both when you specify -vga none and > -net none. OK I'll use "imply", thanks. > > Thomas >
diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak index caebafd416..2ca57bfee1 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -24,7 +24,6 @@ CONFIG_I8257=y CONFIG_PIIX4=y CONFIG_IDE_ISA=y CONFIG_IDE_PIIX=y -CONFIG_NE2000_ISA=y CONFIG_PFLASH_CFI01=y CONFIG_I8259=y CONFIG_MC146818RTC=y diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index ab006477c7..5678c9cf15 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -1,5 +1,16 @@ config R4K bool + select ISA_BUS + select SERIAL_ISA + select I8259 + select I8254 + select MC146818RTC + select VGA_ISA + select NE2000_ISA + select IDE_ISA + # I8042 + select PCKBD + select PFLASH_CFI01 config MALTA bool
This platform use standard PC devices connected to an ISA bus. Networking is provided by a ne2000 chipset. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- v3: remove CONFIG_NE2000_ISA (Thomas) add PFLASH_CFI01 --- default-configs/mips-softmmu-common.mak | 1 - hw/mips/Kconfig | 11 +++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-)