Kconfig dependencies for MIPS machines (but Malta)
v2 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).
v2:
- Do not remove machines from the default config (Thomas)
- Corrected comment about CONFIG_PCI_BONITO (Thomas)
v1: https://www.mail-archive.com/[email protected]/msg593013.html
$ git backport-diff -u kconfig_mips_v1 Key: [----] : patches are identical [####] : number of functional differences between upstream/downstream patch The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively
001/6:[0001] [FC] 'mips: Express dependencies of the MIPSsim machine with kconfig' 002/6:[0001] [FC] 'mips: Express dependencies of the Jazz machine with kconfig' 003/6:[0001] [FC] 'mips: Express dependencies of the r4k platform with kconfig' 004/6:[0001] [FC] 'mips: Express dependencies of the Boston machine with kconfig' 005/6:[----] [-C] 'hw/pci-host: Use CONFIG_PCI_BONITO to select the Bonito North Bridge' 006/6:[0001] [FC] 'mips: Express dependencies of the Loongson 2E machine with kconfig'
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 | 2 -- default-configs/mips64-softmmu.mak | 5 ---- default-configs/mips64el-softmmu.mak | 12 -------- hw/isa/Kconfig | 13 +++++--- hw/mips/Kconfig | 40 +++++++++++++++++++++++++ hw/pci-host/Kconfig | 4 +++ hw/pci-host/Makefile.objs | 2 +- 7 files changed, 54 insertions(+), 24 deletions(-)
Signature · 1 line
2.20.1
PATCH v2 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 | 1 - hw/mips/Kconfig | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-)
default-configs/mips-softmmu-common.mak +0 -1
@@ -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
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
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v2 1/6] mips: Express dependencies of the MIPSsim machine with kconfig
Quoted 26 lines · Philippe Mathieu-Daudé
The MIPSsim machine only emulates an 8250 UART and a simple network controller, connected via an ISA bus.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- default-configs/mips-softmmu-common.mak | 1 - hw/mips/Kconfig | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-)default-configs/mips-softmmu-common.mak +0
-1@@ -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=yhw/mips/Kconfig +0
-0
hw/mips/Kconfig config MALTA · line 11
Quoted 6 lines
hw/mips/Kconfig +3
-0@@ -6,6 +6,9 @@ config MALTA config MIPSSIM bool + select ISA_BUS + select SERIAL_ISA + select MIPSNET
PATCH v2 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 | 5 ----- default-configs/mips64el-softmmu.mak | 6 ------ hw/mips/Kconfig | 17 +++++++++++++++++ 4 files changed, 17 insertions(+), 12 deletions(-)
default-configs/mips-softmmu-common.mak +0 -1
@@ -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 -5
@@ -1,9 +1,4 @@ # 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
@@ -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
@@ -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
Re: [Qemu-devel] [PATCH v2 2/6] mips: Express dependencies of the Jazz machine with kconfig
Quoted 43 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.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- default-configs/mips-softmmu-common.mak | 1 - default-configs/mips64-softmmu.mak | 5 ----- default-configs/mips64el-softmmu.mak | 6 ------ hw/mips/Kconfig | 17 +++++++++++++++++ 4 files changed, 17 insertions(+), 12 deletions(-)default-configs/mips-softmmu-common.mak +0
-1@@ -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=ydefault-configs/mips64-softmmu.mak +0
-5@@ -1,9 +1,4 @@ # 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=ydefault-configs/mips64el-softmmu.mak +0
-0
default-configs/mips64el-softmmu.mak line 9
Quoted 8 lines
default-configs/mips64el-softmmu.mak +0
-4@@ -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
Please keep the CONFIG_JAZZ line here.
Thomas
Re: [Qemu-devel] [PATCH v2 2/6] mips: Express dependencies of the Jazz machine with kconfig
Quoted 45 lines · Thomas Huth
Quoted 44 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.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- default-configs/mips-softmmu-common.mak | 1 - default-configs/mips64-softmmu.mak | 5 ----- default-configs/mips64el-softmmu.mak | 6 ------ hw/mips/Kconfig | 17 +++++++++++++++++ 4 files changed, 17 insertions(+), 12 deletions(-)default-configs/mips-softmmu-common.mak +0
-1@@ -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=ydefault-configs/mips64-softmmu.mak +0
-5@@ -1,9 +1,4 @@ # 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=ydefault-configs/mips64el-softmmu.mak +0
-0@@ -2,13 +2,7 @@
Quoted 9 lines
default-configs/mips64el-softmmu.mak line 9
Quoted 7 lines
default-configs/mips64el-softmmu.mak +0
-4include mips-softmmu-common.mak CONFIG_IDE_VIA=y -CONFIG_RC4030=y -CONFIG_DP8393X=y -CONFIG_DS1225Y=y CONFIG_FULONG=y -CONFIG_JAZZ=yPlease keep the
CONFIG_JAZZline here.
Oops... Thanks for catching this :)
Phil.
PATCH v2 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.
--- hw/mips/Kconfig | 10 ++++++++++ 1 file changed, 10 insertions(+)
hw/mips/Kconfig +10 -0
@@ -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
Re: [Qemu-devel] [PATCH v2 3/6] mips: Express dependencies of the r4k platform with kconfig
Quoted 15 lines · Philippe Mathieu-Daudé
This platform use standard PC devices connected to an ISA bus. Networking is provided by a ne2000 chipset.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- hw/mips/Kconfig | 10 ++++++++++ 1 file changed, 10 insertions(+)hw/mips/Kconfig +0
-0@@ -1,5 +1,15 @@ config R4K bool
hw/mips/Kconfig line 12
Quoted 10 lines
hw/mips/Kconfig +10
-0+ select ISA_BUS + select SERIAL_ISA + select I8259 + select I8254 + select MC146818RTC + select VGA_ISA + select NE2000_ISA + select IDE_ISA + # I8042 + select PCKBD
I think you can now also remove "CONFIG_NE2000_ISA=y" from default-configs/mips-softmmu-common.mak.
Thomas
Re: [Qemu-devel] [PATCH v2 3/6] mips: Express dependencies of the r4k platform with kconfig
Quoted 21 lines · Thomas Huth
Quoted 20 lines · Philippe Mathieu-Daudé
This platform use standard PC devices connected to an ISA bus. Networking is provided by a ne2000 chipset.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- hw/mips/Kconfig | 10 ++++++++++ 1 file changed, 10 insertions(+)hw/mips/Kconfig +5
-0@@ -1,5 +1,15 @@ config R4K bool + select ISA_BUS + select SERIAL_ISA + select I8259 + select I8254 + select MC146818RTC
Quoted 8 lines
hw/mips/Kconfig line 12
Quoted 5 lines
hw/mips/Kconfig +5
-0+ select VGA_ISA + select NE2000_ISA + select IDE_ISA + # I8042 + select PCKBDI think you can now also remove "
CONFIG_NE2000_ISA=y" from default-configs/mips-softmmu-common.mak.
Correct!
Thanks,
Phil.
PATCH v2 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 | 4 ---- hw/mips/Kconfig | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-)
default-configs/mips64el-softmmu.mak +0 -4
@@ -4,8 +4,4 @@ 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
@@ -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
Re: [Qemu-devel] [PATCH v2 4/6] mips: Express dependencies of the Boston machine with kconfig
Quoted 28 lines · 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.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- default-configs/mips64el-softmmu.mak | 4 ---- hw/mips/Kconfig | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-)default-configs/mips64el-softmmu.mak +0
-4@@ -4,8 +4,4 @@ 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=yhw/mips/Kconfig +0
-0
hw/mips/Kconfig config MIPS_CPS · line 56
Quoted 8 lines
hw/mips/Kconfig +5
-0@@ -49,3 +49,8 @@ config MIPS_CPS config MIPS_BOSTON bool + select FITLOADER + select MIPS_CPS + select PCI_EXPRESS_XILINX + select AHCI + select SERIAL
Re: [Qemu-devel] [PATCH v2 4/6] mips: Express dependencies of the Boston machine with kconfig
In reply to Philippe Mathieu-DaudéQuoted 5 lines · 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.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Thanks,
Paul
Quoted 34 lines
--- default-configs/mips64el-softmmu.mak | 4 ---- hw/mips/Kconfig | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-)default-configs/mips64el-softmmu.mak +0
-4@@ -4,8 +4,4 @@ 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=yhw/mips/Kconfig +5
-0@@ -49,3 +49,8 @@ config MIPS_CPS config MIPS_BOSTON bool + select FITLOADER + select MIPS_CPS + select PCI_EXPRESS_XILINX + select AHCI + select SERIALSignature · 1 line
2.20.1
PATCH v2 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.
--- 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
@@ -3,5 +3,6 @@ include mips-softmmu-common.mak CONFIG_IDE_VIA=y CONFIG_FULONG=y +CONFIG_PCI_BONITO=y CONFIG_VT82C686=y CONFIG_MIPS_BOSTON=y
hw/pci-host/Kconfig +4 -0
@@ -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
@@ -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
PATCH v2 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 | 3 --- hw/isa/Kconfig | 13 +++++++++---- hw/mips/Kconfig | 5 +++++ 3 files changed, 14 insertions(+), 7 deletions(-)
default-configs/mips64el-softmmu.mak +0 -3
@@ -1,8 +1,5 @@ # Default configuration for mips64el-softmmu include mips-softmmu-common.mak -CONFIG_IDE_VIA=y CONFIG_FULONG=y -CONFIG_PCI_BONITO=y -CONFIG_VT82C686=y CONFIG_MIPS_BOSTON=y
hw/isa/Kconfig +9 -4
@@ -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
@@ -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
Re: [Qemu-devel] [PATCH v2 6/6] mips: Express dependencies of the Loongson 2E machine with kconfig
Quoted 28 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.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- default-configs/mips64el-softmmu.mak | 3 --- hw/isa/Kconfig | 13 +++++++++---- hw/mips/Kconfig | 5 +++++ 3 files changed, 14 insertions(+), 7 deletions(-)default-configs/mips64el-softmmu.mak +0
-3@@ -1,8 +1,5 @@ # Default configuration for mips64el-softmmu include mips-softmmu-common.mak -CONFIG_IDE_VIA=y CONFIG_FULONG=y -CONFIG_PCI_BONITO=y -CONFIG_VT82C686=y CONFIG_MIPS_BOSTON=yhw/isa/Kconfig +0
-0
hw/isa/Kconfig config PIIX4 · line 37
Quoted 5 lines
hw/isa/Kconfig +0
-2@@ -33,10 +33,15 @@ config PIIX4 config VT82C686 bool - select ISA_BUS - select ACPI_SMBUS
The VT82C686 config might be incorrect, I rebased this on another series where I reworked the ISA_SUPERIO config and have to check this part again.
Quoted 31 lines
hw/isa/Kconfig +9
-2- 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 boolhw/mips/Kconfig +5
-0@@ -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
Re: [Qemu-devel] [PATCH v2 6/6] mips: Express dependencies of the Loongson 2E machine with kconfig
In reply to Philippe Mathieu-DaudéQuoted 8 lines
From: Philippe Mathieu-Daudé <[email protected]>
Subject: [PATCH v2 6/6] mips: Express dependencies of the Loongson 2E machine with kconfigThe Loongson 2E uses 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é <[email protected]>---
Hello, Philippe.
"Loongson 2E" is rather a name for an ISA, used also as a name for CPU that supports that ISA, while "Fulong 2E" (that uses Loongson 2E as a CPU) is the proper machine name that should be used in the title and commit message of this patch, IMHO.
Aleksandar
Re: [Qemu-devel] [PATCH v2 6/6] mips: Express dependencies of the Loongson 2E machine with kconfig
Quoted 9 lines · Aleksandar Markovic
Quoted 8 lines
From: Philippe Mathieu-Daudé <[email protected]>
Subject: [PATCH v2 6/6] mips: Express dependencies of the Loongson 2E machine with kconfigThe Loongson 2E uses 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é <[email protected]>---
Quoted 6 lines
Hello, Philippe.
"Loongson 2E" is rather a name for an ISA, used also as a name for CPU that supports that ISA, while "Fulong 2E" (that uses Loongson 2E as a CPU) is the proper machine name that should be used in the title and commit message of this patch, IMHO.
You are right! thanks for noticing this :)
Quoted 4 lines
Aleksandar