From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: yang.zhong@intel.com, thuth@redhat.com
Subject: [Qemu-devel] [PATCH 39/52] build: convert usb.mak to Kconfig
Date: Fri, 25 Jan 2019 11:06:58 +0100 [thread overview]
Message-ID: <1548410831-19553-40-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1548410831-19553-1-git-send-email-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>
Message-Id: <20190123065618.3520-33-yang.zhong@intel.com>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@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 a7b4a87..f44c5bc 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_PCI_DEVICES=y
CONFIG_SERIAL=y
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 0109e68..07d0a62 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_PCI_DEVICES=y
CONFIG_VGA=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 1594760..d30b12a 100644
--- a/default-configs/hppa-softmmu.mak
+++ b/default-configs/hppa-softmmu.mak
@@ -1,4 +1,3 @@
-include usb.mak
CONFIG_PCI=y
CONFIG_PCI_DEVICES=y
CONFIG_SERIAL=y
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 9eb9351..4073c62 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -3,7 +3,6 @@
CONFIG_PCI=y
CONFIG_PCI_DEVICES=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 981ea2c..e5f0841 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_PCI_DEVICES=y
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index dba071a..c60a483 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_PCI_DEVICES=y
CONFIG_ISA_BUS=y
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
-include usb.mak
CONFIG_PCI=y
CONFIG_PCI_DEVICES=y
CONFIG_SERIAL=y
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
-include usb.mak
CONFIG_PCI=y
CONFIG_PCI_DEVICES=y
CONFIG_SERIAL=y
diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak
index 0459d43..7446fc8 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_PCI_DEVICES=y
CONFIG_SERIAL=y
diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak
index 09a5b5e..e37a532 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_PCI_DEVICES=y
CONFIG_SERIAL=y
diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak
index d5e4a73..4a6e997 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_PCI_DEVICES=y
CONFIG_M48T59=y
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=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 86ee615..e20670a 100644
--- a/hw/usb/Kconfig
+++ b/hw/usb/Kconfig
@@ -5,59 +5,85 @@ config USB_UHCI
bool
default y if PCI_DEVICES
depends on PCI
+ select USB
config USB_OHCI
bool
default y if PCI_DEVICES
depends on PCI
+ select USB
config USB_EHCI
bool
default y if PCI_DEVICES
depends on PCI
+ select USB
config USB_EHCI_SYSBUS
bool
+ select USB
config USB_XHCI
bool
default y if PCI_DEVICES
depends on PCI
+ select USB
config USB_XHCI_NEC
bool
default y if PCI_DEVICES
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
--
1.8.3.1
next prev parent reply other threads:[~2019-01-25 10:08 UTC|newest]
Thread overview: 119+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-25 10:06 [Qemu-devel] [RFC PATCH v5 00/52] Support Kconfig in QEMU Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 01/52] arm: disable CONFIG_SERIAL_ISA Paolo Bonzini
2019-01-25 14:49 ` Thomas Huth
2019-01-25 15:21 ` Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 02/52] ide: split ioport registration to a separate file Paolo Bonzini
2019-01-25 14:53 ` Thomas Huth
2019-01-25 15:22 ` Paolo Bonzini
2019-01-30 12:07 ` Thomas Huth
2019-01-30 12:20 ` Paolo Bonzini
2019-01-30 12:55 ` Yang Zhong
2019-01-30 15:55 ` BALATON Zoltan
2019-01-25 10:06 ` [Qemu-devel] [PATCH 03/52] vfio: move conditional up to hw/Makefile.objs Paolo Bonzini
2019-01-25 15:04 ` Thomas Huth
2019-01-25 10:06 ` [Qemu-devel] [PATCH 04/52] hw/pci-host/Makefile.objs: make CONFIGS clear for PCI EXPRESS Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 05/52] build: actually use CONFIG_PAM Paolo Bonzini
2019-01-31 21:50 ` Philippe Mathieu-Daudé
2019-01-25 10:06 ` [Qemu-devel] [PATCH 06/52] hw/i386/Makefile.objs: Build pc_piix* and pc_q35 boards Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 07/52] hw/arm/Makefile.objs: CONFIG_VIRT created for virt board Paolo Bonzini
2019-01-25 15:06 ` Thomas Huth
2019-01-25 15:23 ` Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 08/52] hw/m68k/Makefile.objs: Conditionally build boards Paolo Bonzini
2019-01-25 15:08 ` Thomas Huth
2019-01-25 10:06 ` [Qemu-devel] [PATCH 09/52] hw/microblaze/Makefile.objs: Create configs for petalogix and xilinx boards Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 10/52] hw/mips/Makefile.objs: Create CONFIG_* for r4k, malta, mipssim boards Paolo Bonzini
2019-01-31 21:50 ` Philippe Mathieu-Daudé
2019-01-25 10:06 ` [Qemu-devel] [PATCH 11/52] hw/ppc/Makefile.objs: Build all boards conditinally with CONFIG_* Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 12/52] hw/sh4/Makefile.objs: New CONFIG_* varibales created for sh4 boards and device Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 13/52] hw/s390/Makefile.objs: Create new CONFIG_* variables for s390x boards and devices Paolo Bonzini
2019-01-25 15:17 ` Thomas Huth
2019-01-25 15:23 ` Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 14/52] hw/sparc/Makefile.objs: CONFIG_* for sun4m and leon3 created Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 15/52] hw/lm32/Makefile.objs: Conditionally build lm32 and milkmyst Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 16/52] hw/xtensa/Makefile.objs: Build xtensa_sim and xtensa_fpga conditionally Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 17/52] hw/nios2/Makefile.objs: Conditionally build nios2 Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 18/52] hw/riscv/Makefile.objs: Create CONFIG_* for riscv boards Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 19/52] hw/sparc64/Makefile.objs: Create CONFIG_* for sparc64 Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 20/52] hw/alpha/Makefile.objs: Create CONFIG_* for alpha Paolo Bonzini
2019-01-25 15:29 ` Thomas Huth
2019-01-25 20:04 ` Richard Henderson
2019-01-25 10:06 ` [Qemu-devel] [PATCH 21/52] hw/cris/Makefile.objs: Create CONFIG_* for cris Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 22/52] hw/hppa/Makefile.objs: Create CONFIG_* for hppa Paolo Bonzini
2019-01-25 20:05 ` Richard Henderson
2019-01-25 10:06 ` [Qemu-devel] [PATCH 23/52] hw/moxie/Makefile.objs: Conditionally build moxie Paolo Bonzini
2019-01-25 15:33 ` Thomas Huth
2019-01-25 10:06 ` [Qemu-devel] [PATCH 24/52] hw/openrisc/Makefile.objs: Create CONFIG_* for openrisc Paolo Bonzini
2019-01-25 15:35 ` Thomas Huth
2019-01-25 17:33 ` Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 25/52] hw/tricore/Makefile.objs: Create CONFIG_* for tricore Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 26/52] hw/i2c/Makefile.objs: Create new CONFIG_* variables for EEPROM and ACPI controller Paolo Bonzini
2019-01-25 15:42 ` Thomas Huth
2019-01-25 10:06 ` [Qemu-devel] [PATCH 27/52] hw/vfio/Makefile.objs: Create new CONFIG_* variables for VFIO core and PCI Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 28/52] minikconfig: add parser skeleton Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 29/52] minikconfig: add AST Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 30/52] minikconfig: add semantic analysis Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 31/52] hw/display: make edid configurable Paolo Bonzini
2019-01-31 21:53 ` Philippe Mathieu-Daudé
2019-01-25 10:06 ` [Qemu-devel] [PATCH 32/52] kconfig: introduce kconfig files Paolo Bonzini
2019-01-31 13:21 ` Thomas Huth
2019-01-31 13:37 ` Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 33/52] build: switch to Kconfig Paolo Bonzini
2019-01-31 21:48 ` Philippe Mathieu-Daudé
2019-01-31 22:15 ` Paolo Bonzini
2019-02-01 14:56 ` Philippe Mathieu-Daudé
2019-02-01 21:24 ` Paolo Bonzini
2019-02-04 12:58 ` Paolo Bonzini
2019-02-04 15:45 ` Anthony PERARD
2019-02-04 19:04 ` Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 34/52] minikconf: implement allnoconfig and defconfig Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 35/52] ide: express dependencies with Kconfig Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 36/52] hw/pci/Makefile.objs: make pcie configurable Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 37/52] build: convert pci.mak to Kconfig Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 38/52] build: convert sound.mak " Paolo Bonzini
2019-01-25 10:06 ` Paolo Bonzini [this message]
2019-01-25 10:06 ` [Qemu-devel] [PATCH 40/52] scsi: express dependencies with Kconfig Paolo Bonzini
2019-01-31 21:23 ` Philippe Mathieu-Daudé
2019-01-31 22:11 ` Paolo Bonzini
2019-01-25 10:07 ` [Qemu-devel] [PATCH 41/52] isa: express dependencies with kconfig Paolo Bonzini
2019-01-30 10:53 ` Thomas Huth
2019-01-30 11:13 ` Paolo Bonzini
2019-01-30 11:32 ` Thomas Huth
2019-01-30 11:43 ` Paolo Bonzini
2019-01-30 11:58 ` Thomas Huth
2019-01-30 12:00 ` Yang Zhong
2019-01-31 21:22 ` Philippe Mathieu-Daudé
2019-01-31 22:14 ` Paolo Bonzini
2019-01-31 22:24 ` Philippe Mathieu-Daudé
2019-02-14 16:46 ` Paolo Bonzini
2019-01-25 10:07 ` [Qemu-devel] [PATCH 42/52] i386: express dependencies with Kconfig Paolo Bonzini
2019-01-28 14:21 ` Thomas Huth
2019-02-01 15:05 ` Philippe Mathieu-Daudé
2019-02-01 20:58 ` Paolo Bonzini
2019-02-14 16:47 ` Paolo Bonzini
2019-02-14 16:54 ` Michael S. Tsirkin
2019-02-14 17:02 ` Paolo Bonzini
2019-01-25 10:07 ` [Qemu-devel] [PATCH 43/52] i2c: " Paolo Bonzini
2019-01-31 22:10 ` Philippe Mathieu-Daudé
2019-01-31 22:21 ` Paolo Bonzini
2019-01-25 10:07 ` [Qemu-devel] [PATCH 44/52] ptimer: " Paolo Bonzini
2019-01-25 10:07 ` [Qemu-devel] [PATCH 45/52] display: express dependencies with kconfig Paolo Bonzini
2019-01-25 10:07 ` [Qemu-devel] [PATCH 46/52] hyperv: " Paolo Bonzini
2019-01-25 10:07 ` [Qemu-devel] [PATCH 47/52] vfio: express vfio dependencies with Kconfig Paolo Bonzini
2019-01-25 20:00 ` Alex Williamson
2019-01-28 10:54 ` Paolo Bonzini
2019-01-25 10:07 ` [Qemu-devel] [PATCH 48/52] virtio: express virtio " Paolo Bonzini
2019-01-25 10:07 ` [Qemu-devel] [PATCH 49/52] tpm: express " Paolo Bonzini
2019-01-25 10:07 ` [Qemu-devel] [PATCH 50/52] isa: express SuperIO " Paolo Bonzini
2019-01-31 21:26 ` Philippe Mathieu-Daudé
2019-01-25 10:07 ` [Qemu-devel] [PATCH 51/52] i386-softmmu.mak: remove all CONFIG_* except boards definitions Paolo Bonzini
2019-01-25 10:07 ` [Qemu-devel] [PATCH 52/52] kconfig: introduce CONFIG_TEST_DEVICES Paolo Bonzini
2019-01-25 11:07 ` [Qemu-devel] [RFC PATCH v5 00/52] Support Kconfig in QEMU Yang Zhong
2019-01-31 17:56 ` no-reply
2019-01-31 21:57 ` no-reply
2019-01-31 21:58 ` no-reply
2019-01-31 22:01 ` no-reply
2019-01-31 22:22 ` no-reply
2019-01-31 22:22 ` no-reply
2019-01-31 22:26 ` no-reply
2019-02-01 10:41 ` Philippe Mathieu-Daudé
2019-02-03 12:01 ` no-reply
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=1548410831-19553-40-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=yang.zhong@intel.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.