vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
master
Paolo Bonzini 2019-01-23 14:56:09 +08:00
parent 03b348bdcb
commit a7e2315907
22 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
default-configs/alpha-softmmu.mak
View File

@ -15,7 +15,6 @@ CONFIG_VMWARE_VGA=y
CONFIG_IDE_CMD646=y CONFIG_IDE_CMD646=y
CONFIG_I8259=y CONFIG_I8259=y
CONFIG_MC146818RTC=y CONFIG_MC146818RTC=y
CONFIG_ISA_TESTDEV=y
CONFIG_TEST_DEVICES=y CONFIG_TEST_DEVICES=y
CONFIG_SMC37C669=y CONFIG_SMC37C669=y
CONFIG_DP264=y CONFIG_DP264=y

9
default-configs/i386-softmmu.mak
View File

@ -9,19 +9,12 @@ CONFIG_VGA_ISA=y
CONFIG_VMWARE_VGA=y CONFIG_VMWARE_VGA=y
CONFIG_VMXNET3_PCI=y CONFIG_VMXNET3_PCI=y
CONFIG_VIRTIO_VGA=y CONFIG_VIRTIO_VGA=y
CONFIG_VMMOUSE=y
CONFIG_IPMI=y CONFIG_IPMI=y
CONFIG_IPMI_LOCAL=y CONFIG_IPMI_LOCAL=y
CONFIG_IPMI_EXTERN=y CONFIG_IPMI_EXTERN=y
CONFIG_ISA_IPMI_KCS=y CONFIG_ISA_IPMI_KCS=y
CONFIG_ISA_IPMI_BT=y CONFIG_ISA_IPMI_BT=y
CONFIG_SERIAL=y
CONFIG_SERIAL_ISA=y
CONFIG_PARALLEL=y
CONFIG_I8254=y CONFIG_I8254=y
CONFIG_PCSPK=y
CONFIG_PCKBD=y
CONFIG_FDC=y
CONFIG_ACPI=y CONFIG_ACPI=y
CONFIG_ACPI_X86=y CONFIG_ACPI_X86=y
CONFIG_ACPI_X86_ICH=y CONFIG_ACPI_X86_ICH=y
@ -31,14 +24,12 @@ CONFIG_APM=y
CONFIG_I8257=y CONFIG_I8257=y
CONFIG_IDE_ISA=y CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y
CONFIG_HPET=y CONFIG_HPET=y
CONFIG_APPLESMC=y CONFIG_APPLESMC=y
CONFIG_I8259=y CONFIG_I8259=y
CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI01=y
CONFIG_MC146818RTC=y CONFIG_MC146818RTC=y
CONFIG_PCI_PIIX=y CONFIG_PCI_PIIX=y
CONFIG_WDT_IB700=y
CONFIG_ISA_DEBUG=y CONFIG_ISA_DEBUG=y
CONFIG_ISA_TESTDEV=y CONFIG_ISA_TESTDEV=y
CONFIG_VMPORT=y CONFIG_VMPORT=y

1
default-configs/mips-softmmu-common.mak
View File

@ -30,7 +30,6 @@ CONFIG_MIPSNET=y
CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI01=y
CONFIG_I8259=y CONFIG_I8259=y
CONFIG_MC146818RTC=y CONFIG_MC146818RTC=y
CONFIG_ISA_TESTDEV=y
CONFIG_EMPTY_SLOT=y CONFIG_EMPTY_SLOT=y
CONFIG_MIPS_CPS=y CONFIG_MIPS_CPS=y
CONFIG_MIPS_ITU=y CONFIG_MIPS_ITU=y

1
default-configs/ppc-softmmu.mak
View File

@ -63,7 +63,6 @@ CONFIG_PREP=y
CONFIG_PREP_PCI=y CONFIG_PREP_PCI=y
CONFIG_SERIAL_ISA=y CONFIG_SERIAL_ISA=y
CONFIG_MC146818RTC=y CONFIG_MC146818RTC=y
CONFIG_ISA_TESTDEV=y
CONFIG_RS6000_MC=y CONFIG_RS6000_MC=y
CONFIG_PARALLEL=y CONFIG_PARALLEL=y
CONFIG_I82374=y CONFIG_I82374=y

1
default-configs/sh4-softmmu.mak
View File

@ -11,7 +11,6 @@ CONFIG_IDE_MMIO=y
CONFIG_SM501=y CONFIG_SM501=y
CONFIG_I2C=y CONFIG_I2C=y
CONFIG_DDC=y CONFIG_DDC=y
CONFIG_ISA_TESTDEV=y
CONFIG_TEST_DEVICES=y CONFIG_TEST_DEVICES=y
CONFIG_I82378=y CONFIG_I82378=y
CONFIG_I8259=y CONFIG_I8259=y

1
default-configs/sh4eb-softmmu.mak
View File

@ -11,7 +11,6 @@ CONFIG_IDE_MMIO=y
CONFIG_SM501=y CONFIG_SM501=y
CONFIG_I2C=y CONFIG_I2C=y
CONFIG_DDC=y CONFIG_DDC=y
CONFIG_ISA_TESTDEV=y
CONFIG_TEST_DEVICES=y CONFIG_TEST_DEVICES=y
CONFIG_I82378=y CONFIG_I82378=y
CONFIG_I8259=y CONFIG_I8259=y

1
default-configs/sparc64-softmmu.mak
View File

