From 8ffd9f4dd41f0423f0df8bef8f2e25ab4bb1a3f3 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Tue, 17 Mar 2015 14:52:54 +0100 Subject: hw/usb: Include USB files only if necessary Boards that do not include an USB controller should not provide USB devices. However, when running "qemu-system-s390x -device help" for example, there's still a usb-hub, usb-kbd, usb-mouse and usb-tablet in the list of "supported" devices. Let's fix that by compiling and linking the USB files only if it is really necessary. Signed-off-by: Thomas Huth Signed-off-by: Gerd Hoffmann --- default-configs/arm-softmmu.mak | 1 + default-configs/usb.mak | 1 + 2 files changed, 2 insertions(+) (limited to 'default-configs') diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 87d4e34d15..a767e4b708 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -32,6 +32,7 @@ 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/usb.mak b/default-configs/usb.mak index 73d84895aa..f4b85684f0 100644 --- a/default-configs/usb.mak +++ b/default-configs/usb.mak @@ -1,3 +1,4 @@ +CONFIG_USB=y CONFIG_USB_TABLET_WACOM=y CONFIG_USB_STORAGE_BOT=y CONFIG_USB_STORAGE_UAS=y -- cgit v1.2.3-55-g7522