diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-01-23 14:56:09 +0800 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-03-07 21:45:53 +0100 |
| commit | a7e23159074c9d774fb1e88357b778994a0c9365 (patch) | |
| tree | c1a5c126f4f16baeb52469203e4f63ea810de3e8 /hw | |
| parent | 03b348bdcbd1eda4ce097b2b84527dec774d80c4 (diff) | |
isa: express dependencies with kconfig
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Message-Id: <20190123065618.3520-36-yang.zhong@intel.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/audio/Kconfig | 2 | ||||
| -rw-r--r-- | hw/block/Kconfig | 2 | ||||
| -rw-r--r-- | hw/char/Kconfig | 6 | ||||
| -rw-r--r-- | hw/display/Kconfig | 3 | ||||
| -rw-r--r-- | hw/dma/Kconfig | 1 | ||||
| -rw-r--r-- | hw/i386/Kconfig | 1 | ||||
| -rw-r--r-- | hw/ide/Kconfig | 1 | ||||
| -rw-r--r-- | hw/input/Kconfig | 2 | ||||
| -rw-r--r-- | hw/ipmi/Kconfig | 2 | ||||
| -rw-r--r-- | hw/isa/Kconfig | 7 | ||||
| -rw-r--r-- | hw/misc/Kconfig | 6 | ||||
| -rw-r--r-- | hw/net/Kconfig | 4 | ||||
| -rw-r--r-- | hw/sparc64/Kconfig | 1 | ||||
| -rw-r--r-- | hw/tpm/Kconfig | 2 | ||||
| -rw-r--r-- | hw/watchdog/Kconfig | 2 |
15 files changed, 41 insertions, 1 deletions
diff --git a/hw/audio/Kconfig b/hw/audio/Kconfig index dedb5135b5..01aea559c0 100644 --- a/hw/audio/Kconfig +++ b/hw/audio/Kconfig @@ -35,6 +35,8 @@ config HDA config PCSPK bool + default y + depends on I8254 config WM8750 bool diff --git a/hw/block/Kconfig b/hw/block/Kconfig index b60e2ab872..6a23659a6f 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -1,5 +1,7 @@ config FDC bool + default y + depends on ISA_BUS config SSI_M25P80 bool diff --git a/hw/char/Kconfig b/hw/char/Kconfig index 6eba69a64f..fc184819f4 100644 --- a/hw/char/Kconfig +++ b/hw/char/Kconfig @@ -3,6 +3,8 @@ config ESCC config PARALLEL bool + default y + depends on ISA_BUS config PL011 bool @@ -12,11 +14,15 @@ config SERIAL config SERIAL_ISA bool + default y + depends on ISA_BUS + select SERIAL config SERIAL_PCI bool default y if PCI_DEVICES depends on PCI + select SERIAL config VIRTIO_SERIAL bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 9199beb447..e5f347f695 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -39,9 +39,12 @@ config VGA_PCI config VGA_ISA bool + depends on ISA_BUS + select VGA config VGA_ISA_MM bool + select VGA config VMWARE_VGA bool diff --git a/hw/dma/Kconfig b/hw/dma/Kconfig index b9ce1c58c4..751dec5426 100644 --- a/hw/dma/Kconfig +++ b/hw/dma/Kconfig @@ -9,6 +9,7 @@ config PL330 config I82374 bool + select I8257 config I8257 bool diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 307a804349..22696376a1 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -14,6 +14,7 @@ config I440FX config ISAPC bool + select ISA_BUS config Q35 bool diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig index 246e27b9e8..ab47b6a7a3 100644 --- a/hw/ide/Kconfig +++ b/hw/ide/Kconfig @@ -12,6 +12,7 @@ config IDE_PCI config IDE_ISA bool + depends on ISA_BUS select IDE_QDEV config IDE_PIIX diff --git a/hw/input/Kconfig b/hw/input/Kconfig index c729dcd0b2..814f87fb98 100644 --- a/hw/input/Kconfig +++ b/hw/input/Kconfig @@ -6,6 +6,8 @@ config LM832X config PCKBD bool + default y + depends on ISA_BUS config PL050 bool diff --git a/hw/ipmi/Kconfig b/hw/ipmi/Kconfig index 68f8ba1a54..6a4f08f2fa 100644 --- a/hw/ipmi/Kconfig +++ b/hw/ipmi/Kconfig @@ -9,6 +9,8 @@ config IPMI_EXTERN config ISA_IPMI_KCS bool + depends on ISA_BUS config ISA_IPMI_BT bool + depends on ISA_BUS diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index b59d074453..af68af96c9 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -6,18 +6,25 @@ config APM config I82378 bool + select ISA_BUS config PC87312 bool + select ISA_BUS config PIIX4 bool + select ISA_BUS config VT82C686 bool + select ISA_BUS config SMC37C669 bool + select ISA_BUS config LPC_ICH9 bool + select ISA_BUS + select ACPI_X86_ICH diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 1c6964d75f..41d8633f78 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -1,5 +1,6 @@ config APPLESMC bool + depends on ISA_BUS config MAX111X bool @@ -12,12 +13,16 @@ config TMP421 config ISA_DEBUG bool + depends on ISA_BUS config SGA bool + depends on ISA_BUS config ISA_TESTDEV bool + default y if TEST_DEVICES + depends on ISA_BUS config PCI_TESTDEV bool @@ -93,6 +98,7 @@ config IOTKIT_SYSINFO config PVPANIC bool + depends on ISA_BUS config AUX bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig index c8df849845..a309831e6e 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -48,6 +48,10 @@ config LAN9118 config NE2000_ISA bool + default y + depends on ISA_BUS + depends on PCI # for NE2000State + select NE2000_PCI config OPENCORES_ETH bool diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig index 8c13345f01..41f7295aa2 100644 --- a/hw/sparc64/Kconfig +++ b/hw/sparc64/Kconfig @@ -1,5 +1,6 @@ config SUN4U bool + select ISA_BUS config NIAGARA bool diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig index b5d1724f8c..dd27f41ba3 100644 --- a/hw/tpm/Kconfig +++ b/hw/tpm/Kconfig @@ -3,7 +3,7 @@ config TPM config TPM_TIS bool - depends on TPM + depends on TPM && ISA_BUS config TPM_CRB bool diff --git a/hw/watchdog/Kconfig b/hw/watchdog/Kconfig index edb3d42ce9..35ccb729bf 100644 --- a/hw/watchdog/Kconfig +++ b/hw/watchdog/Kconfig @@ -8,6 +8,8 @@ config WDT_IB6300ESB config WDT_IB700 bool + default y + depends on ISA_BUS config WDT_DIAG288 bool |