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

Commit Message

Bernhard Beschow Jan. 9, 2023, 8:41 p.m. UTC

Allows to see more easily which board has which devices.

Signed-off-by: Bernhard Beschow <[e-mail]>
---
 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(-)

Patch

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