From 426ff59f8009bcfe7186d7b509b6c8f66ca89c2a Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 25 Mar 2016 11:32:26 -0600 Subject: [PATCH] All configurations that set CONFIG_SYSTEM_COMPOSITE must also select CONFIG_LIB_BOARDCTL and CONFIG_BOARDCTL_USBDEVCTL --- configs/mcu123-lpc214x/composite/defconfig | 3 ++- configs/olimexino-stm32/composite/defconfig | 1 + configs/spark/composite/defconfig | 1 + configs/stm3210e-eval/composite/defconfig | 3 ++- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configs/mcu123-lpc214x/composite/defconfig b/configs/mcu123-lpc214x/composite/defconfig index f066cd678f..9386d2f32b 100644 --- a/configs/mcu123-lpc214x/composite/defconfig +++ b/configs/mcu123-lpc214x/composite/defconfig @@ -225,7 +225,8 @@ CONFIG_ARCH_LEDS=y # # Board-Specific Options # -# CONFIG_LIB_BOARDCTL is not set +CONFIG_LIB_BOARDCTL=y +CONFIG_BOARDCTL_USBDEVCTRL=y # # RTOS Features diff --git a/configs/olimexino-stm32/composite/defconfig b/configs/olimexino-stm32/composite/defconfig index c3fff0d6f5..acc0e37f28 100644 --- a/configs/olimexino-stm32/composite/defconfig +++ b/configs/olimexino-stm32/composite/defconfig @@ -559,6 +559,7 @@ CONFIG_NSH_MMCSDSPIPORTNO=0 CONFIG_LIB_BOARDCTL=y # CONFIG_BOARDCTL_RESET is not set # CONFIG_BOARDCTL_UNIQUEID is not set +CONFIG_BOARDCTL_USBDEVCTRL=y # CONFIG_BOARDCTL_TSCTEST is not set # CONFIG_BOARDCTL_ADCTEST is not set # CONFIG_BOARDCTL_PWMTEST is not set diff --git a/configs/spark/composite/defconfig b/configs/spark/composite/defconfig index 112f95e933..0d5207bd3d 100644 --- a/configs/spark/composite/defconfig +++ b/configs/spark/composite/defconfig @@ -528,6 +528,7 @@ CONFIG_SPARK_FLASH_MINOR=0 CONFIG_LIB_BOARDCTL=y # CONFIG_BOARDCTL_RESET is not set # CONFIG_BOARDCTL_UNIQUEID is not set +CONFIG_BOARDCTL_USBDEVCTRL=y # CONFIG_BOARDCTL_TSCTEST is not set # CONFIG_BOARDCTL_ADCTEST is not set # CONFIG_BOARDCTL_PWMTEST is not set diff --git a/configs/stm3210e-eval/composite/defconfig b/configs/stm3210e-eval/composite/defconfig index c50a245a28..76bf2ecdc3 100644 --- a/configs/stm3210e-eval/composite/defconfig +++ b/configs/stm3210e-eval/composite/defconfig @@ -535,7 +535,8 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y # STM3210E-EVAL LCD Hardware Configuration # # CONFIG_STM3210E_LCD is not set -# CONFIG_LIB_BOARDCTL is not set +CONFIG_LIB_BOARDCTL=y +CONFIG_BOARDCTL_USBDEVCTRL=y # # RTOS Features