On 1/25/19 11:07 AM, Paolo Bonzini wrote: > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > --- > default-configs/alpha-softmmu.mak | 5 ----- > default-configs/ppc-softmmu.mak | 9 --------- > default-configs/sh4-softmmu.mak | 9 ++------- > default-configs/sh4eb-softmmu.mak | 6 ------ > hw/isa/Kconfig | 21 +++++++++++++++++++++ > 5 files changed, 23 insertions(+), 27 deletions(-) > > diff --git a/default-configs/alpha-softmmu.mak > b/default-configs/alpha-softmmu.mak > index f44c5bc..2ad4d40 100644 > --- a/default-configs/alpha-softmmu.mak > +++ b/default-configs/alpha-softmmu.mak > @@ -2,13 +2,8 @@ > > CONFIG_PCI=y > CONFIG_PCI_DEVICES=y > -CONFIG_SERIAL=y > -CONFIG_SERIAL_ISA=y > CONFIG_I82374=y > CONFIG_I8254=y > -CONFIG_I8257=y > -CONFIG_PARALLEL=y > -CONFIG_FDC=y > CONFIG_PCKBD=y > CONFIG_VGA_CIRRUS=y > CONFIG_VMWARE_VGA=y > diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak > index f38c14c..87c2d6d 100644 > --- a/default-configs/ppc-softmmu.mak > +++ b/default-configs/ppc-softmmu.mak > @@ -8,12 +8,10 @@ CONFIG_ISA_BUS=y > CONFIG_PPC4XX=y > CONFIG_M48T59=y > CONFIG_SERIAL=y > -CONFIG_I8257=y > CONFIG_OPENPIC=y > CONFIG_PPCE500_PCI=y > CONFIG_PFLASH_CFI01=y > CONFIG_PFLASH_CFI02=y > -CONFIG_I8259=y > CONFIG_XILINX=y > CONFIG_XILINX_ETHLITE=y > CONFIG_E500=y > @@ -59,18 +57,11 @@ CONFIG_MAC_NEWWORLD=y > # For PReP > CONFIG_PREP=y > CONFIG_PREP_PCI=y > -CONFIG_SERIAL_ISA=y > -CONFIG_MC146818RTC=y > CONFIG_ISA_TESTDEV=y > CONFIG_RS6000_MC=y > -CONFIG_PARALLEL=y > CONFIG_I82374=y > CONFIG_I82378=y > -CONFIG_I8254=y > CONFIG_PCKBD=y > -CONFIG_FDC=y > CONFIG_NE2000_ISA=y > CONFIG_PC87312=y > -CONFIG_PCSPK=y > -CONFIG_IDE_ISA=y > CONFIG_CS4231A=y > diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak > index 9e8e487..1b4582a 100644 > --- a/default-configs/sh4-softmmu.mak > +++ b/default-configs/sh4-softmmu.mak > @@ -1,9 +1,8 @@ > -# Default configuration for sh4-softmmu > +# Default configuration for sh4eb-softmmu > > CONFIG_PCI=y > CONFIG_PCI_DEVICES=y > CONFIG_SERIAL=y > -CONFIG_SERIAL_ISA=y > CONFIG_PFLASH_CFI02=y > CONFIG_SH4=y > CONFIG_IDE_MMIO=y > @@ -12,11 +11,7 @@ CONFIG_I2C=y > CONFIG_DDC=y > CONFIG_ISA_TESTDEV=y > CONFIG_I82378=y > -CONFIG_I8259=y > -CONFIG_I8254=y > -CONFIG_PCSPK=y > CONFIG_I82374=y > -CONFIG_I8257=y > -CONFIG_MC146818RTC=y > CONFIG_R2D=y > CONFIG_SHIX=y > +CONFIG_TEST_DEVICES=y > diff --git a/default-configs/sh4eb-softmmu.mak > b/default-configs/sh4eb-softmmu.mak > index 2a26946..baed9a4 100644 > --- a/default-configs/sh4eb-softmmu.mak > +++ b/default-configs/sh4eb-softmmu.mak > @@ -3,7 +3,6 @@ > CONFIG_PCI=y > CONFIG_PCI_DEVICES=y > CONFIG_SERIAL=y > -CONFIG_SERIAL_ISA=y > CONFIG_PFLASH_CFI02=y > CONFIG_SH4=y > CONFIG_IDE_MMIO=y > @@ -12,11 +11,6 @@ CONFIG_I2C=y > CONFIG_DDC=y > CONFIG_ISA_TESTDEV=y > CONFIG_I82378=y > -CONFIG_I8259=y > -CONFIG_I8254=y > -CONFIG_PCSPK=y > CONFIG_I82374=y > -CONFIG_I8257=y > -CONFIG_MC146818RTC=y > CONFIG_R2D=y > CONFIG_SHIX=y > diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig > index fcd87b4..34711d0 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 I8257 > + 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 >
Now I see this patch, so my suggestions on patch #41 of this series go here.
