diff --git a/configs/fire-stm32v2/nsh/defconfig b/configs/fire-stm32v2/nsh/defconfig
index efdf4fd26e8..7bd136dcdfd 100644
--- a/configs/fire-stm32v2/nsh/defconfig
+++ b/configs/fire-stm32v2/nsh/defconfig
@@ -564,6 +564,7 @@ CONFIG_ARCH_BOARD_FIRE_STM32V2=y
 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/hymini-stm32v/nsh2/defconfig b/configs/hymini-stm32v/nsh2/defconfig
index 6e57e1be0d6..34d9367ca23 100644
--- a/configs/hymini-stm32v/nsh2/defconfig
+++ b/configs/hymini-stm32v/nsh2/defconfig
@@ -544,6 +544,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=y
 # CONFIG_BOARDCTL_ADCTEST is not set
 # CONFIG_BOARDCTL_PWMTEST is not set
diff --git a/configs/hymini-stm32v/usbmsc/defconfig b/configs/hymini-stm32v/usbmsc/defconfig
index 2f4cf5be508..8ce22825cee 100644
--- a/configs/hymini-stm32v/usbmsc/defconfig
+++ b/configs/hymini-stm32v/usbmsc/defconfig
@@ -523,7 +523,8 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 #
 # Board-Specific Options
 #
-# CONFIG_LIB_BOARDCTL is not set
+CONFIG_LIB_BOARDCTL=y
+CONFIG_BOARDCTL_USBDEVCTRL=y
 
 #
 # RTOS Features
diff --git a/configs/lpcxpresso-lpc1768/usbmsc/defconfig b/configs/lpcxpresso-lpc1768/usbmsc/defconfig
index b8dd3fc5156..2e8ced67490 100644
--- a/configs/lpcxpresso-lpc1768/usbmsc/defconfig
+++ b/configs/lpcxpresso-lpc1768/usbmsc/defconfig
@@ -286,7 +286,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/mcu123-lpc214x/usbmsc/defconfig b/configs/mcu123-lpc214x/usbmsc/defconfig
index 2287c156f0f..490c6e77e42 100644
--- a/configs/mcu123-lpc214x/usbmsc/defconfig
+++ b/configs/mcu123-lpc214x/usbmsc/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/nucleus2g/usbmsc/defconfig b/configs/nucleus2g/usbmsc/defconfig
index 700033d0547..81ef3f8e27e 100644
--- a/configs/nucleus2g/usbmsc/defconfig
+++ b/configs/nucleus2g/usbmsc/defconfig
@@ -275,7 +275,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/olimex-lpc1766stk/usbmsc/defconfig b/configs/olimex-lpc1766stk/usbmsc/defconfig
index 43909cc2f46..e7eb5cc8881 100644
--- a/configs/olimex-lpc1766stk/usbmsc/defconfig
+++ b/configs/olimex-lpc1766stk/usbmsc/defconfig
@@ -287,7 +287,8 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 #
 # Board-Specific Options
 #
-# CONFIG_LIB_BOARDCTL is not set
+CONFIG_LIB_BOARDCTL=y
+CONFIG_BOARDCTL_USBDEVCTRL=y
 
 #
 # RTOS Features
diff --git a/configs/pic32mx7mmb/nsh/defconfig b/configs/pic32mx7mmb/nsh/defconfig
index 1550cae8c9c..c1c9d893eee 100644
--- a/configs/pic32mx7mmb/nsh/defconfig
+++ b/configs/pic32mx7mmb/nsh/defconfig
@@ -350,6 +350,7 @@ CONFIG_NSH_MMCSDSPIPORTNO=1
 #
 CONFIG_LIB_BOARDCTL=y
 # 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/sama5d3x-ek/demo/defconfig b/configs/sama5d3x-ek/demo/defconfig
index 5ef90b33422..76fc974b610 100644
--- a/configs/sama5d3x-ek/demo/defconfig
+++ b/configs/sama5d3x-ek/demo/defconfig
@@ -426,6 +426,7 @@ CONFIG_SAMA5D3xEK_USBHOST_PRIO=100
 # CONFIG_SAMA5D3xEK_SLOWCLOCK is not set
 CONFIG_LIB_BOARDCTL=y
 # 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/usbmsc/defconfig b/configs/spark/usbmsc/defconfig
index 7288f66f167..338b2eb40a0 100644
--- a/configs/spark/usbmsc/defconfig
+++ b/configs/spark/usbmsc/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/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig
index 893275dfc6d..02c9c3db2f6 100644
--- a/configs/stm3210e-eval/nsh2/defconfig
+++ b/configs/stm3210e-eval/nsh2/defconfig
@@ -557,6 +557,7 @@ CONFIG_STM3210E_R61580_DISABLE=y
 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/usbmsc/defconfig b/configs/stm3210e-eval/usbmsc/defconfig
index dd2232dd9ba..c3aa35d640b 100644
--- a/configs/stm3210e-eval/usbmsc/defconfig
+++ b/configs/stm3210e-eval/usbmsc/defconfig
@@ -528,7 +528,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
diff --git a/configs/teensy-2.0/usbmsc/defconfig b/configs/teensy-2.0/usbmsc/defconfig
index 2608a76e8d8..da139bd8c09 100644
--- a/configs/teensy-2.0/usbmsc/defconfig
+++ b/configs/teensy-2.0/usbmsc/defconfig
@@ -171,7 +171,8 @@ CONFIG_ARCH_LEDS=y
 #
 # Board-Specific Options
 #
-# CONFIG_LIB_BOARDCTL is not set
+CONFIG_LIB_BOARDCTL=y
+CONFIG_BOARDCTL_USBDEVCTRL=y
 
 #
 # RTOS Features