| Message ID | 20190203220744.11734-3-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Kconfig dependencies for MIPS machines (but Malta) | expand |
On 2019-02-03 23:07, Philippe Mathieu-Daudé wrote: > The Jazz use the RC4030 Asic to provide an EISA bus and DMA/IRQ. The > framebuffer display is managed by a G364, the network card is a Sonic > DP83932. A QLogic ESP216 provides a SCSI bus. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > default-configs/mips-softmmu-common.mak | 1 - > default-configs/mips64-softmmu.mak | 6 ------ > default-configs/mips64el-softmmu.mak | 6 ------ > hw/mips/Kconfig | 17 +++++++++++++++++ > 4 files changed, 17 insertions(+), 13 deletions(-) > > diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak > index aa73a4a822..a1681edec4 100644 > --- a/default-configs/mips-softmmu-common.mak > +++ b/default-configs/mips-softmmu-common.mak > @@ -3,7 +3,6 @@ > CONFIG_ISA_BUS=y > CONFIG_PCI=y > CONFIG_PCI_DEVICES=y > -CONFIG_ESP=y > CONFIG_VGA_ISA=y > CONFIG_VGA_ISA_MM=y > CONFIG_VGA_CIRRUS=y > diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak > index bad7496672..ea66ce0b72 100644 > --- a/default-configs/mips64-softmmu.mak > +++ b/default-configs/mips64-softmmu.mak > @@ -1,9 +1,3 @@ > # Default configuration for mips64-softmmu > > include mips-softmmu-common.mak > -CONFIG_RC4030=y > -CONFIG_DP8393X=y > -CONFIG_DS1225Y=y > -CONFIG_JAZZ=y > -CONFIG_G364FB=y > -CONFIG_JAZZ_LED=y > diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak > index 8b255efc54..23445cfcf9 100644 > --- a/default-configs/mips64el-softmmu.mak > +++ b/default-configs/mips64el-softmmu.mak > @@ -2,13 +2,7 @@ > > include mips-softmmu-common.mak > CONFIG_IDE_VIA=y > -CONFIG_RC4030=y > -CONFIG_DP8393X=y > -CONFIG_DS1225Y=y > CONFIG_FULONG=y > -CONFIG_JAZZ=y > -CONFIG_G364FB=y > -CONFIG_JAZZ_LED=y > CONFIG_VT82C686=y > CONFIG_AHCI=y > CONFIG_MIPS_BOSTON=y > diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig > index 3433e97e1a..ab006477c7 100644 > --- a/hw/mips/Kconfig > +++ b/hw/mips/Kconfig > @@ -12,6 +12,23 @@ config MIPSSIM > > config JAZZ > bool > + select ISA_BUS > + select RC4030 > + select I8259 > + select I8254 > + select I8257 > + select PCSPK > + select VGA_ISA_MM > + select G364FB > + select DP8393X > + select ESP > + select FDC > + select MC146818RTC > + select PCKBD > + select SERIAL > + select PARALLEL > + select DS1225Y > + select JAZZ_LED > > config FULONG > bool > You remove CONFIG_JAZZ=y from all the default configs - doesn't disable that the machine completely? Thomas
diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak index aa73a4a822..a1681edec4 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -3,7 +3,6 @@ CONFIG_ISA_BUS=y CONFIG_PCI=y CONFIG_PCI_DEVICES=y -CONFIG_ESP=y CONFIG_VGA_ISA=y CONFIG_VGA_ISA_MM=y CONFIG_VGA_CIRRUS=y diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak index bad7496672..ea66ce0b72 100644 --- a/default-configs/mips64-softmmu.mak +++ b/default-configs/mips64-softmmu.mak @@ -1,9 +1,3 @@ # Default configuration for mips64-softmmu include mips-softmmu-common.mak -CONFIG_RC4030=y -CONFIG_DP8393X=y -CONFIG_DS1225Y=y -CONFIG_JAZZ=y -CONFIG_G364FB=y -CONFIG_JAZZ_LED=y diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index 8b255efc54..23445cfcf9 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -2,13 +2,7 @@ include mips-softmmu-common.mak CONFIG_IDE_VIA=y -CONFIG_RC4030=y -CONFIG_DP8393X=y -CONFIG_DS1225Y=y CONFIG_FULONG=y -CONFIG_JAZZ=y -CONFIG_G364FB=y -CONFIG_JAZZ_LED=y CONFIG_VT82C686=y CONFIG_AHCI=y CONFIG_MIPS_BOSTON=y diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index 3433e97e1a..ab006477c7 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -12,6 +12,23 @@ config MIPSSIM config JAZZ bool + select ISA_BUS + select RC4030 + select I8259 + select I8254 + select I8257 + select PCSPK + select VGA_ISA_MM + select G364FB + select DP8393X + select ESP + select FDC + select MC146818RTC + select PCKBD + select SERIAL + select PARALLEL + select DS1225Y + select JAZZ_LED config FULONG bool
The Jazz use the RC4030 Asic to provide an EISA bus and DMA/IRQ. The framebuffer display is managed by a G364, the network card is a Sonic DP83932. A QLogic ESP216 provides a SCSI bus. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- default-configs/mips-softmmu-common.mak | 1 - default-configs/mips64-softmmu.mak | 6 ------ default-configs/mips64el-softmmu.mak | 6 ------ hw/mips/Kconfig | 17 +++++++++++++++++ 4 files changed, 17 insertions(+), 13 deletions(-)