From nobody Sun Oct 5 01:45:04 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551728650582661.1395337095566; Mon, 4 Mar 2019 11:44:10 -0800 (PST) Received: from localhost ([127.0.0.1]:59850 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tVP-0005Cv-CG for importer@patchew.org; Mon, 04 Mar 2019 14:44:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45893) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCa-0001ws-3O for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCY-00045J-RX for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:36 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:36246) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCY-00043k-IS for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:34 -0500 Received: by mail-wm1-x32d.google.com with SMTP id j125so135317wmj.1 for ; Mon, 04 Mar 2019 10:20:34 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:32 -0800 (PST) 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; bh=XY/PWTOlHqa8wTuDY6vI9w2aH1074B40DdDjODlcalI=; b=t6XUlns2UyuHOaD5R8hZf6IMwd77D5n9cTfud0wVPmdN+HHaZemOkSOsKKkLBBL8R8 LbXCZtprF9KmuDkEHVEy2LV6BnT2D9aOxWGYLgybVZ5QzG4OE1WN4A7HJK04Q6RfOZ3p aB7QqiDRu9DdhgNydoMseg+DU7FhnCjIkkAY4FGz0G5u6b+hg5D/Qqe/db2pDA37Zqqx w4TZJsgMoCpSbN4UtDv6/Kq+J0hJZzHl/yMYMoLTs29Ar9X5G18O6ktkM8FgKQS0+ul2 pZZTVBe8X5Z7J3aOVxePiNMFxPIs4WsRQUWbYd8eGuKMT2fyupmX8d4qemB8kSXl8v9z 15Cw== 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; bh=XY/PWTOlHqa8wTuDY6vI9w2aH1074B40DdDjODlcalI=; b=rPb6YF9IsmCaeqUdzYqNadbHqzmdqWXsxNGRaigzK31EwnxLDFFLBel21nBI8+hLHm 4KsYXqOrUjP4sCBSprdTEDGJbWEFVaL9X3xquHD/eoh2KBQKQqYPlSrJkDvKtyDTPEts Ki4lhzG30RWcnpul03GcgeDOOzqcXHz8sv+wn1wetrKGX/C4FcpcLt9s+ms80Kha2Ocs kg/FxQI8BOcnorpuMyiUqrxL9nltm3EUe8B4ZCGpPA1Q5Hg7w6Y2dLSXpIIcHSe8P9yo P1NE6wAx0hlF7suMYSUzAl2KVs1NYGOO/docxYNPtXcmkXMwvh+CdSe3i/+y3WqjTghO a4BA== X-Gm-Message-State: APjAAAUnhVkKmJzXqq8crkWoLhpWrQZOgqNr1IPEe2C2Ip8UQ3i6cUt7 Av6EJ6PuhJ5ewNhlQ0XfCzKB7iQO X-Google-Smtp-Source: APXvYqweghuBCrDxyZZsaFYiwtq9RTVdIyQcSworKXKgwewiFUO28u4QSEl12gSzYuerPelMw9asPA== X-Received: by 2002:a1c:4844:: with SMTP id v65mr303800wma.66.1551723633268; Mon, 04 Mar 2019 10:20:33 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:38 +0100 Message-Id: <1551723614-1823-19-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551723614-1823-1-git-send-email-pbonzini@redhat.com> References: <1551723614-1823-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32d Subject: [Qemu-devel] [PULL 18/54] build: convert usb.mak to Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yang Zhong , thuth@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Instead of including the same list of devices for each target, let the host controllers select CONFIG_USB and make the devices default to present whenever USB is available. Done with the following script: while read i; do i=3D${i%=3Dy}; i=3D${i#CONFIG_} sed -i -e'/^config '$i'$/!b' -en \ -e'a\' -e' default y\' -e' depends on USB' \ `grep -lw $i hw/*/Kconfig` done < default-configs/usb.mak followed by adding "select USB" on the host controllers. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-33-yang.zhong@intel.com> Acked-by: Richard Henderson Signed-off-by: Paolo Bonzini --- default-configs/alpha-softmmu.mak | 1 - default-configs/arm-softmmu.mak | 2 -- default-configs/hppa-softmmu.mak | 1 - default-configs/i386-softmmu.mak | 1 - default-configs/mips-softmmu-common.mak | 1 - default-configs/ppc-softmmu.mak | 1 - default-configs/riscv32-softmmu.mak | 1 - default-configs/riscv64-softmmu.mak | 1 - default-configs/sh4-softmmu.mak | 1 - default-configs/sh4eb-softmmu.mak | 1 - default-configs/sparc64-softmmu.mak | 1 - default-configs/usb.mak | 11 ----------- hw/usb/Kconfig | 26 ++++++++++++++++++++++++++ hw/usb/Makefile.objs | 2 +- 14 files changed, 27 insertions(+), 24 deletions(-) delete mode 100644 default-configs/usb.mak diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index 27936dd..f0c1928 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for alpha-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 7b7c040..917b18d 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for arm-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_VGA=3Dy @@ -38,7 +37,6 @@ CONFIG_DS1338=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_MICRODRIVE=3Dy -CONFIG_USB=3Dy CONFIG_USB_MUSB=3Dy CONFIG_USB_EHCI_SYSBUS=3Dy CONFIG_PLATFORM_BUS=3Dy diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmm= u.mak index 221c609..b7f2b43 100644 --- a/default-configs/hppa-softmmu.mak +++ b/default-configs/hppa-softmmu.mak @@ -1,4 +1,3 @@ -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 075d501..54b571f 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -3,7 +3,6 @@ CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_ISA_BUS=3Dy -include usb.mak include hyperv.mak CONFIG_TEST_DEVICES=3Dy CONFIG_VGA_ISA=3Dy diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index 556cd5c..45c599b 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -1,6 +1,5 @@ # Common mips*-softmmu CONFIG defines =20 -include usb.mak CONFIG_ISA_BUS=3Dy CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 1871185..d4807b3 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for ppc-softmmu =20 -include usb.mak CONFIG_ISA_BUS=3Dy CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index 5501c1b..fd91efb 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for riscv-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index 5501c1b..fd91efb 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for riscv-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 87da3a6..3f7fbe2 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for sh4-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index ce9aae9..17f07a4 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for sh4eb-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index bf52d52..2d23b0c 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for sparc64-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_M48T59=3Dy diff --git a/default-configs/usb.mak b/default-configs/usb.mak deleted file mode 100644 index e42cfea..0000000 --- a/default-configs/usb.mak +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG_USB=3Dy -CONFIG_USB_TABLET_WACOM=3Dy -CONFIG_USB_STORAGE_BOT=3Dy -CONFIG_USB_STORAGE_UAS=3Dy -CONFIG_USB_STORAGE_MTP=3Dy -CONFIG_SCSI=3Dy -CONFIG_USB_SMARTCARD=3Dy -CONFIG_USB_AUDIO=3Dy -CONFIG_USB_SERIAL=3Dy -CONFIG_USB_NETWORK=3Dy -CONFIG_USB_BLUETOOTH=3Dy diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index 071e749..a1b7acb 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -5,61 +5,87 @@ config USB_UHCI bool default y if PCI_DEVICES depends on PCI + select USB =20 config USB_OHCI bool default y if PCI_DEVICES depends on PCI + select USB =20 config USB_EHCI bool default y if PCI_DEVICES depends on PCI + select USB =20 config USB_EHCI_SYSBUS bool + select USB =20 config USB_XHCI bool default y if PCI_DEVICES depends on PCI + select USB =20 config USB_XHCI_NEC bool default y if PCI_DEVICES depends on PCI + select USB =20 config USB_MUSB bool + select USB =20 config TUSB6010 bool + select USB_MUSB =20 config USB_TABLET_WACOM bool + default y + depends on USB =20 config USB_STORAGE_BOT bool + default y + depends on USB select SCSI =20 config USB_STORAGE_UAS bool + default y + depends on USB select SCSI =20 config USB_AUDIO bool + default y + depends on USB =20 config USB_SERIAL bool + default y + depends on USB =20 config USB_NETWORK bool + default y + depends on USB =20 config USB_BLUETOOTH bool + default y + depends on USB =20 config USB_SMARTCARD bool + default y + depends on USB =20 config USB_STORAGE_MTP bool + default y + depends on USB diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index 41be700..2b92964 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -6,7 +6,7 @@ common-obj-$(CONFIG_USB) +=3D desc.o desc-msos.o common-obj-$(CONFIG_USB_UHCI) +=3D hcd-uhci.o common-obj-$(CONFIG_USB_OHCI) +=3D hcd-ohci.o common-obj-$(CONFIG_USB_EHCI) +=3D hcd-ehci.o hcd-ehci-pci.o -common-obj-$(CONFIG_USB_EHCI_SYSBUS) +=3D hcd-ehci-sysbus.o +common-obj-$(CONFIG_USB_EHCI_SYSBUS) +=3D hcd-ehci.o hcd-ehci-sysbus.o common-obj-$(CONFIG_USB_XHCI) +=3D hcd-xhci.o common-obj-$(CONFIG_USB_XHCI_NEC) +=3D hcd-xhci-nec.o common-obj-$(CONFIG_USB_MUSB) +=3D hcd-musb.o --=20 1.8.3.1