Skip to contentSkip to conversation

Kconfig dependencies for MIPS machines (but Malta)

PATCH Superseded Philippe Mathieu-Daudé 3 participants 20 messages Feb 3, 2019 – Feb 4, 2019

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

cover Kconfig dependencies for MIPS machines (but Malta)

Express the MIPS machine dependencies with Kconfig.

Due to the complexity of the PIIX codebase being shared with the X86 machines, the Malta board fill follow in a different series (after some refactor cleanup).

Regards,

Phil.

Based on "Kconfig dependencies for ppc machines" from Thomas Huth (which is based on Paolo's, which uses Yang Zhong "make qemu configurable for Kconfig" v1).
Based-on: [email protected]

Philippe Mathieu-Daudé (6):
mips: Express dependencies of the MIPSsim machine with kconfig
mips: Express dependencies of the Jazz machine with kconfig
mips: Express dependencies of the r4k platform with kconfig
mips: Express dependencies of the Boston machine with kconfig hw/pci-host: Use CONFIG_PCI_BONITO to select the Bonito North Bridge
mips: Express dependencies of the Loongson 2E machine with kconfig

 default-configs/mips-softmmu-common.mak |  4 ---
 default-configs/mips64-softmmu.mak      |  6 ----
 default-configs/mips64el-softmmu.mak    | 14 ---------
 hw/isa/Kconfig                          | 13 +++++---
 hw/mips/Kconfig                         | 40 +++++++++++++++++++++++++
 hw/pci-host/Kconfig                     |  4 +++
 hw/pci-host/Makefile.objs               |  2 +-
 7 files changed, 54 insertions(+), 29 deletions(-)
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/6 mips: Express dependencies of the MIPSsim machine with kconfig

The MIPSsim machine only emulates an 8250 UART and a simple network controller, connected via an ISA bus.

---
 default-configs/mips-softmmu-common.mak | 2 --
 hw/mips/Kconfig                         | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)
default-configs/mips-softmmu-common.mak +0 -2
index 0795d522db..aa73a4a822 100644
@@ -26,7 +26,6 @@ CONFIG_PIIX4=y
 CONFIG_IDE_ISA=y
 CONFIG_IDE_PIIX=y
 CONFIG_NE2000_ISA=y
-CONFIG_MIPSNET=y
 CONFIG_PFLASH_CFI01=y
 CONFIG_I8259=y
 CONFIG_MC146818RTC=y
@@ -35,7 +34,6 @@ CONFIG_MIPS_CPS=y
 CONFIG_MIPS_ITU=y
 CONFIG_R4K=y
 CONFIG_MALTA=y
-CONFIG_MIPSSIM=y
 CONFIG_ACPI_SMBUS=y
 CONFIG_SMBUS_EEPROM=y
 CONFIG_TEST_DEVICES=y
hw/mips/Kconfig +3 -0
index cdc07e59b6..3433e97e1a 100644
@@ -6,6 +6,9 @@ config MALTA
 
 config MIPSSIM
     bool
+    select ISA_BUS
+    select SERIAL_ISA
+    select MIPSNET
 
 config JAZZ
     bool
Signature · 1 line
2.20.1
Reviewed-by on v1 1/6
#2 lore raw

Re: [Qemu-devel] [PATCH 1/6] mips: Express dependencies of the MIPSsim machine with kconfig

Quoted 35 lines · Philippe Mathieu-Daudé

The MIPSsim machine only emulates an 8250 UART and a simple network controller, connected via an ISA bus.

---
 default-configs/mips-softmmu-common.mak | 2 --
 hw/mips/Kconfig                         | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)
default-configs/mips-softmmu-common.mak +0 -2
index 0795d522db..aa73a4a822 100644
@@ -26,7 +26,6 @@ CONFIG_PIIX4=y
 CONFIG_IDE_ISA=y
 CONFIG_IDE_PIIX=y
 CONFIG_NE2000_ISA=y
-CONFIG_MIPSNET=y
 CONFIG_PFLASH_CFI01=y
 CONFIG_I8259=y
 CONFIG_MC146818RTC=y
