ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: convert usb.mak to Kconfig 

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>
This commit is contained in:
Paolo Bonzini 2019-01-23 14:56:06 +08:00
parent bcb129b315
commit d6e9c470fc
14 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
default-configs/alpha-softmmu.mak
View File

@ -1,6 +1,5 @@
# Default configuration for alpha-softmmu # Default configuration for alpha-softmmu
include usb.mak
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCI_DEVICES=y CONFIG_PCI_DEVICES=y
CONFIG_SERIAL=y CONFIG_SERIAL=y

2
default-configs/arm-softmmu.mak
View File

@ -1,6 +1,5 @@
# Default configuration for arm-softmmu # Default configuration for arm-softmmu
include usb.mak
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCI_DEVICES=y CONFIG_PCI_DEVICES=y
CONFIG_VGA=y CONFIG_VGA=y
@ -38,7 +37,6 @@ CONFIG_DS1338=y
CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI01=y
CONFIG_PFLASH_CFI02=y CONFIG_PFLASH_CFI02=y
CONFIG_MICRODRIVE=y CONFIG_MICRODRIVE=y
CONFIG_USB=y
CONFIG_USB_MUSB=y CONFIG_USB_MUSB=y
CONFIG_USB_EHCI_SYSBUS=y CONFIG_USB_EHCI_SYSBUS=y
CONFIG_PLATFORM_BUS=y CONFIG_PLATFORM_BUS=y

1
default-configs/hppa-softmmu.mak
View File

@ -1,4 +1,3 @@
include usb.mak
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCI_DEVICES=y CONFIG_PCI_DEVICES=y
CONFIG_SERIAL=y CONFIG_SERIAL=y

1
default-configs/i386-softmmu.mak
View File

@ -3,7 +3,6 @@
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCI_DEVICES=y CONFIG_PCI_DEVICES=y
CONFIG_ISA_BUS=y CONFIG_ISA_BUS=y
include usb.mak
include hyperv.mak include hyperv.mak
CONFIG_TEST_DEVICES=y CONFIG_TEST_DEVICES=y
CONFIG_VGA_ISA=y CONFIG_VGA_ISA=y

1
default-configs/mips-softmmu-common.mak
View File

@ -1,6 +1,5 @@
# Common mips*-softmmu CONFIG defines # Common mips*-softmmu CONFIG defines
include usb.mak
CONFIG_ISA_BUS=y CONFIG_ISA_BUS=y
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCI_DEVICES=y CONFIG_PCI_DEVICES=y

1
default-configs/ppc-softmmu.mak
View File

@ -1,6 +1,5 @@
# Default configuration for ppc-softmmu # Default configuration for ppc-softmmu
include usb.mak
CONFIG_ISA_BUS=y CONFIG_ISA_BUS=y
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCI_DEVICES=y CONFIG_PCI_DEVICES=y

1
default-configs/riscv32-softmmu.mak
View File

@ -1,6 +1,5 @@
# Default configuration for riscv-softmmu # Default configuration for riscv-softmmu
include usb.mak
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCI_DEVICES=y CONFIG_PCI_DEVICES=y
CONFIG_SERIAL=y CONFIG_SERIAL=y

1
default-configs/riscv64-softmmu.mak
View File

@ -1,6 +1,5 @@
# Default configuration for riscv-softmmu # Default configuration for riscv-softmmu
include usb.mak
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCI_DEVICES=y CONFIG_PCI_DEVICES=y
CONFIG_SERIAL=y CONFIG_SERIAL=y

1
default-configs/sh4-softmmu.mak
View File

@ -1,6 +1,5 @@
# Default configuration for sh4-softmmu # Default configuration for sh4-softmmu
include usb.mak
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCI_DEVICES=y CONFIG_PCI_DEVICES=y
CONFIG_SERIAL=y CONFIG_SERIAL=y

1
default-configs/sh4eb-softmmu.mak
View File

@ -1,6 +1,5 @@
# Default configuration for sh4eb-softmmu # Default configuration for sh4eb-softmmu
include usb.mak
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCI_DEVICES=y CONFIG_PCI_DEVICES=y
CONFIG_SERIAL=y CONFIG_SERIAL=y

1
default-configs/sparc64-softmmu.mak
View File

@ -1,6 +1,5 @@
# Default configuration for sparc64-softmmu # Default configuration for sparc64-softmmu
include usb.mak
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCI_DEVICES=y CONFIG_PCI_DEVICES=y
CONFIG_M48T59=y CONFIG_M48T59=y

11
default-configs/usb.mak
View File

@ -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

26
hw/usb/Kconfig
View File

@ -5,59 +5,85 @@ config USB_UHCI
bool bool
default y if PCI_DEVICES default y if PCI_DEVICES
depends on PCI depends on PCI
select USB
config USB_OHCI config USB_OHCI
bool bool
default y if PCI_DEVICES default y if PCI_DEVICES
depends on PCI depends on PCI
select USB
config USB_EHCI config USB_EHCI
bool bool
default y if PCI_DEVICES default y if PCI_DEVICES
depends on PCI depends on PCI
select USB
config USB_EHCI_SYSBUS config USB_EHCI_SYSBUS
bool bool
select USB
config USB_XHCI config USB_XHCI
bool bool
default y if PCI_DEVICES default y if PCI_DEVICES
depends on PCI depends on PCI
select USB
config USB_XHCI_NEC config USB_XHCI_NEC
bool bool
default y if PCI_DEVICES default y if PCI_DEVICES
depends on PCI depends on PCI
select USB
config USB_MUSB config USB_MUSB
bool bool
select USB
config TUSB6010 config TUSB6010
bool bool
select USB_MUSB
config USB_TABLET_WACOM config USB_TABLET_WACOM
bool bool
default y
depends on USB
config USB_STORAGE_BOT config USB_STORAGE_BOT
bool bool
default y
depends on USB
config USB_STORAGE_UAS config USB_STORAGE_UAS
bool bool
default y
depends on USB
config USB_AUDIO config USB_AUDIO
bool bool
default y
depends on USB
config USB_SERIAL config USB_SERIAL
bool bool
default y
depends on USB
config USB_NETWORK config USB_NETWORK
bool bool
default y
depends on USB
config USB_BLUETOOTH config USB_BLUETOOTH
bool bool
default y
depends on USB
config USB_SMARTCARD config USB_SMARTCARD
bool bool
default y
depends on USB
config USB_STORAGE_MTP config USB_STORAGE_MTP
bool bool
default y
depends on USB

2
hw/usb/Makefile.objs
View File

@ -6,7 +6,7 @@ common-obj-$(CONFIG_USB) += desc.o desc-msos.o
common-obj-$(CONFIG_USB_UHCI) += hcd-uhci.o common-obj-$(CONFIG_USB_UHCI) += hcd-uhci.o
common-obj-$(CONFIG_USB_OHCI) += hcd-ohci.o common-obj-$(CONFIG_USB_OHCI) += hcd-ohci.o
common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o hcd-ehci-pci.o common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o hcd-ehci-pci.o
common-obj-$(CONFIG_USB_EHCI_SYSBUS) += hcd-ehci-sysbus.o common-obj-$(CONFIG_USB_EHCI_SYSBUS) += hcd-ehci.o hcd-ehci-sysbus.o
common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o
common-obj-$(CONFIG_USB_XHCI_NEC) += hcd-xhci-nec.o common-obj-$(CONFIG_USB_XHCI_NEC) += hcd-xhci-nec.o
common-obj-$(CONFIG_USB_MUSB) += hcd-musb.o common-obj-$(CONFIG_USB_MUSB) += hcd-musb.o