From patchwork Tue Jul 16 08:11:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 11045483 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B837317E0 for ; Tue, 16 Jul 2019 08:14:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA3AE28496 for ; Tue, 16 Jul 2019 08:14:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9EBB1285A5; Tue, 16 Jul 2019 08:14:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4FFAF285A9 for ; Tue, 16 Jul 2019 08:14:47 +0000 (UTC) Received: from localhost ([::1]:46228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIbm-0005QO-5Z for patchwork-qemu-devel@patchwork.kernel.org; Tue, 16 Jul 2019 04:14:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60093) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIYk-0000HV-1p for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnIYi-0003M0-Iy for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:37 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:37351) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnIYi-0003Kp-Ap for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:11:36 -0400 Received: by mail-wm1-x333.google.com with SMTP id f17so17655287wme.2 for ; Tue, 16 Jul 2019 01:11:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tYkWxfQocQcN4T6E1ktela7goxtlWdSVxpbi0ybM8Vc=; b=ZxNAqCLSLenzrnbhdYFkfhEVqNVdYP93iRmmJPABl34bIqqWbc8IuCIOBq0PEtAUIG rM8t0knCQSUtOYAAfX30UEA/tSCXpN1kfBXgqpB+ub5Tts3w6pUnfrY/3/vkc7XghbTU 7ddnGbCLj6nQQJW088/1h+TzSZeRnY/M9tPaL5bKSoLwNR1HD8yYG7bz/chiLhg/WmvZ sgfRikyejospHBFaOhRNmz7FR699dcYYxRFIJI890G+psCBG7dcY79aK+1L7X9pme0Lw txy5IP3A86liJM3kAsvjhfrT6iZKIkC93/LfJgCNDZyZdxSjJDbUt0OyRcOlgDw8oZfA IYZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=tYkWxfQocQcN4T6E1ktela7goxtlWdSVxpbi0ybM8Vc=; b=tj3+B/KE44LHk061y4MSXfL14wg9K5eHAkeT21amZx6a4hRLMqz6IlJDMyKxKp2Cc2 SxoN/DW85uOl0fvtT032/lR0/tcN0+Kv6jl6n7wfEiNIWX/3no+8WWE3kiN0whSno67L JOKl8wbgJX3GAUDAUhk4WhsGy2Hwf1tZCWg4wbD2URehPyFWSugS7mTEIpegtbYlaEoy BknG6tT2vA44R+86ZJYJGWViuUeYrCwiWWrx1eBEnkyIyCCJ62hnx1KPju7Hy/BaxER8 VhQp3JQvL3l2/eGAdu/DC0DjfRfSvlXMkDnkqkiiTiSExtrzwNFOx1t0FMBnJcR1uGlU ISGA== X-Gm-Message-State: APjAAAUhL+9Ln2HDaHhb7xR5ldO7gREpTePmm0XiDNWu7Fchd1bx4f87 seIlxZ/lUsl/J98r0iBUezkaK8nhUEw= X-Google-Smtp-Source: APXvYqx+qJp+GwXKxpc/EQlA8LVrkxXJqC8kmmig1xa65GIDldhueeG6+VlxB5n8uPzEMOZVjyuPwQ== X-Received: by 2002:a1c:a5c2:: with SMTP id o185mr28528112wme.172.1563264695019; Tue, 16 Jul 2019 01:11:35 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c1sm37723879wrh.1.2019.07.16.01.11.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 01:11:34 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 16 Jul 2019 10:11:13 +0200 Message-Id: <1563264677-39718-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> References: <1563264677-39718-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::333 Subject: [Qemu-devel] [PULL 15/19] hw/usb/Kconfig: Add CONFIG_USB_EHCI_PCI X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Philippe Mathieu-Daudé 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é Signed-off-by: Paolo Bonzini --- 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