diff --git a/configs/spark/src/Makefile b/configs/spark/src/Makefile
index 7c4bcfb4aa..5a375120db 100644
--- a/configs/spark/src/Makefile
+++ b/configs/spark/src/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/spark/src/Makefile
 #
-#   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2013, 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #           Librae <librae8226@gmail.com>
 #
@@ -57,6 +57,10 @@ ifeq ($(CONFIG_USBDEV),y)
 CSRCS += stm32_usbdev.c
 endif
 
+ifeq ($(CONFIG_BOARDCTL_USBDEVCTRL),y)
+CSRCS += stm32_usbmsc.c
+endif
+
 ifeq ($(CONFIG_USBDEV_COMPOSITE),y)
 CSRCS += stm32_composite.c
 endif
diff --git a/configs/spark/src/stm32_appinit.c b/configs/spark/src/stm32_appinit.c
index 64b253fd09..529afacf1e 100644
--- a/configs/spark/src/stm32_appinit.c
+++ b/configs/spark/src/stm32_appinit.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * config/spark/src/stm32_appinit.c
  *
- *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *           David_s5 <david_s5@nscdg.com>
  *
@@ -299,19 +299,4 @@ int board_app_initialize(void)
   g_app_initialzed = true;
   return OK;
 }
-
-/****************************************************************************
- * Name: board_usbmsc_initialize
- *
- * Description:
- *   Perform architecture specific initialization as needed to establish
- *   the mass storage device that will be exported by the USB MSC device.
- *
- ****************************************************************************/
-
-#ifdef CONFIG_BOARDCTL_USBDEVCTRL
-int board_usbmsc_initialize(int port)
-{
-  return board_app_initialize();
-}
-#endif
\ No newline at end of file
+xxx
\ No newline at end of file
diff --git a/configs/spark/src/stm32_usbmsc.c b/configs/spark/src/stm32_usbmsc.c
new file mode 100644
index 0000000000..71140e125e
--- /dev/null
+++ b/configs/spark/src/stm32_usbmsc.c
@@ -0,0 +1,69 @@
+/****************************************************************************
+ * configs/spark/src/stm32_usbmsc.c
+ *
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/types.h>
+
+#include "nuttx/board.h"
+
+#include "spark.h"
+
+#if defined(CONFIG_USBMSC) && !defined(CONFIG_USBMSC_COMPOSITE) && \
+    defined(CONFIG_BOARDCTL_USBDEVCTRL)
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: board_usbmsc_initialize
+ *
+ * Description:
+ *   Perform architecture specific initialization as needed to establish
+ *   the mass storage device that will be exported by the USB MSC device.
+ *
+ ****************************************************************************/
+
+int board_usbmsc_initialize(int port)
+{
+  return board_app_initialize();
+}
+
+#endif /* CONFIG_USBMSC && !CONFIG_USBMSC_COMPOSITE && CONFIG_BOARDCTL_USBDEVCTRL */