1 files changed, 20 insertions, 3 deletions

diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index 0e89c46e6..62bafd99b 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -9,13 +9,29 @@ config ADK_KERNEL_USB_SERIAL
 	boolean
 	default n
 
+config ADK_KERNEL_USB
+	boolean
+	default n
+
+config ADK_KERNEL_USB_STORAGE
+	boolean
+	default n
+
+config ADK_KERNEL_USB_EHCI_HCD
+	boolean
+	default n
+
+config ADK_KERNEL_USB_UHCI_HCD
+	boolean
+	default n
+
 config ADK_KPACKAGE_KMOD_USB
 	prompt "kmod-usb-core..................... USB support"
 	tristate
 	default y if ADK_LINUX_X86_ALIX1C
 	default y if ADK_LINUX_MIPS64_LEMOTE
 	default n
-	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20)
+	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 || ADK_KERNEL_USB)
 	select ADK_KERNEL_NLS
 	help
 	  Universal Serial Bus (USB) is a specification for a serial bus
@@ -50,7 +66,7 @@ config ADK_KPACKAGE_KMOD_USB_UHCI_HCD
 	prompt   "kmod-usb-uhci................... Support for UHCI controllers"
 	tristate
 	depends on ADK_KPACKAGE_KMOD_USB
-	depends on !ADK_LINUX_CRIS_FOXBOARD
+	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_KERNEL_USB_UHCI_HCD)
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	help
 	  The Universal Host Controller Interface is a standard by Intel for
@@ -111,7 +127,7 @@ config ADK_KPACKAGE_KMOD_USB_SL811_HCD
 config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
 	prompt   "kmod-usb-ehci................... Support for USB 2.0 controllers"
 	tristate
-	depends on !ADK_LINUX_CRIS_FOXBOARD
+	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_KERNEL_USB_EHCI_HCD)
 	default y if ADK_LINUX_X86_ALIX1C
 	default y if ADK_LINUX_MIPS64_LEMOTE
 	default n
@@ -234,6 +250,7 @@ config ADK_KPACKAGE_KMOD_USB_STORAGE
 	tristate
 	default n
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+	depends on !ADK_KERNEL_USB_STORAGE
 	select ADK_KPACKAGE_KMOD_SCSI if !ADK_KERNEL_SCSI
 	select ADK_KPACKAGE_KMOD_BLK_DEV_SD if !ADK_KERNEL_SCSI