From nobody Fri Nov 7 10:24:22 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; 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=intel.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547563022830477.690029057781; Tue, 15 Jan 2019 06:37:02 -0800 (PST) Received: from localhost ([127.0.0.1]:38045 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjPpr-0008Rc-R0 for importer@patchew.org; Tue, 15 Jan 2019 09:36:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37384) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjPYP-0002rf-UB for qemu-devel@nongnu.org; Tue, 15 Jan 2019 09:19:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gjPSS-0001VL-Ig for qemu-devel@nongnu.org; Tue, 15 Jan 2019 09:12:49 -0500 Received: from mga05.intel.com ([192.55.52.43]:56326) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gjPSS-0001A9-8v for qemu-devel@nongnu.org; Tue, 15 Jan 2019 09:12:48 -0500 Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Jan 2019 06:12:01 -0800 Received: from he.bj.intel.com ([10.238.157.85]) by orsmga004.jf.intel.com with ESMTP; 15 Jan 2019 06:11:59 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,481,1539673200"; d="scan'208";a="267301486" From: Yang Zhong To: qemu-devel@nongnu.org Date: Tue, 15 Jan 2019 22:10:56 +0800 Message-Id: <20190115141108.934-26-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190115141108.934-1-yang.zhong@intel.com> References: <20190115141108.934-1-yang.zhong@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.43 Subject: [Qemu-devel] [RFC PATCH v2 25/37] 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@intel.com, peter.maydell@linaro.org, thuth@redhat.com, sameo@linux.intel.com, pbonzini@redhat.com, ehabkost@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini 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 --- 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/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 +++++++++++++++++++++++++ 11 files changed, 26 insertions(+), 21 deletions(-) delete mode 100644 default-configs/usb.mak diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index c71d1b7f37..ef8c9ae5ed 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_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 8c071f6224..92fc9911eb 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_VGA=3Dy CONFIG_NAND=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 74d34c05e9..fe07c90937 100644 --- a/default-configs/hppa-softmmu.mak +++ b/default-configs/hppa-softmmu.mak @@ -1,4 +1,3 @@ -include usb.mak CONFIG_PCI=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index cf49e3fae7..23dcca7a31 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -2,7 +2,6 @@ =20 CONFIG_PCI=3Dy CONFIG_ISA=3Dy -include usb.mak include hyperv.mak CONFIG_VGA_ISA=3Dy CONFIG_VGA_CIRRUS=3Dy diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index 03c7a08d1a..1060374d51 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=3Dy CONFIG_PCI=3Dy CONFIG_ESP=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index c7003e4284..37040fd17a 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_PCI=3Dy ONFIG_ISA=3Dy =20 diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 57d99fa93c..9fc09f9d6d 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_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index 2e5909c381..c53051d0d5 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_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index db393d9eb3..5507346006 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_M48T59=3Dy CONFIG_PTIMER=3Dy diff --git a/default-configs/usb.mak b/default-configs/usb.mak deleted file mode 100644 index e42cfeabbe..0000000000 --- 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 f23c542d27..0b8f41040e 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -5,59 +5,85 @@ config USB_UHCI bool default y depends on PCI + select USB =20 config USB_OHCI bool default y depends on PCI + select USB =20 config USB_EHCI bool default y depends on PCI + select USB =20 config USB_EHCI_SYSBUS bool + select USB =20 config USB_XHCI bool default y depends on PCI + select USB =20 config USB_XHCI_NEC bool default y 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 =20 config USB_STORAGE_UAS bool + default y + depends on USB =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 --=20 2.17.1