@@ -35,7 +34,6 @@ CONFIG_MIPS_CPS=y
 CONFIG_MIPS_ITU=y
 CONFIG_R4K=y
 CONFIG_MALTA=y
-CONFIG_MIPSSIM=y
 CONFIG_ACPI_SMBUS=y
 CONFIG_SMBUS_EEPROM=y
 CONFIG_TEST_DEVICES=y
hw/mips/Kconfig +0 -0
index cdc07e59b6..3433e97e1a 100644

hw/mips/Kconfig config MALTA · line 14

Quoted 9 lines
hw/mips/Kconfig +3 -0
@@ -6,6 +6,9 @@ config MALTA
 
 config MIPSSIM
     bool
+    select ISA_BUS
+    select SERIAL_ISA
+    select MIPSNET
 
 config JAZZ
     bool
#3 lore raw

Re: [Qemu-devel] [PATCH 1/6] mips: Express dependencies of the MIPSsim machine with kconfig

Quoted 42 lines · Thomas Huth
Quoted 41 lines · Philippe Mathieu-Daudé

The MIPSsim machine only emulates an 8250 UART and a simple network controller, connected via an ISA bus.

---
 default-configs/mips-softmmu-common.mak | 2 --
 hw/mips/Kconfig                         | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)
default-configs/mips-softmmu-common.mak +0 -2
index 0795d522db..aa73a4a822 100644
@@ -26,7 +26,6 @@ CONFIG_PIIX4=y
 CONFIG_IDE_ISA=y
 CONFIG_IDE_PIIX=y
 CONFIG_NE2000_ISA=y
-CONFIG_MIPSNET=y
 CONFIG_PFLASH_CFI01=y
 CONFIG_I8259=y
 CONFIG_MC146818RTC=y
@@ -35,7 +34,6 @@ CONFIG_MIPS_CPS=y
 CONFIG_MIPS_ITU=y
 CONFIG_R4K=y
 CONFIG_MALTA=y
-CONFIG_MIPSSIM=y
 CONFIG_ACPI_SMBUS=y
 CONFIG_SMBUS_EEPROM=y
 CONFIG_TEST_DEVICES=y
hw/mips/Kconfig +3 -0
index cdc07e59b6..3433e97e1a 100644
@@ -6,6 +6,9 @@ config MALTA
 
 config MIPSSIM
     bool
+    select ISA_BUS
+    select SERIAL_ISA
+    select MIPSNET
 
Quoted 5 lines

hw/mips/Kconfig config MALTA · line 14

Quoted 3 lines
hw/mips/Kconfig +0 -0
 config JAZZ
     bool

Scratch that. I think you have to keep CONFIG_MIPSSIM=y enabled in the default-configs, don't you?

Thomas

#4 lore raw

Re: [Qemu-devel] [PATCH 1/6] mips: Express dependencies of the MIPSsim machine with kconfig

Hi Thomas,

Quoted 43 lines · Thomas Huth
Quoted 42 lines · Thomas Huth
Quoted 41 lines · Philippe Mathieu-Daudé

The MIPSsim machine only emulates an 8250 UART and a simple network controller, connected via an ISA bus.

---
 default-configs/mips-softmmu-common.mak | 2 --
 hw/mips/Kconfig                         | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)
default-configs/mips-softmmu-common.mak +0 -2
index 0795d522db..aa73a4a822 100644
@@ -26,7 +26,6 @@ CONFIG_PIIX4=y
 CONFIG_IDE_ISA=y
 CONFIG_IDE_PIIX=y
 CONFIG_NE2000_ISA=y
-CONFIG_MIPSNET=y
 CONFIG_PFLASH_CFI01=y
 CONFIG_I8259=y
 CONFIG_MC146818RTC=y
@@ -35,7 +34,6 @@ CONFIG_MIPS_CPS=y
 CONFIG_MIPS_ITU=y
 CONFIG_R4K=y
 CONFIG_MALTA=y
