From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [Qemu-devel] [PULL 15/19] hw/usb/Kconfig: Add CONFIG_USB_EHCI_PCI
Date: Tue, 16 Jul 2019 10:11:13 +0200 [thread overview]
Message-ID: <1563264677-39718-16-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1563264677-39718-1-git-send-email-pbonzini@redhat.com>
From: Philippe Mathieu-Daudé <philmd@redhat.com>
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é <philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@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 564305e..495c6f2 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 81688f6..303ac08 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
--
1.8.3.1
next prev parent reply other threads:[~2019-07-16 8:14 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-16 8:10 [Qemu-devel] [PULL 00/19] Bugfix/cleanup patches for 2019-07-16 Paolo Bonzini
2019-07-16 8:10 ` [Qemu-devel] [PULL 01/19] scsi-disk: pass sense correctly for guest-recoverable errors Paolo Bonzini
2019-07-16 8:11 ` [Qemu-devel] [PULL 02/19] scsi: explicitly list guest-recoverable sense codes Paolo Bonzini
2019-07-16 8:11 ` [Qemu-devel] [PULL 03/19] scsi: add guest-recoverable ZBC errors Paolo Bonzini
2019-07-16 8:11 ` [Qemu-devel] [PULL 04/19] iscsi: fix busy/timeout/task set full Paolo Bonzini
2019-07-16 8:11 ` [Qemu-devel] [PULL 05/19] iscsi: base all handling of check condition on scsi_sense_to_errno Paolo Bonzini
2019-07-16 8:11 ` [Qemu-devel] [PULL 06/19] build-sys: remove slirp cflags from main-loop.o Paolo Bonzini
2019-07-16 8:11 ` [Qemu-devel] [PULL 07/19] rdmacm-mux: fix strcpy string warning Paolo Bonzini
2019-07-16 8:11 ` [Qemu-devel] [PULL 08/19] hw/i386: turn off vmport if CONFIG_VMPORT is disabled Paolo Bonzini
2019-07-16 18:55 ` Philippe Mathieu-Daudé
2019-07-16 19:13 ` Paolo Bonzini
2019-07-16 8:11 ` [Qemu-devel] [PULL 09/19] memory: unref the memory region in simplify flatview Paolo Bonzini
2019-07-16 8:11 ` [Qemu-devel] [PULL 10/19] Fix broken build with WHPX enabled Paolo Bonzini
2019-07-16 8:11 ` [Qemu-devel] [PULL 11/19] util: merge main-loop.c and iohandler.c Paolo Bonzini
2019-07-16 8:11 ` [Qemu-devel] [PULL 12/19] hw/lm32/Kconfig: Milkymist One provides a USB 1.1 Controller Paolo Bonzini
2019-07-16 8:11 ` [Qemu-devel] [PULL 13/19] checkpatch: detect doubly-encoded UTF-8 Paolo Bonzini
2019-07-16 8:11 ` [Qemu-devel] [PULL 14/19] target/i386: sev: Do not unpin ram device memory region Paolo Bonzini
2019-07-16 8:11 ` Paolo Bonzini [this message]
2019-07-16 8:11 ` [Qemu-devel] [PULL 16/19] hw/usb/Kconfig: USB_XHCI_NEC requires USB_XHCI Paolo Bonzini
2019-07-16 8:11 ` [Qemu-devel] [PULL 17/19] Makefile: do not repeat $(CONFIG_SOFTMMU) in hw/Makefile.objs Paolo Bonzini
2019-07-16 8:11 ` [Qemu-devel] [PULL 18/19] create_config: remove $(CONFIG_SOFTMMU) hack Paolo Bonzini
2019-07-16 8:11 ` [Qemu-devel] [PULL 19/19] vl: make sure char-pty message displayed by moving setbuf to the beginning Paolo Bonzini
2019-07-16 8:18 ` [Qemu-devel] [PULL 00/19] Bugfix/cleanup patches for 2019-07-16 no-reply
2019-07-16 15:05 ` Peter Maydell
2019-07-19 16:15 ` Peter Maydell
2019-07-19 17:00 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1563264677-39718-16-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).