[PATCH 0/4] More precise dependency tracking for MIPS boards

[PATCH 0/4] More precise dependency tracking for MIPS boards

[Bernhard Beschow]

This series aims for cleaning up the dependency graphs of MIPS boards in order
to see much quicker which board uses which hardware -- and thus, which board
can be used to test which hardware.

The final patch has been compiled successfully multiple times for mips64el with
only one board enabled respectively. The boards considered were:
- CONFIG_MALTA
- CONFIG_MIPSSIM
- CONFIG_FULOONG
- CONFIG_LOONGSON3V
- CONFIG_JAZZ
- CONFIG_MIPS_BOSTON

Based-on: <20230109172347.1830-1-shentey@gmail.com>
          "[PATCH v6 00/33] Consolidate PIIX south bridges"

Bernhard Beschow (4):
  hw/isa/Kconfig: Add missing PARALLEL dependency to ISA_SUPERIO
  hw/mips/Kconfig: Remove ISA dependencies from MIPSsim board
  configs/devices/mips-softmmu/common: Remove redundant selections of
    SuperIO and ISA devices
  hw/mips/Kconfig: Move device selections to respective boards

 configs/devices/mips-softmmu/common.mak      | 16 ----------------
 configs/devices/mips64el-softmmu/default.mak |  3 ---
 hw/mips/mipssim.c                            |  1 -
 hw/isa/Kconfig                               |  1 +
 hw/mips/Kconfig                              | 15 +++++++++++++--
 5 files changed, 14 insertions(+), 22 deletions(-)

-- 
2.39.0

[PATCH 1/4] hw/isa/Kconfig: Add missing PARALLEL dependency to ISA_SUPERIO

[Bernhard Beschow]

isa-superio.c, managed by ISA_SUPERIO, instantiates TYPE_ISA_PARALLEL,
managed by PARALLEL.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
 hw/isa/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
index 040a18c070..58137f2702 100644
--- a/hw/isa/Kconfig
+++ b/hw/isa/Kconfig
@@ -16,6 +16,7 @@ config I82378
 config ISA_SUPERIO
     bool
     select ISA_BUS
+    select PARALLEL
     select PCKBD
     select FDC_ISA
 
-- 
2.39.0

[PATCH 2/4] hw/mips/Kconfig: Remove ISA dependencies from MIPSsim board

[Bernhard Beschow]

The board doesn't seem to have an ISA bus at all.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
 hw/mips/mipssim.c | 1 -
 hw/mips/Kconfig   | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/hw/mips/mipssim.c b/hw/mips/mipssim.c
index 39f64448f2..f459550c13 100644
--- a/hw/mips/mipssim.c
+++ b/hw/mips/mipssim.c
@@ -32,7 +32,6 @@
 #include "hw/mips/mips.h"
 #include "hw/mips/cpudevs.h"
 #include "hw/char/serial.h"
-#include "hw/isa/isa.h"
 #include "net/net.h"
 #include "sysemu/sysemu.h"
 #include "hw/boards.h"
diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
index 5b16ff4ed2..78400f8c23 100644
--- a/hw/mips/Kconfig
+++ b/hw/mips/Kconfig
@@ -6,8 +6,7 @@ config MALTA
 
 config MIPSSIM
     bool
-    select ISA_BUS
-    select SERIAL_ISA
+    select SERIAL
     select MIPSNET
 
 config JAZZ
-- 
2.39.0

[PATCH 3/4] configs/devices/mips-softmmu/common: Remove redundant selections of SuperIO and ISA devices

[Bernhard Beschow]

These devices should now be selected by their respective boards or
parent devices.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
 configs/devices/mips-softmmu/common.mak | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/configs/devices/mips-softmmu/common.mak b/configs/devices/mips-softmmu/common.mak
index 8ed6b62ae7..d1cfe16b81 100644
--- a/configs/devices/mips-softmmu/common.mak
+++ b/configs/devices/mips-softmmu/common.mak
@@ -11,17 +11,8 @@ CONFIG_VGA_MMIO=y
 CONFIG_VGA_CIRRUS=y
 CONFIG_VMWARE_VGA=y
 CONFIG_SERIAL=y