-CONFIG_MIPSSIM=y
 CONFIG_ACPI_SMBUS=y
 CONFIG_SMBUS_EEPROM=y
 CONFIG_TEST_DEVICES=y
hw/mips/Kconfig +3 -0
index cdc07e59b6..3433e97e1a 100644
@@ -6,6 +6,9 @@ config MALTA
 
 config MIPSSIM
     bool
+    select ISA_BUS
+    select SERIAL_ISA
+    select MIPSNET
 
Quoted 8 lines
Quoted 5 lines

hw/mips/Kconfig config MALTA · line 14

Quoted 3 lines
hw/mips/Kconfig +0 -0
 config JAZZ
     bool

Scratch that. I think you have to keep CONFIG_MIPSSIM=y enabled in the default-configs, don't you?

I guess I misunderstood --without-default-devices with --no-defaults, where you'd manually select the machines you want.

Thanks for the review!

Phil.

#5 lore raw

Re: [Qemu-devel] [PATCH 1/6] mips: Express dependencies of the MIPSsim machine with kconfig

Quoted 4 lines · Philippe Mathieu-Daudé
Quoted 2 lines

Scratch that. I think you have to keep CONFIG_MIPSSIM=y enabled in the default-configs, don't you?

I guess I misunderstood --without-default-devices with --no-defaults, where you'd manually select the machines you want.

Note that machines have to be included in default-configs/ even for --with-default-devices (which is the default).

Paolo

#6 lore raw

Re: [Qemu-devel] [PATCH 1/6] mips: Express dependencies of the MIPSsim machine with kconfig

Quoted 8 lines · Paolo Bonzini
Quoted 4 lines · Philippe Mathieu-Daudé
Quoted 2 lines

Scratch that. I think you have to keep CONFIG_MIPSSIM=y enabled in the default-configs, don't you?

I guess I misunderstood --without-default-devices with --no-defaults, where you'd manually select the machines you want.

Note that machines have to be included in default-configs/ even for --with-default-devices (which is the default).

OK, I'll respin.

Thanks,

Phil.

#7 lore raw

PATCH 2/6 mips: Express dependencies of the Jazz machine with kconfig

In reply to Philippe Mathieu-Daudé

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.

---
 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(-)
default-configs/mips-softmmu-common.mak +0 -1
index aa73a4a822..a1681edec4 100644
@@ -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
default-configs/mips64-softmmu.mak +0 -6
index bad7496672..ea66ce0b72 100644
@@ -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
default-configs/mips64el-softmmu.mak +0 -6
index 8b255efc54..23445cfcf9 100644
@@ -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
hw/mips/Kconfig +17 -0
index 3433e97e1a..ab006477c7 100644
@@ -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
Signature · 1 line
2.20.1
#8 lore raw

Re: [Qemu-devel] [PATCH 2/6] mips: Express dependencies of the Jazz machine with kconfig

Quoted 75 lines · Philippe Mathieu-Daudé

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.

---
 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(-)
default-configs/mips-softmmu-common.mak +0 -1
index aa73a4a822..a1681edec4 100644
@@ -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
default-configs/mips64-softmmu.mak +0 -6
index bad7496672..ea66ce0b72 100644
@@ -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
default-configs/mips64el-softmmu.mak +0 -6
index 8b255efc54..23445cfcf9 100644
@@ -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
hw/mips/Kconfig +10 -0
index 3433e97e1a..ab006477c7 100644
@@ -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

hw/mips/Kconfig config MIPSSIM · line 34

Quoted 10 lines
hw/mips/Kconfig +7 -0
+    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

#9 lore raw

PATCH 3/6 mips: Express dependencies of the r4k platform with kconfig

In reply to Philippe Mathieu-Daudé

This platform use standard PC devices connected to an ISA bus. Networking is provided by a ne2000 chipset.

---
 default-configs/mips-softmmu-common.mak |  1 -
 hw/mips/Kconfig                         | 10 ++++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
