From dd0ff8191abb040cddeedb84a2ba61c52791075e Mon Sep 17 00:00:00 2001
From: Paolo Bonzini
Date: Fri, 25 Jan 2019 07:21:49 +0100
Subject: isa: express SuperIO dependencies with Kconfig

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/block/Kconfig |  5 +++--
 hw/isa/Kconfig   | 21 +++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

(limited to 'hw')

diff --git a/hw/block/Kconfig b/hw/block/Kconfig
index 00f9dad372..df96dc5dcc 100644
--- a/hw/block/Kconfig
+++ b/hw/block/Kconfig
@@ -1,7 +1,8 @@
 config FDC
     bool
-    default y
-    depends on ISA_BUS
+    # FIXME: there is no separate file for the MMIO floppy disk controller, so
+    # select ISA_BUS here instead of polluting each board that requires one
+    select ISA_BUS
 
 config SSI_M25P80
     bool
diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
index fcd87b4d1f..57e09a0cb8 100644
--- a/hw/isa/Kconfig
+++ b/hw/isa/Kconfig
@@ -7,26 +7,47 @@ config APM
 config I82378
     bool
     select ISA_BUS
+    select I8259
+    select I8254
+    select I82374
+    select MC146818RTC
 
 config PC87312
     bool
     select ISA_BUS
+    select I8259
+    select I8254
+    select I8257
+    select MC146818RTC
+    select SERIAL_ISA
+    select PARALLEL
+    select FDC
+    select IDE_ISA
 
 config PIIX4
     bool
+    # For historical reasons, SuperIO devices are created in the board
+    # for PIIX4.
     select ISA_BUS
 
 config VT82C686
     bool
     select ISA_BUS
     select ACPI_SMBUS
+    select SERIAL_ISA
+    select FDC
 
 config SMC37C669
     bool
     select ISA_BUS
+    select SERIAL_ISA
+    select PARALLEL
+    select FDC
 
 config LPC_ICH9
     bool
+    # For historical reasons, SuperIO devices are created in the board
+    # for ICH9.
     select ISA_BUS
     select ACPI_SMBUS
     select ACPI_X86_ICH
-- 
cgit v1.2.3-55-g7522