From: Yang Zhong <yang.zhong@intel.com>
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, thuth@redhat.com, peter.maydell@linaro.org,
sameo@linux.intel.com, ehabkost@redhat.com, yang.zhong@intel.com
Subject: [Qemu-devel] [RFC PATCH v3 31/43] build: convert usb.mak to Kconfig
Date: Fri, 18 Jan 2019 19:23:58 +0800 [thread overview]
Message-ID: <20190118112410.3010-32-yang.zhong@intel.com> (raw)
In-Reply-To: <20190118112410.3010-1-yang.zhong@intel.com>
From: Paolo Bonzini <pbonzini@redhat.com>
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=${i%=y}; i=${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 <pbonzini@redhat.com>
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
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 +++++++++++++++++++++++++
13 files changed, 26 insertions(+), 23 deletions(-)
delete mode 100644 default-configs/usb.mak
diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-softmmu.mak
index e583177e79..b9239370a6 100644
--- a/default-configs/alpha-softmmu.mak
+++ b/default-configs/alpha-softmmu.mak
@@ -1,6 +1,5 @@
# Default configuration for alpha-softmmu
-include usb.mak
CONFIG_PCI=y
CONFIG_SERIAL=y
CONFIG_SERIAL_ISA=y
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 8734c508ee..47a974b832 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -1,6 +1,5 @@
# Default configuration for arm-softmmu
-include usb.mak
CONFIG_PCI=y
CONFIG_VGA=y
CONFIG_NAND=y
@@ -38,7 +37,6 @@ CONFIG_DS1338=y
CONFIG_PFLASH_CFI01=y
CONFIG_PFLASH_CFI02=y
CONFIG_MICRODRIVE=y
-CONFIG_USB=y
CONFIG_USB_MUSB=y
CONFIG_USB_EHCI_SYSBUS=y
CONFIG_PLATFORM_BUS=y
diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmmu.mak
index 673ae5a7cf..615e1b528f 100644
--- a/default-configs/hppa-softmmu.mak
+++ b/default-configs/hppa-softmmu.mak
@@ -1,4 +1,3 @@
-include usb.mak
CONFIG_PCI=y
CONFIG_SERIAL=y
CONFIG_SERIAL_ISA=y
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index d0c1f8a613..4ccf30da63 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -2,7 +2,6 @@
CONFIG_PCI=y
CONFIG_ISA_BUS=y
-include usb.mak
include hyperv.mak
CONFIG_VGA_ISA=y
CONFIG_VMWARE_VGA=y
diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
index 6d98ff94a7..338e866eaa 100644
--- a/default-configs/mips-softmmu-common.mak
+++ b/default-configs/mips-softmmu-common.mak
@@ -1,6 +1,5 @@
# Common mips*-softmmu CONFIG defines
-include usb.mak
CONFIG_ISA_BUS=y
CONFIG_PCI=y
CONFIG_ESP=y
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index c9f1446e0e..8b15d0fae1 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -1,6 +1,5 @@
# Default configuration for ppc-softmmu
-include usb.mak
CONFIG_PCI=y
CONFIG_ISA_BUS=y
diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-softmmu.mak
index d45f01bdcf..b45cd3f42e 100644
--- a/default-configs/riscv32-softmmu.mak
+++ b/default-configs/riscv32-softmmu.mak
@@ -1,6 +1,5 @@
# Default configuration for riscv-softmmu
-include usb.mak
CONFIG_PCI=y
CONFIG_SERIAL=y
CONFIG_VIRTIO_MMIO=y
diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-softmmu.mak
index d45f01bdcf..b45cd3f42e 100644
--- a/default-configs/riscv64-softmmu.mak
+++ b/default-configs/riscv64-softmmu.mak
@@ -1,6 +1,5 @@
# Default configuration for riscv-softmmu
-include usb.mak
CONFIG_PCI=y
CONFIG_SERIAL=y
CONFIG_VIRTIO_MMIO=y
diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak
index 8382504d11..f0d1a6d031 100644
--- a/default-configs/sh4-softmmu.mak
+++ b/default-configs/sh4-softmmu.mak
@@ -1,6 +1,5 @@
# Default configuration for sh4-softmmu
-include usb.mak
CONFIG_PCI=y
CONFIG_SERIAL=y
CONFIG_SERIAL_ISA=y
diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak
index a77e1538e9..58e4c6d154 100644
--- a/default-configs/sh4eb-softmmu.mak
+++ b/default-configs/sh4eb-softmmu.mak
@@ -1,6 +1,5 @@
# Default configuration for sh4eb-softmmu
-include usb.mak
CONFIG_PCI=y
CONFIG_SERIAL=y
CONFIG_SERIAL_ISA=y
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
-include usb.mak
CONFIG_PCI=y
CONFIG_M48T59=y
CONFIG_PTIMER=y
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=y
-CONFIG_USB_TABLET_WACOM=y
-CONFIG_USB_STORAGE_BOT=y
-CONFIG_USB_STORAGE_UAS=y
-CONFIG_USB_STORAGE_MTP=y
-CONFIG_SCSI=y
-CONFIG_USB_SMARTCARD=y
-CONFIG_USB_AUDIO=y
-CONFIG_USB_SERIAL=y
-CONFIG_USB_NETWORK=y
-CONFIG_USB_BLUETOOTH=y
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
config USB_OHCI
bool
default y
depends on PCI
+ select USB
config USB_EHCI
bool
default y
depends on PCI
+ select USB
config USB_EHCI_SYSBUS
bool
+ select USB
config USB_XHCI
bool
default y
depends on PCI
+ select USB
config USB_XHCI_NEC
bool
default y
depends on PCI
+ select USB
config USB_MUSB
bool
+ select USB
config TUSB6010
bool
+ select USB_MUSB
config USB_TABLET_WACOM
bool
+ default y
+ depends on USB
config USB_STORAGE_BOT
bool
+ default y
+ depends on USB
config USB_STORAGE_UAS
bool
+ default y
+ depends on USB
config USB_AUDIO
bool
+ default y
+ depends on USB
config USB_SERIAL
bool
+ default y
+ depends on USB
config USB_NETWORK
bool
+ default y
+ depends on USB
config USB_BLUETOOTH
bool
+ default y
+ depends on USB
config USB_SMARTCARD
bool
+ default y
+ depends on USB
config USB_STORAGE_MTP
bool
+ default y
+ depends on USB
--
2.17.1
next prev parent reply other threads:[~2019-01-18 11:26 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-18 11:23 [Qemu-devel] [RFC PATCH v3 00/43] Support Kconfig in QEMU Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 01/43] build: actually use CONFIG_PAM Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 02/43] hw/i386/Makefile.objs: Build pc_piix* and pc_q35 boards Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 03/43] hw/arm/Makefile.objs: CONFIG_VIRT created for virt board Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 04/43] hw/m68k/Makefile.objs: Conditionally build boards Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 05/43] hw/microblaze/Makefile.objs: Create configs for petalogix and xilinx boards Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 06/43] hw/mips/Makefile.objs: Create CONFIG_* for r4k, malta, mipssim boards Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 07/43] hw/ppc/Makefile.objs: Build all boards conditinally with CONFIG_* Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 08/43] hw/sh4/Makefile.objs: New CONFIG_* varibales created for sh4 boards and device Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 09/43] hw/sparc/Makefile.objs: CONFIG_* for sun4m and leon3 created Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 10/43] hw/lm32/Makefile.objs: Conditionally build lm32 and milkmyst Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 11/43] hw/xtensa/Makefile.objs: Build xtensa_sim and xtensa_fpga conditionally Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 12/43] hw/nios2/Makefile.objs: Conditionally build nios2 Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 13/43] hw/riscv/Makefile.objs: Create CONFIG_* for riscv boards Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 14/43] hw/sparc64/Makefile.objs: Create CONFIG_* for sparc64 Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 15/43] hw/alpha/Makefile.objs: Create CONFIG_* for alpha Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 16/43] hw/cris/Makefile.objs: Create CONFIG_* for cris Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 17/43] hw/hppa/Makefile.objs: Create CONFIG_* for hppa Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 18/43] hw/moxie/Makefile.objs: Conditionally build moxie Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 19/43] hw/openrisc/Makefile.objs: Create CONFIG_* for openrisc Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 20/43] hw/tricore/Makefile.objs: Create CONFIG_* for tricore Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 21/43] minikconfig: add parser skeleton Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 22/43] minikconfig: add AST Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 23/43] minikconfig: add semantic analysis Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 24/43] hw/display: make edid configurable Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 25/43] kconfig: introduce kconfig files Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 26/43] build: switch to Kconfig Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 27/43] ide: express dependencies with Kconfig Yang Zhong
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 28/43] hw/pci/Makefile.objs: make pcie configurable Yang Zhong
2019-01-18 16:33 ` Michael S. Tsirkin
2019-01-18 17:28 ` Paolo Bonzini
2019-01-18 19:28 ` Michael S. Tsirkin
2019-01-21 10:25 ` Paolo Bonzini
2019-01-21 11:26 ` Yang Zhong
2019-01-21 11:54 ` Paolo Bonzini
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 29/43] build: convert pci.mak to Kconfig Yang Zhong
2019-01-18 16:36 ` Michael S. Tsirkin
2019-01-18 17:03 ` Paolo Bonzini
2019-01-18 19:21 ` Michael S. Tsirkin
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 30/43] build: convert sound.mak " Yang Zhong
2019-01-18 11:23 ` Yang Zhong [this message]
2019-01-18 11:23 ` [Qemu-devel] [RFC PATCH v3 32/43] scsi: express dependencies with Kconfig Yang Zhong
2019-01-18 11:24 ` [Qemu-devel] [RFC PATCH v3 33/43] bluetooth: " Yang Zhong
2019-01-18 11:24 ` [Qemu-devel] [RFC PATCH v3 34/43] isa: express dependencies with kconfig Yang Zhong
2019-01-18 11:24 ` [Qemu-devel] [RFC PATCH v3 35/43] i386: express dependencies with Kconfig Yang Zhong
2019-01-18 11:24 ` [Qemu-devel] [RFC PATCH v3 36/43] i2c: " Yang Zhong
2019-01-18 11:24 ` [Qemu-devel] [RFC PATCH v3 37/43] ptimer: " Yang Zhong
2019-01-18 11:24 ` [Qemu-devel] [RFC PATCH v3 38/43] edid: express dependencies with kconfig Yang Zhong
2019-01-18 11:24 ` [Qemu-devel] [RFC PATCH v3 39/43] hyperv: " Yang Zhong
2019-01-18 11:24 ` [Qemu-devel] [RFC PATCH v3 40/43] virtio: make virtio dependencies with Kconfig Yang Zhong
2019-01-18 11:24 ` [Qemu-devel] [RFC PATCH v3 41/43] i386-softmmu.mak: remove all CONFIG_* except boards definitions Yang Zhong
2019-01-18 15:28 ` Paolo Bonzini
2019-01-18 15:37 ` Thomas Huth
2019-01-18 11:24 ` [Qemu-devel] [RFC PATCH v3 42/43] minikconf: implement allyesconfig, allnoconfig, randconfig, defconfig Yang Zhong
2019-01-18 11:24 ` [Qemu-devel] [RFC PATCH v3 43/43] Makefile: only support defconfig Yang Zhong
2019-01-18 16:30 ` [Qemu-devel] [RFC PATCH v3 00/43] Support Kconfig in QEMU Michael S. Tsirkin
2019-01-18 16:36 ` 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=20190118112410.3010-32-yang.zhong@intel.com \
--to=yang.zhong@intel.com \
--cc=ehabkost@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=sameo@linux.intel.com \
--cc=thuth@redhat.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.