default-configs/mips-softmmu-common.mak +0 -1
index a1681edec4..aa3ca196b4 100644
@@ -31,7 +31,6 @@ CONFIG_MC146818RTC=y
 CONFIG_EMPTY_SLOT=y
 CONFIG_MIPS_CPS=y
 CONFIG_MIPS_ITU=y
-CONFIG_R4K=y
 CONFIG_MALTA=y
 CONFIG_ACPI_SMBUS=y
 CONFIG_SMBUS_EEPROM=y
hw/mips/Kconfig +10 -0
index ab006477c7..ee6290d497 100644
@@ -1,5 +1,15 @@
 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
 
 config MALTA
     bool
Signature · 1 line
2.20.1
#10 lore raw

Re: [Qemu-devel] [PATCH 3/6] mips: Express dependencies of the r4k platform with kconfig

Quoted 14 lines · Philippe Mathieu-Daudé

This platform use standard PC devices connected to an ISA bus. Networking is provided by a ne2000 chipset.

---
 default-configs/mips-softmmu-common.mak |  1 -
 hw/mips/Kconfig                         | 10 ++++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
default-configs/mips-softmmu-common.mak +0 -0
index a1681edec4..aa3ca196b4 100644

default-configs/mips-softmmu-common.mak CONFIG_MC146818RTC=y · line 34

Quoted 4 lines
default-configs/mips-softmmu-common.mak +0 -1
@@ -31,7 +31,6 @@ CONFIG_MC146818RTC=y
 CONFIG_EMPTY_SLOT=y
 CONFIG_MIPS_CPS=y
 CONFIG_MIPS_ITU=y
-CONFIG_R4K=y

Keep it? Otherwise the machine is disabled by default, isn't it?

Thomas

#11 lore raw

PATCH 4/6 mips: Express dependencies of the Boston machine with kconfig

In reply to Philippe Mathieu-Daudé

Boston is built around a Xilinx FPGA, which includes a PCIe root port and an UART. An Intel EG20T PCH connects the I/O peripherals, but only the SATA bus is emulated.

---
 default-configs/mips64el-softmmu.mak | 5 -----
 hw/mips/Kconfig                      | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)
default-configs/mips64el-softmmu.mak +0 -5
index 23445cfcf9..ac44df1d0d 100644
@@ -4,8 +4,3 @@ include mips-softmmu-common.mak
 CONFIG_IDE_VIA=y
 CONFIG_FULONG=y
 CONFIG_VT82C686=y
-CONFIG_AHCI=y
-CONFIG_MIPS_BOSTON=y
-CONFIG_FITLOADER=y
-CONFIG_PCI_EXPRESS=y
-CONFIG_PCI_EXPRESS_XILINX=y
hw/mips/Kconfig +5 -0
index ee6290d497..2940ff39ab 100644
@@ -49,3 +49,8 @@ config MIPS_CPS
 
 config MIPS_BOSTON
     bool
+    select FITLOADER
+    select MIPS_CPS
+    select PCI_EXPRESS_XILINX
+    select AHCI
+    select SERIAL
Signature · 1 line
2.20.1
#12 lore raw

PATCH 5/6 hw/pci-host: Use CONFIG_PCI_BONITO to select the Bonito North Bridge

In reply to Philippe Mathieu-Daudé

Ease the kconfig selection by introducing CONFIG_PCI_BONITO to select the Bonito North Bridge. Select it for the Loongson 2E machine.

---
 default-configs/mips64el-softmmu.mak | 1 +
 hw/pci-host/Kconfig                  | 4 ++++
 hw/pci-host/Makefile.objs            | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)
default-configs/mips64el-softmmu.mak +1 -0
index ac44df1d0d..ee583758e1 100644
@@ -3,4 +3,5 @@
 include mips-softmmu-common.mak
 CONFIG_IDE_VIA=y
 CONFIG_FULONG=y
+CONFIG_PCI_BONITO=y
 CONFIG_VT82C686=y
hw/pci-host/Kconfig +4 -0
index b39ea297ba..9abadafaf5 100644
@@ -49,3 +49,7 @@ config PCI_EXPRESS_XILINX
 config PCI_EXPRESS_DESIGNWARE
     bool
     select PCI_EXPRESS
