| Message ID | 20190311005618.19007-8-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Kconfig dependencies for MIPS machines (but Malta) | expand |
> From: Philippe Mathieu-Daudé <philmd@redhat.com> > Subject: [PATCH v3 7/7] hw/mips: Express dependencies of the Fulong 2E machine with Kconfig > > The Fulong 2E machine uses a Loongson 2E as CPU, a Bonito64 system > controller as North Bridge and a VT82C686 chipset as South Bridge. >The network card chipset is a RTL8139D. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
On 11/03/2019 01.56, Philippe Mathieu-Daudé wrote: > The Fulong 2E machine uses a Loongson 2E as CPU, a Bonito64 system > controller as North Bridge and a VT82C686 chipset as South Bridge. > The network card chipset is a RTL8139D. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > v3: Loongson 2E = CPU, Fulong 2E = machine (Aleksandar) > --- > default-configs/mips64el-softmmu.mak | 3 --- > hw/isa/Kconfig | 13 +++++++++---- > hw/mips/Kconfig | 5 +++++ > 3 files changed, 14 insertions(+), 7 deletions(-) > > diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak > index 88b66a91d7..d0814e76af 100644 > --- a/default-configs/mips64el-softmmu.mak > +++ b/default-configs/mips64el-softmmu.mak > @@ -1,9 +1,6 @@ > # Default configuration for mips64el-softmmu > > include mips-softmmu-common.mak > -CONFIG_IDE_VIA=y > CONFIG_FULONG=y > -CONFIG_PCI_BONITO=y I think I'd rather squash the previous patch into this one here (and adjust the patch description here with some information about BONITO), so that you don't have to remove the switch again that you've just added one patch earlier. > CONFIG_JAZZ=y > -CONFIG_VT82C686=y > CONFIG_MIPS_BOSTON=y > diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig > index 57e09a0cb8..30055aed82 100644 > --- a/hw/isa/Kconfig > +++ b/hw/isa/Kconfig > @@ -32,10 +32,15 @@ config PIIX4 > > config VT82C686 > bool > - select ISA_BUS > - select ACPI_SMBUS > - select SERIAL_ISA > - select FDC > + select PCI > + select I8259 > + select I8254 > + select I8257 > + select PARALLEL > + select IDE_ISA > + select IDE_VIA > + select USB_UHCI > + #select PCKBD Why is this commented out? Please mention the reason either in the commit message or in an additional comment here. > config SMC37C669 > bool > diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig > index bd6e3be2cd..b06d70bf01 100644 > --- a/hw/mips/Kconfig > +++ b/hw/mips/Kconfig > @@ -43,6 +43,11 @@ config JAZZ > > config FULONG > bool > + select PCI_BONITO > + select VT82C686 > + select SMBUS_EEPROM > + select RTL8139_PCI I'd suggest to use "imply RTL8139_PCI" here instead, since "-net none" should be possible for this machine, too. Thomas
On 3/11/19 12:25 PM, Thomas Huth wrote: > On 11/03/2019 01.56, Philippe Mathieu-Daudé wrote: >> The Fulong 2E machine uses a Loongson 2E as CPU, a Bonito64 system >> controller as North Bridge and a VT82C686 chipset as South Bridge. >> The network card chipset is a RTL8139D. >> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> >> --- >> v3: Loongson 2E = CPU, Fulong 2E = machine (Aleksandar) >> --- >> default-configs/mips64el-softmmu.mak | 3 --- >> hw/isa/Kconfig | 13 +++++++++---- >> hw/mips/Kconfig | 5 +++++ >> 3 files changed, 14 insertions(+), 7 deletions(-) >> >> diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak >> index 88b66a91d7..d0814e76af 100644 >> --- a/default-configs/mips64el-softmmu.mak >> +++ b/default-configs/mips64el-softmmu.mak >> @@ -1,9 +1,6 @@ >> # Default configuration for mips64el-softmmu >> >> include mips-softmmu-common.mak >> -CONFIG_IDE_VIA=y >> CONFIG_FULONG=y >> -CONFIG_PCI_BONITO=y > > I think I'd rather squash the previous patch into this one here (and > adjust the patch description here with some information about BONITO), > so that you don't have to remove the switch again that you've just added > one patch earlier. I find it clearer this way... And easier for the PCI maintainers to review. > >> CONFIG_JAZZ=y >> -CONFIG_VT82C686=y >> CONFIG_MIPS_BOSTON=y >> diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig >> index 57e09a0cb8..30055aed82 100644 >> --- a/hw/isa/Kconfig >> +++ b/hw/isa/Kconfig >> @@ -32,10 +32,15 @@ config PIIX4 >> >> config VT82C686 >> bool >> - select ISA_BUS >> - select ACPI_SMBUS >> - select SERIAL_ISA >> - select FDC >> + select PCI >> + select I8259 >> + select I8254 >> + select I8257 >> + select PARALLEL >> + select IDE_ISA >> + select IDE_VIA >> + select USB_UHCI >> + #select PCKBD > > Why is this commented out? Please mention the reason either in the > commit message or in an additional comment here. Oops I missed this while rebasing. I commented this because I was not sure how to express the "USB Legacy Support", I couldn't find reference to this feature in the USB specs. It looks something the southbridge manufacturers use to emulate an i8042 controller for USB keyboard/mouse. Gerd any idea? Thomas, what about adding in hw/usb/Kconfig: config USB_LEGACY_PS2_SUPPORT # Emulated i8042 select I8042 >> config SMC37C669 >> bool >> diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig >> index bd6e3be2cd..b06d70bf01 100644 >> --- a/hw/mips/Kconfig >> +++ b/hw/mips/Kconfig >> @@ -43,6 +43,11 @@ config JAZZ >> >> config FULONG >> bool >> + select PCI_BONITO >> + select VT82C686 >> + select SMBUS_EEPROM >> + select RTL8139_PCI > > I'd suggest to use "imply RTL8139_PCI" here instead, since "-net none" > should be possible for this machine, too. This chipset is soldered onboard, so I'd rather keep it that way... The -net option is confusing IMHO. Thought?
diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index 88b66a91d7..d0814e76af 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -1,9 +1,6 @@ # Default configuration for mips64el-softmmu include mips-softmmu-common.mak -CONFIG_IDE_VIA=y CONFIG_FULONG=y -CONFIG_PCI_BONITO=y CONFIG_JAZZ=y -CONFIG_VT82C686=y CONFIG_MIPS_BOSTON=y diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index 57e09a0cb8..30055aed82 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -32,10 +32,15 @@ config PIIX4 config VT82C686 bool - select ISA_BUS - select ACPI_SMBUS - select SERIAL_ISA - select FDC + select PCI + select I8259 + select I8254 + select I8257 + select PARALLEL + select IDE_ISA + select IDE_VIA + select USB_UHCI + #select PCKBD config SMC37C669 bool diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index bd6e3be2cd..b06d70bf01 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -43,6 +43,11 @@ config JAZZ config FULONG bool + select PCI_BONITO + select VT82C686 + select SMBUS_EEPROM + select RTL8139_PCI + select MC146818RTC config MIPS_CPS bool
The Fulong 2E machine uses a Loongson 2E as CPU, a Bonito64 system controller as North Bridge and a VT82C686 chipset as South Bridge. The network card chipset is a RTL8139D. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- v3: Loongson 2E = CPU, Fulong 2E = machine (Aleksandar) --- default-configs/mips64el-softmmu.mak | 3 --- hw/isa/Kconfig | 13 +++++++++---- hw/mips/Kconfig | 5 +++++ 3 files changed, 14 insertions(+), 7 deletions(-)