@ -14,7 +14,6 @@ CONFIG_PCI_SABRE=y
CONFIG_SIMBA=y CONFIG_SIMBA=y
CONFIG_SUNHME=y CONFIG_SUNHME=y
CONFIG_MC146818RTC=y CONFIG_MC146818RTC=y
CONFIG_ISA_TESTDEV=y
CONFIG_TEST_DEVICES=y CONFIG_TEST_DEVICES=y
CONFIG_SUN4V_RTC=y CONFIG_SUN4V_RTC=y
CONFIG_SUN4U=y CONFIG_SUN4U=y

2
hw/audio/Kconfig
View File

@ -35,6 +35,8 @@ config HDA
config PCSPK config PCSPK
bool bool
default y
depends on I8254
config WM8750 config WM8750
bool bool

2
hw/block/Kconfig
View File

@ -1,5 +1,7 @@
config FDC config FDC
bool bool
default y
depends on ISA_BUS
config SSI_M25P80 config SSI_M25P80
bool bool

6
hw/char/Kconfig
View File

@ -3,6 +3,8 @@ config ESCC
config PARALLEL config PARALLEL
bool bool
default y
depends on ISA_BUS
config PL011 config PL011
bool bool
@ -12,11 +14,15 @@ config SERIAL
config SERIAL_ISA config SERIAL_ISA
bool bool
default y
depends on ISA_BUS
select SERIAL
config SERIAL_PCI config SERIAL_PCI
bool bool
default y if PCI_DEVICES default y if PCI_DEVICES
depends on PCI depends on PCI
select SERIAL
config VIRTIO_SERIAL config VIRTIO_SERIAL
bool bool

3
hw/display/Kconfig
View File

@ -39,9 +39,12 @@ config VGA_PCI
config VGA_ISA config VGA_ISA
bool bool
depends on ISA_BUS
select VGA
config VGA_ISA_MM config VGA_ISA_MM
bool bool
select VGA
config VMWARE_VGA config VMWARE_VGA
bool bool

1
hw/dma/Kconfig
View File

@ -9,6 +9,7 @@ config PL330
config I82374 config I82374
bool bool
select I8257
config I8257 config I8257
bool bool

1
hw/i386/Kconfig
View File

@ -14,6 +14,7 @@ config I440FX
config ISAPC config ISAPC
bool bool
select ISA_BUS
config Q35 config Q35
bool bool

1
hw/ide/Kconfig
View File

@ -12,6 +12,7 @@ config IDE_PCI
config IDE_ISA config IDE_ISA
bool bool
depends on ISA_BUS
select IDE_QDEV select IDE_QDEV
config IDE_PIIX config IDE_PIIX

2
hw/input/Kconfig
View File

@ -6,6 +6,8 @@ config LM832X
config PCKBD config PCKBD
bool bool
default y
depends on ISA_BUS
config PL050 config PL050
bool bool

2
hw/ipmi/Kconfig
View File

@ -9,6 +9,8 @@ config IPMI_EXTERN
config ISA_IPMI_KCS config ISA_IPMI_KCS
bool bool
depends on ISA_BUS
config ISA_IPMI_BT config ISA_IPMI_BT
bool bool
depends on ISA_BUS

7
hw/isa/Kconfig
View File

@ -6,18 +6,25 @@ config APM
config I82378 config I82378
bool bool
select ISA_BUS
config PC87312 config PC87312
bool bool
select ISA_BUS
config PIIX4 config PIIX4
bool bool
select ISA_BUS
config VT82C686 config VT82C686
bool bool
select ISA_BUS
config SMC37C669 config SMC37C669
bool bool
select ISA_BUS
config LPC_ICH9 config LPC_ICH9
bool bool
select ISA_BUS
select ACPI_X86_ICH

6
hw/misc/Kconfig
View File

@ -1,5 +1,6 @@
config APPLESMC config APPLESMC
bool bool
depends on ISA_BUS
config MAX111X config MAX111X
bool bool
@ -12,12 +13,16 @@ config TMP421
config ISA_DEBUG config ISA_DEBUG
bool bool
depends on ISA_BUS
config SGA config SGA
bool bool
depends on ISA_BUS
config ISA_TESTDEV config ISA_TESTDEV
bool bool
default y if TEST_DEVICES
depends on ISA_BUS
config PCI_TESTDEV config PCI_TESTDEV
bool bool
@ -93,6 +98,7 @@ config IOTKIT_SYSINFO
config PVPANIC config PVPANIC
bool bool
depends on ISA_BUS
config AUX config AUX
bool bool

4
hw/net/Kconfig
View File

@ -48,6 +48,10 @@ config LAN9118
config NE2000_ISA config NE2000_ISA
bool bool
default y
depends on ISA_BUS
depends on PCI # for NE2000State
select NE2000_PCI
config OPENCORES_ETH config OPENCORES_ETH
bool bool

1
hw/sparc64/Kconfig
View File

@ -1,5 +1,6 @@
config SUN4U config SUN4U
bool bool
select ISA_BUS
config NIAGARA config NIAGARA
bool bool

2
hw/tpm/Kconfig
View File

@ -3,7 +3,7 @@ config TPM
config TPM_TIS config TPM_TIS
bool bool
depends on TPM depends on TPM && ISA_BUS
config TPM_CRB config TPM_CRB
bool bool

2
hw/watchdog/Kconfig
View File

@ -8,6 +8,8 @@ config WDT_IB6300ESB
config WDT_IB700 config WDT_IB700
bool bool
default y
depends on ISA_BUS
config WDT_DIAG288 config WDT_DIAG288
bool bool