diff mbox series

[v2,6/6] mips: Express dependencies of the Loongson 2E machine with kconfig

Message ID 20190204202609.26956-7-philmd@redhat.com
State New
Headers show
Series Kconfig dependencies for MIPS machines (but Malta) | expand

Commit Message

Philippe Mathieu-Daudé Feb. 4, 2019, 8:26 p.m. UTC
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é <philmd@redhat.com>
---
 default-configs/mips64el-softmmu.mak |  3 ---
 hw/isa/Kconfig                       | 13 +++++++++----
 hw/mips/Kconfig                      |  5 +++++
 3 files changed, 14 insertions(+), 7 deletions(-)

Comments

Philippe Mathieu-Daudé Feb. 5, 2019, 12:18 p.m. UTC | #1
On 2/4/19 9:26 PM, Philippe Mathieu-Daudé wrote:
> 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é <philmd@redhat.com>
> ---
>  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 9e80711275..326c5cd520 100644
> --- a/default-configs/mips64el-softmmu.mak
> +++ b/default-configs/mips64el-softmmu.mak
> @@ -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
> diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
> index d580471c00..bd6f60dd3d 100644
> --- a/hw/isa/Kconfig
> +++ b/hw/isa/Kconfig
> @@ -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.

> -    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 2940ff39ab..16b2bdb068 100644
> --- a/hw/mips/Kconfig
> +++ b/hw/mips/Kconfig
> @@ -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
>
Aleksandar Markovic Feb. 19, 2019, 5:54 p.m. UTC | #2
> From: Philippe Mathieu-Daudé <philmd@redhat.com>
> Subject: [PATCH v2 6/6] mips: Express dependencies of the Loongson 2E machine with kconfig
> 
> 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é <philmd@redhat.com>
> ---

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
Philippe Mathieu-Daudé Feb. 19, 2019, 7:07 p.m. UTC | #3
On 2/19/19 6:54 PM, Aleksandar Markovic wrote:
>> From: Philippe Mathieu-Daudé <philmd@redhat.com>
>> Subject: [PATCH v2 6/6] mips: Express dependencies of the Loongson 2E machine with kconfig
>>
>> 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é <philmd@redhat.com>
>> ---
> 
> 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 :)

> 
> Aleksandar
> 
>
diff mbox series

Patch

diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
index 9e80711275..326c5cd520 100644
--- a/default-configs/mips64el-softmmu.mak
+++ b/default-configs/mips64el-softmmu.mak
@@ -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
diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
index d580471c00..bd6f60dd3d 100644
--- a/hw/isa/Kconfig
+++ b/hw/isa/Kconfig
@@ -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
diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
index 2940ff39ab..16b2bdb068 100644
--- a/hw/mips/Kconfig
+++ b/hw/mips/Kconfig
@@ -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