[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH 12/25] build: convert usb.mak to Kconfig
From: |
Yang Zhong |
Subject: |
[Qemu-devel] [RFC PATCH 12/25] build: convert usb.mak to Kconfig |
Date: |
Thu, 27 Dec 2018 14:34:06 +0800 |
From: Paolo Bonzini <address@hidden>
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 <address@hidden>
Signed-off-by: Yang Zhong <address@hidden>
---
default-configs/i386-softmmu.mak | 1 -
default-configs/usb.mak | 11 -----------
hw/usb/Kconfig | 26 ++++++++++++++++++++++++++
3 files changed, 26 insertions(+), 12 deletions(-)
delete mode 100644 default-configs/usb.mak
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 275e72f3c6..e152590d15 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -2,7 +2,6 @@
CONFIG_PCI=y
CONFIG_ISA=y
-include usb.mak
include hyperv.mak
CONFIG_VGA_ISA=y
CONFIG_VGA_CIRRUS=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
- [Qemu-devel] [RFC PATCH 02/25] hw/i386/Makefile.objs: Build pc_piix* and pc_q35 boards, (continued)
- [Qemu-devel] [RFC PATCH 02/25] hw/i386/Makefile.objs: Build pc_piix* and pc_q35 boards, Yang Zhong, 2018/12/27
- [Qemu-devel] [RFC PATCH 04/25] minikconfig: add AST, Yang Zhong, 2018/12/27
- [Qemu-devel] [RFC PATCH 11/25] build: convert sound.mak to Kconfig, Yang Zhong, 2018/12/27
- [Qemu-devel] [RFC PATCH 09/25] ide: express dependencies with Kconfig, Yang Zhong, 2018/12/27
- [Qemu-devel] [RFC PATCH 03/25] minikconfig: add parser skeleton, Yang Zhong, 2018/12/27
- [Qemu-devel] [RFC PATCH 10/25] build: convert pci.mak to Kconfig, Yang Zhong, 2018/12/27
- [Qemu-devel] [RFC PATCH 07/25] kconfig: introduce kconfig files, Yang Zhong, 2018/12/27
- [Qemu-devel] [RFC PATCH 05/25] minikconfig: add semantic analysis, Yang Zhong, 2018/12/27
- [Qemu-devel] [RFC PATCH 08/25] build: switch to Kconfig, Yang Zhong, 2018/12/27
- [Qemu-devel] [RFC PATCH 06/25] hw/display: make edid configurable, Yang Zhong, 2018/12/27
- [Qemu-devel] [RFC PATCH 12/25] build: convert usb.mak to Kconfig,
Yang Zhong <=
- [Qemu-devel] [RFC PATCH 13/25] scsi: express dependencies with Kconfig, Yang Zhong, 2018/12/27
- [Qemu-devel] [RFC PATCH 16/25] i386: express dependencies with Kconfig, Yang Zhong, 2018/12/27
- [Qemu-devel] [RFC PATCH 14/25] bluetooth: express dependencies with Kconfig, Yang Zhong, 2018/12/27
- [Qemu-devel] [RFC PATCH 15/25] isa: express dependencies with kconfig, Yang Zhong, 2018/12/27
- [Qemu-devel] [RFC PATCH 17/25] i2c: express dependencies with Kconfig, Yang Zhong, 2018/12/27
- [Qemu-devel] [RFC PATCH 18/25] ptimer: express dependencies with Kconfig, Yang Zhong, 2018/12/27
- [Qemu-devel] [RFC PATCH 19/25] edid: express dependencies with kconfig, Yang Zhong, 2018/12/27
- [Qemu-devel] [RFC PATCH 20/25] hyperv: express dependencies with kconfig, Yang Zhong, 2018/12/27
- [Qemu-devel] [RFC PATCH 21/25] virtio: make virtio dependencies with Kconfig, Yang Zhong, 2018/12/27
- [Qemu-devel] [RFC PATCH 22/25] i386-softmmu.mak: remove all CONFIG_* except boards definitions, Yang Zhong, 2018/12/27