On 15/07/2019 11.55, Philippe Mathieu-Daudé wrote: > The USB_EHCI entry currently include PCI code. Since the EHCI > implementation is already split in sysbus/PCI, add a new > USB_EHCI_PCI. There are no logical changes, but the Kconfig > dependencies tree is cleaner. > > Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> > --- > hw/usb/Kconfig | 9 ++++++--- > hw/usb/Makefile.objs | 5 +++-- > 2 files changed, 9 insertions(+), 5 deletions(-) > > diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig > index 564305e283..495c6f2d48 100644 > --- a/hw/usb/Kconfig > +++ b/hw/usb/Kconfig > @@ -19,13 +19,16 @@ config USB_OHCI_PCI > > config USB_EHCI > bool > - default y if PCI_DEVICES > - depends on PCI > select USB > > +config USB_EHCI_PCI > + bool > + default y if PCI_DEVICES > + select USB_EHCI > + > config USB_EHCI_SYSBUS > bool > - select USB > + select USB_EHCI > > config USB_XHCI > bool > diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs > index 81688f6e70..303ac084a0 100644 > --- a/hw/usb/Makefile.objs > +++ b/hw/usb/Makefile.objs > @@ -6,8 +6,9 @@ common-obj-$(CONFIG_USB) += desc.o desc-msos.o > common-obj-$(CONFIG_USB_UHCI) += hcd-uhci.o > common-obj-$(CONFIG_USB_OHCI) += hcd-ohci.o > common-obj-$(CONFIG_USB_OHCI_PCI) += hcd-ohci-pci.o > -common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o hcd-ehci-pci.o > -common-obj-$(CONFIG_USB_EHCI_SYSBUS) += hcd-ehci.o hcd-ehci-sysbus.o > +common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o > +common-obj-$(CONFIG_USB_EHCI_PCI) += hcd-ehci-pci.o > +common-obj-$(CONFIG_USB_EHCI_SYSBUS) += hcd-ehci-sysbus.o > common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o > common-obj-$(CONFIG_USB_XHCI_NEC) += hcd-xhci-nec.o > common-obj-$(CONFIG_USB_MUSB) += hcd-musb.o >
Looks cleaner this way, indeed. Reviewed-by: Thomas Huth <th...@redhat.com>
