On 30/01/19 10:43, Thomas Huth wrote: > Most of the dependencies are now directly selected by the SAM460EX > switch. We can drop CONFIG_VGA_CIRRUS since this device is already > selected automatically when CONFIG_PCI_DEVICES is set. > > Cc: BALATON Zoltan <[email protected]> > Signed-off-by: Thomas Huth <[email protected]>
Reviewed-by: Paolo Bonzini <[email protected]> > --- > default-configs/ppc-softmmu.mak | 10 ---------- > hw/display/Kconfig | 1 + > hw/ppc/Kconfig | 12 ++++++++++++ > hw/usb/Kconfig | 2 +- > 4 files changed, 14 insertions(+), 11 deletions(-) > > diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak > index 513a8e9..5265d8a 100644 > --- a/default-configs/ppc-softmmu.mak > +++ b/default-configs/ppc-softmmu.mak > @@ -25,16 +25,6 @@ CONFIG_PCI_EXPRESS=y > > # For Sam460ex > CONFIG_SAM460EX=y > -CONFIG_USB_EHCI_SYSBUS=y > -CONFIG_SM501=y > -CONFIG_DDC=y > -CONFIG_IDE_SII3112=y > -CONFIG_I2C=y > -CONFIG_AT24C=y > -CONFIG_BITBANG_I2C=y > -CONFIG_M41T80=y > -CONFIG_VGA_CIRRUS=y > -CONFIG_SMBUS_EEPROM=y > > # For Macs > CONFIG_MAC_OLDWORLD=y > diff --git a/hw/display/Kconfig b/hw/display/Kconfig > index c784fe8..f8e6136 100644 > --- a/hw/display/Kconfig > +++ b/hw/display/Kconfig > @@ -76,6 +76,7 @@ config MILKYMIST_TMU2 > config SM501 > bool > depends on I2C > + select DDC > > config TCX > bool > diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig > index f6b4206..8bd25ed 100644 > --- a/hw/ppc/Kconfig > +++ b/hw/ppc/Kconfig > @@ -24,9 +24,21 @@ config PPC440 > > config PPC4XX > bool > + select BITBANG_I2C > + select PCI > > config SAM460EX > bool > + select AT24C > + select PFLASH_CFI01 > + select IDE_SII3112 > + select ISA_BUS # FIXME: Currently required for IDE_SII3112 > + select M41T80 > + select PPC440 > + select SM501 > + select SMBUS_EEPROM > + select USB_EHCI_SYSBUS > + select USB_OHCI > > config PREP > bool > diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig > index a1b7acb..871ea47 100644 > --- a/hw/usb/Kconfig > +++ b/hw/usb/Kconfig > @@ -21,7 +21,7 @@ config USB_EHCI > > config USB_EHCI_SYSBUS > bool > - select USB > + select USB_EHCI > > config USB_XHCI > bool >
