ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

isa: express SuperIO dependencies with Kconfig 

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2019-01-25 07:21:49 +01:00
parent 7aaa6a1637
commit dd0ff8191a
6 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,13 +2,8 @@
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCI_DEVICES=y CONFIG_PCI_DEVICES=y
CONFIG_SERIAL=y
CONFIG_SERIAL_ISA=y
CONFIG_I82374=y CONFIG_I82374=y
CONFIG_I8254=y CONFIG_I8254=y
CONFIG_I8257=y
CONFIG_PARALLEL=y
CONFIG_FDC=y
CONFIG_PCKBD=y CONFIG_PCKBD=y
CONFIG_VGA_CIRRUS=y CONFIG_VGA_CIRRUS=y
CONFIG_VMWARE_VGA=y CONFIG_VMWARE_VGA=y

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

@ -9,12 +9,10 @@ CONFIG_TEST_DEVICES=y
CONFIG_PPC4XX=y CONFIG_PPC4XX=y
CONFIG_M48T59=y CONFIG_M48T59=y
CONFIG_SERIAL=y CONFIG_SERIAL=y
CONFIG_I8257=y
CONFIG_OPENPIC=y CONFIG_OPENPIC=y
CONFIG_PPCE500_PCI=y CONFIG_PPCE500_PCI=y
CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI01=y
CONFIG_PFLASH_CFI02=y CONFIG_PFLASH_CFI02=y
CONFIG_I8259=y
CONFIG_XILINX=y CONFIG_XILINX=y
CONFIG_XILINX_ETHLITE=y CONFIG_XILINX_ETHLITE=y
CONFIG_E500=y CONFIG_E500=y
@ -58,17 +56,10 @@ CONFIG_MAC_NEWWORLD=y
# For PReP # For PReP
CONFIG_PREP=y CONFIG_PREP=y
CONFIG_PREP_PCI=y CONFIG_PREP_PCI=y
CONFIG_SERIAL_ISA=y
CONFIG_MC146818RTC=y
CONFIG_RS6000_MC=y CONFIG_RS6000_MC=y
CONFIG_PARALLEL=y
CONFIG_I82374=y CONFIG_I82374=y
CONFIG_I82378=y CONFIG_I82378=y
CONFIG_I8254=y
CONFIG_PCKBD=y CONFIG_PCKBD=y
CONFIG_FDC=y
CONFIG_NE2000_ISA=y CONFIG_NE2000_ISA=y
CONFIG_PC87312=y CONFIG_PC87312=y
CONFIG_PCSPK=y
CONFIG_IDE_ISA=y
CONFIG_CS4231A=y CONFIG_CS4231A=y

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

@ -1,20 +1,15 @@
# Default configuration for sh4-softmmu # Default configuration for sh4eb-softmmu
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCI_DEVICES=y CONFIG_PCI_DEVICES=y
CONFIG_SERIAL=y CONFIG_SERIAL=y
CONFIG_SERIAL_ISA=y
CONFIG_PFLASH_CFI02=y CONFIG_PFLASH_CFI02=y
CONFIG_SH4=y CONFIG_SH4=y
CONFIG_IDE_MMIO=y CONFIG_IDE_MMIO=y
CONFIG_SM501=y CONFIG_SM501=y
CONFIG_TEST_DEVICES=y CONFIG_TEST_DEVICES=y
CONFIG_I82378=y CONFIG_I82378=y
CONFIG_I8259=y
CONFIG_I8254=y
CONFIG_PCSPK=y
CONFIG_I82374=y CONFIG_I82374=y
CONFIG_I8257=y
CONFIG_MC146818RTC=y
CONFIG_R2D=y CONFIG_R2D=y
CONFIG_SHIX=y CONFIG_SHIX=y
CONFIG_TEST_DEVICES=y

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

@ -3,18 +3,12 @@
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCI_DEVICES=y CONFIG_PCI_DEVICES=y
CONFIG_SERIAL=y CONFIG_SERIAL=y
CONFIG_SERIAL_ISA=y
CONFIG_PFLASH_CFI02=y CONFIG_PFLASH_CFI02=y
CONFIG_SH4=y CONFIG_SH4=y
CONFIG_IDE_MMIO=y CONFIG_IDE_MMIO=y
CONFIG_SM501=y CONFIG_SM501=y
CONFIG_TEST_DEVICES=y CONFIG_TEST_DEVICES=y
CONFIG_I82378=y CONFIG_I82378=y
CONFIG_I8259=y
CONFIG_I8254=y
CONFIG_PCSPK=y
CONFIG_I82374=y CONFIG_I82374=y
CONFIG_I8257=y
CONFIG_MC146818RTC=y
CONFIG_R2D=y CONFIG_R2D=y
CONFIG_SHIX=y CONFIG_SHIX=y

5
hw/block/Kconfig
View File

@ -1,7 +1,8 @@
config FDC config FDC
bool bool
default y # FIXME: there is no separate file for the MMIO floppy disk controller, so
depends on ISA_BUS # select ISA_BUS here instead of polluting each board that requires one
select ISA_BUS
config SSI_M25P80 config SSI_M25P80
bool bool

21
hw/isa/Kconfig
View File

@ -7,26 +7,47 @@ config APM
config I82378 config I82378
bool bool
select ISA_BUS select ISA_BUS
select I8259
select I8254
select I82374
select MC146818RTC
config PC87312 config PC87312
bool bool
select ISA_BUS select ISA_BUS
select I8259
select I8254
select I8257
select MC146818RTC
select SERIAL_ISA
select PARALLEL
select FDC
select IDE_ISA
config PIIX4 config PIIX4
bool bool
# For historical reasons, SuperIO devices are created in the board
# for PIIX4.
select ISA_BUS select ISA_BUS
config VT82C686 config VT82C686
bool bool
select ISA_BUS select ISA_BUS
select ACPI_SMBUS select ACPI_SMBUS
select SERIAL_ISA
select FDC
config SMC37C669 config SMC37C669
bool bool
select ISA_BUS select ISA_BUS
select SERIAL_ISA
select PARALLEL
select FDC
config LPC_ICH9 config LPC_ICH9
bool bool
# For historical reasons, SuperIO devices are created in the board
# for ICH9.
select ISA_BUS select ISA_BUS
select ACPI_SMBUS select ACPI_SMBUS
select ACPI_X86_ICH select ACPI_X86_ICH