From 0943afd2f90eff8d7a327394ea85e6f5e6826ff5 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 26 Mar 2016 07:13:57 -0600 Subject: [PATCH] Kconfig files: All USB-related options depend on CONFIG_LIB_BOARDCTRL and now set CONFIG_BOARDCTL_USBDEVCTL=y --- examples/usbserial/Kconfig | 2 ++ nshlib/Kconfig | 3 ++- system/cdcacm/Kconfig | 3 ++- system/composite/Kconfig | 3 ++- system/usbmsc/Kconfig | 3 ++- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/examples/usbserial/Kconfig b/examples/usbserial/Kconfig index 0ceea5d75..5133678ac 100644 --- a/examples/usbserial/Kconfig +++ b/examples/usbserial/Kconfig @@ -6,6 +6,8 @@ config EXAMPLES_USBSERIAL bool "USB serial test example" default n + depends on LIB_BOARDCTL + select BOARDCTL_USBDEVCTRL ---help--- Enable the USB serial test example diff --git a/nshlib/Kconfig b/nshlib/Kconfig index a843c5f72..81c14f173 100644 --- a/nshlib/Kconfig +++ b/nshlib/Kconfig @@ -767,7 +767,8 @@ config NSH_CONSOLE config NSH_USBCONSOLE bool "Use a USB serial console" default n - depends on NSH_CONSOLE && USBDEV && (CDCACM || PL2303) + depends on LIB_BOARDCTL && NSH_CONSOLE && USBDEV && (CDCACM || PL2303) + select BOARDCTL_USBDEVCTRL ---help--- If defined, then the an arbitrary USB serial device may be used to as the NSH console. In this case, NSH_USBCONDEV must be defined diff --git a/system/cdcacm/Kconfig b/system/cdcacm/Kconfig index 0f67f86be..4fb293772 100644 --- a/system/cdcacm/Kconfig +++ b/system/cdcacm/Kconfig @@ -6,7 +6,8 @@ menuconfig SYSTEM_CDCACM bool "USB CDC/ACM Device Commands" default n - depends on CDCACM && !KERNEL_BUILD + depends on LIB_BOARDCTL && CDCACM + select BOARDCTL_USBDEVCTRL ---help--- Enable the USB CDC/ACM class controls. These controls include: diff --git a/system/composite/Kconfig b/system/composite/Kconfig index 8fec3f356..a787f0934 100644 --- a/system/composite/Kconfig +++ b/system/composite/Kconfig @@ -6,7 +6,8 @@ menuconfig SYSTEM_COMPOSITE bool "USB Composite Device Commands" default n - depends on USBDEV_COMPOSITE && !KERNEL_BUILD + depends on LIB_BOARDCTL && USBDEV_COMPOSITE && !KERNEL_BUILD + select BOARDCTL_USBDEVCTRL ---help--- Enable the USB composite class controls. These controls include: diff --git a/system/usbmsc/Kconfig b/system/usbmsc/Kconfig index 9ab522f6f..1bfe307e8 100644 --- a/system/usbmsc/Kconfig +++ b/system/usbmsc/Kconfig @@ -6,7 +6,8 @@ menuconfig SYSTEM_USBMSC bool "USB Mass Storage Device Commands" default n - depends on USBMSC && !KERNEL_BUILD + depends on LIB_BOARDCTL && USBMSC && !KERNEL_BUILD + select BOARDCTL_USBDEVCTRL ---help--- Enable the USB mass storage class controls. These controls include: