openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hw/isa: Introduce a CONFIG_ISA_SUPERIO switch for isa-superio.c 

Currently, isa-superio.c is always compiled as soon as CONFIG_ISA_BUS
is enabled. But there are also machines that have an ISA BUS without
any of the superio chips attached to it, so we should not compile
isa-superio.c in case we only compile a QEMU for such a machine.
Thus add a proper CONFIG_ISA_SUPERIO switch so that this file only gets
compiled when we really, really need it.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Thomas Huth 2019-09-30 17:04:36 +02:00 committed by Paolo Bonzini
parent 86cf9e1546
commit c0ff379514
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/isa/Kconfig
View File

@ -13,9 +13,13 @@ config I82378
select MC146818RTC select MC146818RTC
select PCSPK select PCSPK
config PC87312 config ISA_SUPERIO
bool bool
select ISA_BUS select ISA_BUS
config PC87312
bool
select ISA_SUPERIO
select I8259 select I8259
select I8254 select I8254
select I8257 select I8257
@ -34,14 +38,14 @@ config PIIX4
config VT82C686 config VT82C686
bool bool
select ISA_BUS select ISA_SUPERIO
select ACPI_SMBUS select ACPI_SMBUS
select SERIAL_ISA select SERIAL_ISA
select FDC select FDC
config SMC37C669 config SMC37C669
bool bool
select ISA_BUS select ISA_SUPERIO
select SERIAL_ISA select SERIAL_ISA
select PARALLEL select PARALLEL
select FDC select FDC

2
hw/isa/Makefile.objs
View File

@ -1,5 +1,5 @@
common-obj-$(CONFIG_ISA_BUS) += isa-bus.o common-obj-$(CONFIG_ISA_BUS) += isa-bus.o
common-obj-$(CONFIG_ISA_BUS) += isa-superio.o common-obj-$(CONFIG_ISA_SUPERIO) += isa-superio.o
common-obj-$(CONFIG_APM) += apm.o common-obj-$(CONFIG_APM) += apm.o
common-obj-$(CONFIG_I82378) += i82378.o common-obj-$(CONFIG_I82378) += i82378.o
common-obj-$(CONFIG_PC87312) += pc87312.o common-obj-$(CONFIG_PC87312) += pc87312.o

1
hw/mips/Kconfig
View File

@ -13,6 +13,7 @@ config R4K
config MALTA config MALTA
bool bool
select ISA_SUPERIO
config MIPSSIM config MIPSSIM
bool bool