diff --git a/examples/usbserial/usbserial_main.c b/examples/usbserial/usbserial_main.c
index 88a44dd71..989b9c5c5 100644
--- a/examples/usbserial/usbserial_main.c
+++ b/examples/usbserial/usbserial_main.c
@@ -197,10 +197,8 @@ int main(int argc, FAR char *argv[])
 int usbserial_main(int argc, char *argv[])
 #endif
 {
-#ifdef CONFIG_CDCACM
   struct boardioc_usbdev_ctrl_s ctrl;
   FAR void *handle;
-#endif
 #ifndef CONFIG_EXAMPLES_USBSERIAL_INONLY
   int infd;
 #endif
@@ -227,15 +225,16 @@ int usbserial_main(int argc, char *argv[])
   ctrl.instance = 0;
   ctrl.handle   = &handle;
 
-  ret = boardctl(BOARDIOC_USBDEV_CONTROL, (uintptr_t)&ctrl);
-
 #else
-# warning REVISIT: This violates the OS/application interface
 
-  ret = usbdev_serialinitialize(0);
+  ctrl.usbdev   = BOARDIOC_USBDEV_PL2303;
+  ctrl.action   = BOARDIOC_USBDEV_CONNECT;
+  ctrl.instance = 0;
+  ctrl.handle   = &handle;
 
 #endif
 
+  ret = boardctl(BOARDIOC_USBDEV_CONTROL, (uintptr_t)&ctrl);
   if (ret < 0)
     {
       printf("usbserial_main: ERROR: Failed to create the USB serial device: %d\n",
diff --git a/examples/usbterm/usbterm_main.c b/examples/usbterm/usbterm_main.c
index 173d29235..12a3dcee6 100644
--- a/examples/usbterm/usbterm_main.c
+++ b/examples/usbterm/usbterm_main.c
@@ -183,10 +183,8 @@ int main(int argc, FAR char *argv[])
 int usbterm_main(int argc, char *argv[])
 #endif
 {
-#ifdef CONFIG_CDCACM
   struct boardioc_usbdev_ctrl_s ctrl;
   FAR void *handle;
-#endif
   pthread_attr_t attr;
   int ret;
 
@@ -219,20 +217,22 @@ int usbterm_main(int argc, char *argv[])
   ctrl.instance = 0;
   ctrl.handle   = &handle;
 
-  ret = boardctl(BOARDIOC_USBDEV_CONTROL, (uintptr_t)&ctrl);
-
 #else
-# warning REVISIT: This violates the OS/application interface
 
-  ret = usbdev_serialinitialize(0);
+  ctrl.usbdev   = BOARDIOC_USBDEV_PL2303;
+  ctrl.action   = BOARDIOC_USBDEV_CONNECT;
+  ctrl.instance = 0;
+  ctrl.handle   = &handle;
 
 #endif
 
+  ret = boardctl(BOARDIOC_USBDEV_CONTROL, (uintptr_t)&ctrl);
   if (ret < 0)
     {
       printf("usbterm_main: ERROR: Failed to create the USB serial device: %d\n", -ret);
       goto errout_with_devinit;
     }
+
   printf("usbterm_main: Successfully registered the serial driver\n");
 
 #if defined(CONFIG_USBDEV_TRACE) && CONFIG_USBDEV_TRACE_INITIALIDSET != 0
diff --git a/nshlib/nsh_usbconsole.c b/nshlib/nsh_usbconsole.c
index 79289d858..e766ead9b 100644
--- a/nshlib/nsh_usbconsole.c
+++ b/nshlib/nsh_usbconsole.c
@@ -269,10 +269,8 @@ restart:
 int nsh_consolemain(int argc, char *argv[])
 {
   FAR struct console_stdio_s *pstate = nsh_newconsole();
-#ifdef CONFIG_CDCACM
   struct boardioc_usbdev_ctrl_s ctrl;
   FAR void *handle;
-#endif
   int ret;
 
   DEBUGASSERT(pstate);
@@ -290,18 +288,19 @@ int nsh_consolemain(int argc, char *argv[])
 
   ctrl.usbdev   = BOARDIOC_USBDEV_CDCACM;
   ctrl.action   = BOARDIOC_USBDEV_CONNECT;
-  ctrl.instance = 0;
+  ctrl.instance = CONFIG_NSH_USBDEV_MINOR;
   ctrl.handle   = &handle;
 
-  ret = boardctl(BOARDIOC_USBDEV_CONTROL, (uintptr_t)&ctrl);
-
 #else
-# warning REVISIT: This violates the OS/application interface
 
-  ret = usbdev_serialinitialize(CONFIG_NSH_USBDEV_MINOR);
+  ctrl.usbdev   = BOARDIOC_USBDEV_PL2303;
+  ctrl.action   = BOARDIOC_USBDEV_CONNECT;
+  ctrl.instance = CONFIG_NSH_USBDEV_MINOR;
+  ctrl.handle   = &handle;
 
 #endif
 
+  ret = boardctl(BOARDIOC_USBDEV_CONTROL, (uintptr_t)&ctrl);
   UNUSED(ret); /* Eliminate warning if not used */
   DEBUGASSERT(ret == OK);
 #endif