-CONFIG_SERIAL_ISA=y
-CONFIG_PARALLEL=y
-CONFIG_I8254=y
-CONFIG_PCSPK=y
-CONFIG_PCKBD=y
-CONFIG_FDC=y
-CONFIG_I8257=y
-CONFIG_IDE_ISA=y
 CONFIG_PFLASH_CFI01=y
 CONFIG_I8259=y
-CONFIG_MC146818RTC=y
 CONFIG_EMPTY_SLOT=y
 CONFIG_MIPS_CPS=y
 CONFIG_MIPS_ITU=y
-- 
2.39.0

[PATCH 4/4] hw/mips/Kconfig: Move device selections to respective boards

[Bernhard Beschow]

Allows to see more easily which board has which devices.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
 configs/devices/mips-softmmu/common.mak      |  7 -------
 configs/devices/mips64el-softmmu/default.mak |  3 ---
 hw/mips/Kconfig                              | 12 ++++++++++++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/configs/devices/mips-softmmu/common.mak b/configs/devices/mips-softmmu/common.mak
index d1cfe16b81..4e535e2246 100644
--- a/configs/devices/mips-softmmu/common.mak
+++ b/configs/devices/mips-softmmu/common.mak
@@ -7,17 +7,10 @@ CONFIG_ISA_BUS=y
 CONFIG_PCI=y
 CONFIG_PCI_DEVICES=y
 CONFIG_VGA_ISA=y
-CONFIG_VGA_MMIO=y
 CONFIG_VGA_CIRRUS=y
 CONFIG_VMWARE_VGA=y
-CONFIG_SERIAL=y
-CONFIG_PFLASH_CFI01=y
-CONFIG_I8259=y
-CONFIG_EMPTY_SLOT=y
 CONFIG_MIPS_CPS=y
 CONFIG_MIPS_ITU=y
 CONFIG_MALTA=y
-CONFIG_PCNET_PCI=y
 CONFIG_MIPSSIM=y
-CONFIG_SMBUS_EEPROM=y
 CONFIG_TEST_DEVICES=y
diff --git a/configs/devices/mips64el-softmmu/default.mak b/configs/devices/mips64el-softmmu/default.mak
index d5188f7ea5..88a37cf27f 100644
--- a/configs/devices/mips64el-softmmu/default.mak
+++ b/configs/devices/mips64el-softmmu/default.mak
@@ -3,8 +3,5 @@
 include ../mips-softmmu/common.mak
 CONFIG_FULOONG=y
 CONFIG_LOONGSON3V=y
-CONFIG_ATI_VGA=y
-CONFIG_RTL8139_PCI=y
 CONFIG_JAZZ=y
-CONFIG_VT82C686=y
 CONFIG_MIPS_BOSTON=y
diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
index 78400f8c23..67d2859be4 100644
--- a/hw/mips/Kconfig
+++ b/hw/mips/Kconfig
@@ -1,8 +1,14 @@
 config MALTA
     bool
+    select EMPTY_SLOT
     select I8259
     select ISA_SUPERIO
+    select MIPS_CPS
+    select PCNET_PCI
+    select PFLASH_CFI01
     select PIIX
+    select SERIAL
+    select SMBUS_EEPROM
 
 config MIPSSIM
     bool
@@ -28,10 +34,15 @@ config JAZZ
     select PARALLEL
     select DS1225Y
     select JAZZ_LED
+    select VGA_MMIO
 
 config FULOONG
     bool
+    select ATI_VGA
     select PCI_BONITO
+    select RTL8139_PCI
+    select SMBUS_EEPROM
+    select VT82C686
 
 config LOONGSON3V
     bool
@@ -39,6 +50,7 @@ config LOONGSON3V
     imply QXL if SPICE
     select SERIAL
     select GOLDFISH_RTC
+    select I8259
     select LOONGSON_LIOINTC
     select PCI_DEVICES
     select PCI_EXPRESS_GENERIC_BRIDGE
-- 
2.39.0

Re: [PATCH 1/4] hw/isa/Kconfig: Add missing PARALLEL dependency to ISA_SUPERIO

[Philippe Mathieu-Daudé]

On 9/1/23 21:41, Bernhard Beschow wrote:
> isa-superio.c, managed by ISA_SUPERIO, instantiates TYPE_ISA_PARALLEL,
> managed by PARALLEL.
> 
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
> ---
>   hw/isa/Kconfig | 1 +
>   1 file changed, 1 insertion(+)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>