+
+config PCI_BONITO
+    select PCI
+    bool
hw/pci-host/Makefile.objs +1 -1
index a9cd3e022d..d6e86b9b89 100644
@@ -12,7 +12,7 @@ common-obj-$(CONFIG_PPCE500_PCI) += ppce500.o
 common-obj-$(CONFIG_VERSATILE_PCI) += versatile.o
 
 common-obj-$(CONFIG_PCI_SABRE) += sabre.o
-common-obj-$(CONFIG_FULONG) += bonito.o
+common-obj-$(CONFIG_PCI_BONITO) += bonito.o
 common-obj-$(CONFIG_PCI_PIIX) += piix.o
 common-obj-$(CONFIG_PCI_EXPRESS_Q35) += q35.o
 common-obj-$(CONFIG_PCI_EXPRESS_GENERIC_BRIDGE) += gpex.o
Signature · 1 line
2.20.1
#13 lore raw

Re: [Qemu-devel] [PATCH 5/6] hw/pci-host: Use CONFIG_PCI_BONITO to select the Bonito North Bridge

Quoted 2 lines · Philippe Mathieu-Daudé

Ease the kconfig selection by introducing CONFIG_PCI_BONITO to select the Bonito North Bridge. Select it for the Loongson 2E machine.

I think you should either rather drop the last sentence here (since the "select" is only done in the next patch), or even merge this patch with the next one.

Thomas

Quoted 43 lines
---
 default-configs/mips64el-softmmu.mak | 1 +
 hw/pci-host/Kconfig                  | 4 ++++
 hw/pci-host/Makefile.objs            | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)
default-configs/mips64el-softmmu.mak +1 -0
index ac44df1d0d..ee583758e1 100644
@@ -3,4 +3,5 @@
 include mips-softmmu-common.mak
 CONFIG_IDE_VIA=y
 CONFIG_FULONG=y
+CONFIG_PCI_BONITO=y
 CONFIG_VT82C686=y
hw/pci-host/Kconfig +4 -0
index b39ea297ba..9abadafaf5 100644
@@ -49,3 +49,7 @@ config PCI_EXPRESS_XILINX
 config PCI_EXPRESS_DESIGNWARE
     bool
     select PCI_EXPRESS
+
+config PCI_BONITO
+    select PCI
+    bool
hw/pci-host/Makefile.objs +1 -1
index a9cd3e022d..d6e86b9b89 100644
@@ -12,7 +12,7 @@ common-obj-$(CONFIG_PPCE500_PCI) += ppce500.o
 common-obj-$(CONFIG_VERSATILE_PCI) += versatile.o
 
 common-obj-$(CONFIG_PCI_SABRE) += sabre.o
-common-obj-$(CONFIG_FULONG) += bonito.o
+common-obj-$(CONFIG_PCI_BONITO) += bonito.o
 common-obj-$(CONFIG_PCI_PIIX) += piix.o
 common-obj-$(CONFIG_PCI_EXPRESS_Q35) += q35.o
 common-obj-$(CONFIG_PCI_EXPRESS_GENERIC_BRIDGE) += gpex.o
#14 lore raw

PATCH 6/6 mips: Express dependencies of the Loongson 2E machine with kconfig

In reply to Philippe Mathieu-Daudé

The Loongson 2E uses a Bonito64 system controller as North Bridge and a VT82C686 chipset as South Bridge. The network card chipset is a RTL8139D.

---
 default-configs/mips64el-softmmu.mak |  4 ----
 hw/isa/Kconfig                       | 13 +++++++++----
 hw/mips/Kconfig                      |  5 +++++
 3 files changed, 14 insertions(+), 8 deletions(-)
default-configs/mips64el-softmmu.mak +0 -4
index ee583758e1..aa4f0d1a44 100644
@@ -1,7 +1,3 @@
 # Default configuration for mips64el-softmmu
 
 include mips-softmmu-common.mak
-CONFIG_IDE_VIA=y
-CONFIG_FULONG=y
-CONFIG_PCI_BONITO=y
-CONFIG_VT82C686=y
hw/isa/Kconfig +9 -4
index d580471c00..bd6f60dd3d 100644
@@ -33,10 +33,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
hw/mips/Kconfig +5 -0
index 2940ff39ab..16b2bdb068 100644
@@ -42,6 +42,11 @@ config JAZZ
 
 config FULONG
     bool
+    select PCI_BONITO
+    select VT82C686
+    select SMBUS_EEPROM
+    select RTL8139_PCI
+    select MC146818RTC
 
 config MIPS_CPS
     bool
Signature · 1 line
2.20.1
#15 lore raw

Re: [Qemu-devel] [PATCH 6/6] mips: Express dependencies of the Loongson 2E machine with kconfig

Quoted 5 lines · Philippe Mathieu-Daudé

The Loongson 2E uses a Bonito64 system controller as North Bridge and a VT82C686 chipset as South Bridge. The network card chipset is a RTL8139D.

---

[...]

hw/mips/Kconfig config JAZZ · line 48

Quoted 12 lines
hw/mips/Kconfig +4 -0
index 2940ff39ab..16b2bdb068 100644
@@ -42,6 +42,11 @@ config JAZZ
 
 config FULONG
     bool
+    select PCI_BONITO
+    select VT82C686
+    select SMBUS_EEPROM
+    select RTL8139_PCI

If I've got the code right, the RTL8139 is optional for this board, i.e. when you run with -nodefaults or -net none, then the board is still usable. So this is not a hard requirement and thus I think it would be nicer to drop the "select RTL8139_PCI" and rely on the "default y if PCI_DEVICES" in the hw/net/Kconfig file.

Thomas

#16 lore raw

Re: [Qemu-devel] [PATCH 6/6] mips: Express dependencies of the Loongson 2E machine with kconfig

Hi Thomas,

Quoted 13 lines · Thomas Huth
Quoted 5 lines · Philippe Mathieu-Daudé

The Loongson 2E uses a Bonito64 system controller as North Bridge and a VT82C686 chipset as South Bridge. The network card chipset is a RTL8139D.

---

[...]

Quoted 6 lines
hw/mips/Kconfig +0 -0
index 2940ff39ab..16b2bdb068 100644
@@ -42,6 +42,11 @@ config JAZZ
 
Quoted 12 lines

hw/mips/Kconfig config JAZZ · line 48

Quoted 6 lines
hw/mips/Kconfig +4 -0
 config FULONG
     bool
+    select PCI_BONITO
+    select VT82C686
+    select SMBUS_EEPROM
+    select RTL8139_PCI

If I've got the code right, the RTL8139 is optional for this board, i.e. when you run with -nodefaults or -net none, then the board is still usable. So this is not a hard requirement and thus I think it would be nicer to drop the "select RTL8139_PCI" and rely on the "default y if PCI_DEVICES" in the hw/net/Kconfig file.

I think since his introduction (051c190bce59) the code wants to deal with no network backend, but the RTL8139D is always available. On this picture you can se the chipset soldered on the back of the
board: https://www.linux-mips.org/wiki/Fulong#back
I'll keep the RTL8139_PCI selection and eventually propose a patch to clean the hw/mips/mips_fulong2e.c.

Thanks for your other reviews!

Phil.

#19 lore raw
Quoted 11 lines · Thomas Huth
Quoted 7 lines · Philippe Mathieu-Daudé
Quoted 2 lines · Philippe Mathieu-Daudé

Express the MIPS machine dependencies with Kconfig.

I forgot this serie misses a rule such "depends of MIPS64".
Asked here: https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg00064.html

I guess the easiest solution is to simply set a CONFIG_MIPS64=y in the default-configs/mips64*softmmu* files.

Or just do not specify the machine in the mips64*softmmu.mak files. If you add CONFIG_Q35=y to ARM, Kconfig doesn't complain.

Another possibility is to move those machines to hw/mips64, similar to hw/sparc64.

Paolo