Rename examples/usbstorage to examples/usbmsc. From CCTSAO

author: Gregory Nutt <gnutt@nuttx.org> 2013-09-05 08:07:03 -0600
committer: Gregory Nutt <gnutt@nuttx.org> 2013-09-05 08:07:03 -0600
commit: 39b2be1e80f5e15b431456a7ab18ab2edf05a3a1 (patch)
tree: fd7939068ef642b851d41a52ed2653ca71fe7a3d /nuttx
parent: 63490f1443d979623b3cf06232e34413506dfc94 (diff)
download: nuttx-39b2be1e80f5e15b431456a7ab18ab2edf05a3a1.tar.gz
nuttx-39b2be1e80f5e15b431456a7ab18ab2edf05a3a1.tar.bz2
nuttx-39b2be1e80f5e15b431456a7ab18ab2edf05a3a1.zip
88 files changed, 228 insertions, 902 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 2e7014c54..fc7312045 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -5492,4 +5492,6 @@
 	* apps/examples/cc3000, configs/freedom-kl25z, drivers/wireless/cc3000,
 	  and nuttx/include/nuttx/cc3000.  Initial support for the TI CC3000
 	  network module on the Freescale Freedom-KL25Z board from Alan Carvalho
-	  de Assis.  This is still very much a work in progress. (2013-9-3).
+	  de Assis.  This is still very much a work in progress (2013-9-3).
+	* configs/*/usbmsc:  Renamed from config/*/usbstorage to match the
+	  change in naming in apps/examples submitted by CCTSAO (2013-9-5).
diff --git a/nuttx/TODO b/nuttx/TODO
index f0a712ca8..6b6dee76f 100644
--- a/nuttx/TODO
+++ b/nuttx/TODO
@@ -1790,7 +1790,7 @@ o AVR (arch/avr)
                 as a USB mass storage example).  However, this configuration is not
                 fully debugged as of the NuttX-6.5 release.
                 Update 7/11:  (1) The SPI/SD driver has been verified, however, (2) I
-                believe that the current teensy/usbstorage configuration uses too
+                believe that the current teensy/usbmsc configuration uses too
                 much SRAM for the system to behave sanely.  A lower memory footprint
                 version of the mass storage driver will be required before this can
                 be debugged
diff --git a/nuttx/configs/amber/hello/defconfig b/nuttx/configs/amber/hello/defconfig
index 4d2845078..2092d160f 100644
--- a/nuttx/configs/amber/hello/defconfig
+++ b/nuttx/configs/amber/hello/defconfig
@@ -398,7 +398,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/ea3131/README.txt b/nuttx/configs/ea3131/README.txt
index ed798103d..c5d7436a4 100644
--- a/nuttx/configs/ea3131/README.txt
+++ b/nuttx/configs/ea3131/README.txt
@@ -646,8 +646,8 @@ Where <subdir> is one of the following:
     driver at examples/usbserial.  See examples/README.txt for
     more information.
 
-  usbstorage:
+  usbmsc:
     This configuration directory exercises the USB mass storage
-    class driver at examples/usbstorage.  See examples/README.txt for
+    class driver at examples/usbmsc.  See examples/README.txt for
     more information.
 
diff --git a/nuttx/configs/ea3131/usbstorage/Make.defs b/nuttx/configs/ea3131/usbmsc/Make.defs
index f12e55a75..d4aabb7f8 100644
--- a/nuttx/configs/ea3131/usbstorage/Make.defs
+++ b/nuttx/configs/ea3131/usbmsc/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/ea3131/usbstorage/Make.defs
+# configs/ea3131/usbmsc/Make.defs
 #
 #   Copyright (C) 2010,2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/teensy/usbstorage/appconfig b/nuttx/configs/ea3131/usbmsc/appconfig
index 76df13884..985ad9e47 100644
--- a/nuttx/configs/teensy/usbstorage/appconfig
+++ b/nuttx/configs/ea3131/usbmsc/appconfig
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/teensy/usbstorage/appconfig
+# configs/ea3131/usbmsc/appconfig
 #
 #   Copyright (C) 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -35,5 +35,5 @@
 
 # Path to example in apps/examples containing the user_start entry point
 
-CONFIGURED_APPS += examples/usbstorage
+CONFIGURED_APPS += examples/usbmsc
 
diff --git a/nuttx/configs/ea3131/usbstorage/defconfig b/nuttx/configs/ea3131/usbmsc/defconfig
index 9baaddf91..243d26449 100644
--- a/nuttx/configs/ea3131/usbstorage/defconfig
+++ b/nuttx/configs/ea3131/usbmsc/defconfig
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/ea3131/usbstorage/defconfig
+# configs/ea3131/usbmsc/defconfig
 #
 #   Copyright (C) 2010-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -397,7 +397,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/ea3131/usbstorage/setenv.sh b/nuttx/configs/ea3131/usbmsc/setenv.sh
index bf0fb65a4..131d28806 100755
--- a/nuttx/configs/ea3131/usbstorage/setenv.sh
+++ b/nuttx/configs/ea3131/usbmsc/setenv.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# configs/ea3131/usbstorage/setenv.sh
+# configs/ea3131/usbmsc/setenv.sh
 #
 #   Copyright (C) 2010 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/ea3131/usbserial/defconfig b/nuttx/configs/ea3131/usbserial/defconfig
index 189d18ebf..8295b3dc8 100644
--- a/nuttx/configs/ea3131/usbserial/defconfig
+++ b/nuttx/configs/ea3131/usbserial/defconfig
@@ -396,7 +396,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/hymini-stm32v/README.txt b/nuttx/configs/hymini-stm32v/README.txt
index c3493b8ff..e2059b074 100644
--- a/nuttx/configs/hymini-stm32v/README.txt
+++ b/nuttx/configs/hymini-stm32v/README.txt
@@ -610,7 +610,7 @@ Where <subdir> is one of the following:
     ----------- ----------------------- --------------------------------
     Built-in    None                    apps/examples/nx
     Apps                                apps/examples/nxhello
-                                        apps/examples/usbstorage (4)
+                                        apps/examples/usbmsc (4)
                                         apps/examples/buttons
                                         apps/examples/nximage
     =========== ======================= ================================
diff --git a/nuttx/configs/hymini-stm32v/usbstorage/Make.defs b/nuttx/configs/hymini-stm32v/usbmsc/Make.defs
index d68ed325a..2c3d5b281 100644
--- a/nuttx/configs/hymini-stm32v/usbstorage/Make.defs
+++ b/nuttx/configs/hymini-stm32v/usbmsc/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/hymini-stm32v/usbstorage/Make.defs
+# configs/hymini-stm32v/usbmsc/Make.defs
 #
 #   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/ea3131/usbstorage/appconfig b/nuttx/configs/hymini-stm32v/usbmsc/appconfig
index 8db7e05d6..e0143e969 100644
--- a/nuttx/configs/ea3131/usbstorage/appconfig
+++ b/nuttx/configs/hymini-stm32v/usbmsc/appconfig
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/ea3131/usbstorage/appconfig
+# configs/hymini-stm32v/usbmsc/appconfig
 #
 #   Copyright (C) 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -35,5 +35,5 @@
 
 # Path to example in apps/examples containing the user_start entry point
 
-CONFIGURED_APPS += examples/usbstorage
+CONFIGURED_APPS += examples/usbmsc
 
diff --git a/nuttx/configs/hymini-stm32v/usbstorage/defconfig b/nuttx/configs/hymini-stm32v/usbmsc/defconfig
index d94256102..be2aed657 100755
--- a/nuttx/configs/hymini-stm32v/usbstorage/defconfig
+++ b/nuttx/configs/hymini-stm32v/usbmsc/defconfig
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/hymini-stm32v/usbstorage/defconfig
+# configs/hymini-stm32v/usbmsc/defconfig
 #
 #   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -462,7 +462,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/hymini-stm32v/usbstorage/setenv.sh b/nuttx/configs/hymini-stm32v/usbmsc/setenv.sh
index 629897058..629897058 100755
--- a/nuttx/configs/hymini-stm32v/usbstorage/setenv.sh
+++ b/nuttx/configs/hymini-stm32v/usbmsc/setenv.sh
diff --git a/nuttx/configs/hymini-stm32v/usbstorage/appconfig b/nuttx/configs/hymini-stm32v/usbstorage/appconfig
deleted file mode 100644
index 3e171d83a..000000000
--- a/nuttx/configs/hymini-stm32v/usbstorage/appconfig
+++ /dev/null
@@ -1,39 +0,0 @@
-############################################################################
-# configs/hymini-stm32v/usbstorage/appconfig
-#
-#   Copyright (C) 2011 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.
-#
-############################################################################
-
-# Path to example in apps/examples containing the user_start entry point
-
-CONFIGURED_APPS += examples/usbstorage
-
diff --git a/nuttx/configs/lincoln60/ostest/defconfig b/nuttx/configs/lincoln60/ostest/defconfig
index 3ba50a15e..d657b8fc4 100644
--- a/nuttx/configs/lincoln60/ostest/defconfig
+++ b/nuttx/configs/lincoln60/ostest/defconfig
@@ -464,7 +464,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/lpcxpresso-lpc1768/README.txt b/nuttx/configs/lpcxpresso-lpc1768/README.txt
index 700d0eb66..3e269e979 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/README.txt
+++ b/nuttx/configs/lpcxpresso-lpc1768/README.txt
@@ -800,9 +800,9 @@ Where <subdir> is one of the following:
     Jumpers: Nothing special.  Use the default base board jumper
     settings.
 
-  usbstorage:
+  usbmsc:
     This configuration directory exercises the USB mass storage
-    class driver at apps/examples/usbstorage.  See apps/examples/README.txt
+    class driver at apps/examples/usbmsc.  See apps/examples/README.txt
     for more information.
 
     NOTE: At present, the value for the SD SPI frequency is too
diff --git a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig
index 07da26c72..1a4069e64 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig
@@ -462,7 +462,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig b/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig
index 26d90a7f0..836ba54bf 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig
@@ -472,7 +472,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig b/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig
index f81dfcbf9..a1a2849ed 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig
@@ -505,7 +505,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig b/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig
index 927c0afed..8aee698f4 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig
@@ -450,7 +450,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig b/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig
index 323f5b3b4..899502bd0 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig
@@ -489,7 +489,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/Make.defs
deleted file mode 100644
index 122c94fc7..000000000
--- a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/Make.defs
+++ /dev/null
@@ -1,109 +0,0 @@
-############################################################################
-# configs/lpcxpresso-lpc1768/usbstorage/Make.defs
-#
-#   Copyright (C) 2011-2012 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.
-#
-############################################################################
-
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-
-ifeq ($(WINTOOL),y)
-  # Windows-native toolchains
-  DIRLINK = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK = $(TOPDIR)/tools/unlink.sh
-  MKDEP = $(TOPDIR)/tools/mknulldeps.sh
-  ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}"
-  MAXOPTIMIZATION = -O2
-else
-  # Linux/Cygwin-native toolchain 
-  MKDEP = $(TOPDIR)/tools/mkdeps.sh
-  ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
-  ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script
-endif
-
-CC = $(CROSSDEV)gcc
-CXX = $(CROSSDEV)g++
-CPP = $(CROSSDEV)gcc -E
-LD = $(CROSSDEV)ld
-AR = $(CROSSDEV)ar rcs
-NM = $(CROSSDEV)nm
-OBJCOPY = $(CROSSDEV)objcopy
-OBJDUMP = $(CROSSDEV)objdump
-
-ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
-
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION = -g
-else
-  ARCHOPTIMIZATION = $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
-endif
-
-ARCHCFLAGS = -fno-builtin
-ARCHCXXFLAGS = -fno-builtin -fno-exceptions
-ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
-ARCHWARNINGSXX = -Wall -Wshadow
-ARCHDEFINES =
-ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
-
-CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS = $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
-LDNXFLATFLAGS = -e main -s 2048
-
-OBJEXT = .o
-LIBEXT = .a
-EXEEXT =
-
-ifneq ($(CROSSDEV),arm-nuttx-elf-)
-  LDFLAGS += -nostartfiles -nodefaultlibs
-endif
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  LDFLAGS += -g
-endif
-
-
-HOSTCC = gcc
-HOSTINCLUDES = -I.
-HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS =
-
diff --git a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/appconfig b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/appconfig
deleted file mode 100644
index a562cb918..000000000
--- a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/appconfig
+++ /dev/null
@@ -1,39 +0,0 @@
-############################################################################
-# configs/lpcxpresso-lpc1768/usbstorage/appconfig
-#
-#   Copyright (C) 2011 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.
-#
-############################################################################
-
-# Path to example in apps/examples containing the user_start entry point
-
-CONFIGURED_APPS += examples/usbstorage
-
diff --git a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig
deleted file mode 100755
index a8ccc57b2..000000000
--- a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig
+++ /dev/null
@@ -1,469 +0,0 @@
-############################################################################
-# configs/lpcxpresso-lpc1768/usbstorage/defconfig
-#
-#   Copyright (C) 2011-2012 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.
-#
-############################################################################
-#
-# Architecture Selection
-#
-CONFIG_ARCH="arm"
-CONFIG_ARCH_ARM=y
-CONFIG_ARCH_CORTEXM3=y
-CONFIG_ARCH_CHIP="lpc17xx"
-CONFIG_ARCH_CHIP_LPC17XX=y
-CONFIG_ARCH_CHIP_LPC1768=y
-CONFIG_ARCH_BOARD="lpcxpresso-lpc1768"
-CONFIG_ARCH_BOARD_LPCXPRESSO=y
-CONFIG_BOARD_LOOPSPERMSEC=8079
-CONFIG_RAM_SIZE=32768
-CONFIG_RAM_START=0x10000000
-CONFIG_ARCH_IRQPRIO=y
-CONFIG_ARCH_INTERRUPTSTACK=0
-CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
-CONFIG_ARCH_LEDS=y
-CONFIG_ARCH_BUTTONS=n
-CONFIG_ARCH_CALIBRATION=n
-CONFIG_ARCH_DMA=n
-
-#
-# Identify toolchain and linker options
-#
-CONFIG_LPC17_CODESOURCERYW=n
-CONFIG_LPC17_CODESOURCERYL=n
-CONFIG_LPC17_DEVKITARM=n
-CONFIG_LPC17_BUILDROOT=n
-CONFIG_LPC17_CODEREDW=n
-CONFIG_LPC17_CODEREDL=y
-
-#
-# Individual subsystems can be enabled:
-#
-CONFIG_LPC17_ETHERNET=n
-CONFIG_LPC17_USBHOST=n
-CONFIG_LPC17_USBOTG=n
-CONFIG_LPC17_USBDEV=y
-CONFIG_LPC17_UART0=n
-CONFIG_LPC17_UART1=n
-CONFIG_LPC17_UART2=n
-CONFIG_LPC17_UART3=y
-CONFIG_LPC17_CAN1=n
-CONFIG_LPC17_CAN2=n
-CONFIG_LPC17_SPI=n
-CONFIG_LPC17_SSP0=n
-CONFIG_LPC17_SSP1=y
-CONFIG_LPC17_I2C0=n
-CONFIG_LPC17_I2C1=n
-CONFIG_LPC17_I2S=n
-CONFIG_LPC17_TMR0=n
-CONFIG_LPC17_TMR1=n
-CONFIG_LPC17_TMR2=n
-CONFIG_LPC17_TMR3=n
-CONFIG_LPC17_RIT=n
-CONFIG_LPC17_PWM0=n
-CONFIG_LPC17_MCPWM=n
-CONFIG_LPC17_QEI=n
-CONFIG_LPC17_RTC=n
-CONFIG_LPC17_WDT=n
-CONFIG_LPC17_ADC=n
-CONFIG_LPC17_DAC=n
-CONFIG_LPC17_GPDMA=n
-
-#
-# LPC17xx specific serial device driver settings
-#
-CONFIG_UART0_SERIAL_CONSOLE=n
-CONFIG_UART1_SERIAL_CONSOLE=n
-CONFIG_UART2_SERIAL_CONSOLE=n
-CONFIG_UART3_SERIAL_CONSOLE=y
-
-CONFIG_UART0_TXBUFSIZE=256
-CONFIG_UART1_TXBUFSIZE=256
-CONFIG_UART2_TXBUFSIZE=256
-CONFIG_UART3_TXBUFSIZE=256
-
-CONFIG_UART0_RXBUFSIZE=256
-CONFIG_UART1_RXBUFSIZE=256
-CONFIG_UART2_RXBUFSIZE=256
-CONFIG_UART3_RXBUFSIZE=256
-
-CONFIG_UART0_BAUD=115200
-CONFIG_UART2_BAUD=115200
-CONFIG_UART3_BAUD=115200
-CONFIG_UART1_BAUD=115200
-
-CONFIG_UART0_BITS=8
-CONFIG_UART1_BITS=8
-CONFIG_UART2_BITS=8
-CONFIG_UART3_BITS=8
-
-CONFIG_UART0_PARITY=0
-CONFIG_UART1_PARITY=0
-CONFIG_UART2_PARITY=0
-CONFIG_UART3_PARITY=0
-
-CONFIG_UART0_2STOP=0
-CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
-
-#
-# LPC17xx specific PHY/Ethernet device driver settings
-#
-CONFIG_PHY_KS8721=n
-CONFIG_PHY_DP83848C=n
-CONFIG_PHY_LAN8720=y
-CONFIG_PHY_AUTONEG=y
-CONFIG_PHY_SPEED100=n
-CONFIG_PHY_FDUPLEX=y
-
-#
-# General build options
-#
-CONFIG_RRLOAD_BINARY=n
-CONFIG_INTELHEX_BINARY=y
-CONFIG_MOTOROLA_SREC=n
-CONFIG_RAW_BINARY=n
-
-#
-# General OS setup
-#
-CONFIG_USER_ENTRYPOINT="msconn_main"
-#CONFIG_USER_ENTRYPOINT="msdis_main"
-CONFIG_DEBUG=n
-CONFIG_DEBUG_VERBOSE=n
-CONFIG_DEBUG_SYMBOLS=n
-CONFIG_DEBUG_USB=n
-CONFIG_MM_REGIONS=2
-CONFIG_ARCH_LOWPUTC=y
-CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_INSTRUMENTATION=n
-CONFIG_TASK_NAME_SIZE=0
-CONFIG_START_YEAR=2011
-CONFIG_START_MONTH=4
-CONFIG_START_DAY=15
-CONFIG_GREGORIAN_TIME=n
-CONFIG_JULIAN_TIME=n
-CONFIG_DEV_CONSOLE=y
-CONFIG_DEV_LOWCONSOLE=n
-CONFIG_MUTEX_TYPES=n
-CONFIG_PRIORITY_INHERITANCE=n
-CONFIG_SEM_PREALLOCHOLDERS=0
-CONFIG_SEM_NNESTPRIO=0
-CONFIG_FDCLONE_DISABLE=n
-CONFIG_FDCLONE_STDIO=n
-CONFIG_SDCLONE_DISABLE=y
-CONFIG_NXFLAT=n
-CONFIG_SCHED_WORKQUEUE=n
-CONFIG_SCHED_WORKPRIORITY=192
-CONFIG_SCHED_WORKPERIOD=50000
-CONFIG_SCHED_WORKSTACKSIZE=1024
-CONFIG_SIG_SIGWORK=17
-
-#
-# The following can be used to disable categories of
-# APIs supported by the OS.  If the compiler supports
-# weak functions, then it should not be necessary to
-# disable functions unless you want to restrict usage
-# of those APIs.
-#
-# There are certain dependency relationships in these
-# features.
-#
-# o mq_notify logic depends on signals to awaken tasks
-#   waiting for queues to become full or empty.
-# o pthread_condtimedwait() depends on signals to wake
-#   up waiting tasks.
-#
-CONFIG_DISABLE_CLOCK=n
-CONFIG_DISABLE_POSIX_TIMERS=n
-CONFIG_DISABLE_PTHREAD=n
-CONFIG_DISABLE_SIGNALS=n
-CONFIG_DISABLE_MQUEUE=n
-CONFIG_DISABLE_MOUNTPOINT=y
-CONFIG_DISABLE_ENVIRON=n
-CONFIG_DISABLE_POLL=y
-
-#
-# Misc libc settings
-#
-CONFIG_NOPRINTF_FIELDWIDTH=n
-
-#
-# Allow for architecture optimized implementations
-#
-# The architecture can provide optimized versions of the
-# following to improve system performance
-#
-CONFIG_ARCH_MEMCPY=n
-CONFIG_ARCH_MEMCMP=n
-CONFIG_ARCH_MEMMOVE=n
-CONFIG_ARCH_MEMSET=n
-CONFIG_ARCH_STRCMP=n
-CONFIG_ARCH_STRCPY=n
-CONFIG_ARCH_STRNCPY=n
-CONFIG_ARCH_STRLEN=n
-CONFIG_ARCH_STRNLEN=n
-CONFIG_ARCH_BZERO=n
-
-#
-# Sizes of configurable things (0 disables)
-#
-CONFIG_MAX_TASKS=16
-CONFIG_MAX_TASK_ARGS=4
-CONFIG_NPTHREAD_KEYS=4
-CONFIG_NFILE_DESCRIPTORS=8
-CONFIG_NFILE_STREAMS=8
-CONFIG_NAME_MAX=32
-CONFIG_STDIO_BUFFER_SIZE=64
-CONFIG_NUNGET_CHARS=2
-CONFIG_PREALLOC_MQ_MSGS=4
-CONFIG_MQ_MAXMSGSIZE=32
-CONFIG_MAX_WDOGPARMS=2
-CONFIG_PREALLOC_WDOGS=4
-CONFIG_PREALLOC_TIMERS=4
-
-#
-# Filesystem configuration
-#
-CONFIG_FS_FAT=n
-CONFIG_FS_ROMFS=n
-
-#
-# Maintain legacy build behavior (revisit)
-#
-
-CONFIG_MMCSD=y
-CONFIG_MMCSD_SPI=y
-CONFIG_MTD=y
-
-#
-# SPI-based MMC/SD driver
-#
-CONFIG_MMCSD_NSLOTS=1
-CONFIG_MMCSD_READONLY=n
-CONFIG_MMCSD_SPICLOCK=12500000
-
-#
-# Block driver buffering
-#
-CONFIG_FS_READAHEAD=n
-CONFIG_FS_WRITEBUFFER=n
-
-#
-# SDIO-based MMC/SD driver
-#
-CONFIG_SDIO_DMA=n
-CONFIG_MMCSD_MMCSUPPORT=n
-CONFIG_MMCSD_HAVECARDDETECT=n
-
-#
-# TCP/IP and UDP support via uIP
-#
-CONFIG_NET=n
-CONFIG_NET_IPv6=n
-CONFIG_NSOCKET_DESCRIPTORS=0
-CONFIG_NET_SOCKOPTS=y
-CONFIG_NET_BUFSIZE=420
-CONFIG_NET_TCP=n
-CONFIG_NET_TCP_CONNS=40
-CONFIG_NET_MAX_LISTENPORTS=40
-CONFIG_NET_UDP=n
-CONFIG_NET_UDP_CHECKSUMS=y
-#CONFIG_NET_UDP_CONNS=10
-CONFIG_NET_ICMP=n
-CONFIG_NET_ICMP_PING=n
-#CONFIG_NET_PINGADDRCONF=0
-CONFIG_NET_STATISTICS=y
-#CONFIG_NET_RECEIVE_WINDOW=
-#CONFIG_NET_ARPTAB_SIZE=8
-CONFIG_NET_BROADCAST=n
-
-#
-# UIP Network Utilities
-#
-CONFIG_NET_DHCP_LIGHT=n
-CONFIG_NET_RESOLV_ENTRIES=4
-
-#
-# USB Device Configuration
-#
-CONFIG_USBDEV=y
-CONFIG_USBDEV_ISOCHRONOUS=n
-CONFIG_USBDEV_DUALSPEED=n
-CONFIG_USBDEV_SELFPOWERED=y
-CONFIG_USBDEV_REMOTEWAKEUP=n
-CONFIG_USBDEV_MAXPOWER=100
-CONFIG_USBDEV_TRACE=n
-CONFIG_USBDEV_TRACE_NRECORDS=128
-
-#
-# LPC17xx USB Configuration
-#
-CONFIG_LPC17_USBDEV_FRAME_INTERRUPT=n
-CONFIG_LPC17_USBDEV_EPFAST_INTERRUPT=n
-CONFIG_LPC17_USBDEV_DMA=n
-CONFIG_LPC17_USBDEV_NDMADESCRIPTORS=0
-CONFIG_LPC17_USBDEV_NOVBUS=y
-CONFIG_LPC17_USBDEV_NOLED=y
-
-#
-# USB Serial Device Configuration
-#
-CONFIG_PL2303=n
-CONFIG_PL2303_EPINTIN=1
-CONFIG_PL2303_EPBULKOUT=2
-CONFIG_PL2303_EPBULKIN=5
-CONFIG_PL2303_NWRREQS=4
-CONFIG_PL2303_NRDREQS=4
-CONFIG_PL2303_VENDORID=0x067b
-CONFIG_PL2303_PRODUCTID=0x2303
-CONFIG_PL2303_VENDORSTR="Nuttx"
-CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
-CONFIG_PL2303_RXBUFSIZE=512
-CONFIG_PL2303_TXBUFSIZE=512
-
-#
-# USB Storage Device Configuration
-#
-CONFIG_USBMSC=y
-CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBMSC_REMOVABLE=y
-
-#
-# Settings for examples/uip
-#
-CONFIG_EXAMPLES_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLES_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLES_UIP_DHCPC=n
-
-#
-# Settings for examples/nettest
-#
-CONFIG_EXAMPLES_NETTEST_SERVER=n
-CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLES_NETTEST_NOMAC=y
-CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
-
-#
-# Settings for examples/ostest
-#
-CONFIG_EXAMPLES_OSTEST_LOOPS=1
-CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
-CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
-
-#
-# Settings for apps/nshlib
-#
-CONFIG_NSH_FILEIOSIZE=512
-CONFIG_NSH_STRERROR=n
-CONFIG_NSH_LINELEN=64
-CONFIG_NSH_NESTDEPTH=3
-CONFIG_NSH_DISABLESCRIPT=n
-CONFIG_NSH_DISABLEBG=n
-CONFIG_NSH_ROMFSETC=n
-CONFIG_NSH_CONSOLE=y
-CONFIG_NSH_TELNET=n
-CONFIG_NSH_ARCHINIT=n
-CONFIG_NSH_IOBUFFER_SIZE=512
-CONFIG_NSH_DHCPC=n
-CONFIG_NSH_NOMAC=n
-CONFIG_NSH_IPADDR=0x0a000002
-CONFIG_NSH_DRIPADDR=0x0a000001
-CONFIG_NSH_NETMASK=0xffffff00
-CONFIG_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_NSH_ROMFSDEVNO=0
-CONFIG_NSH_ROMFSSECTSIZE=64
-CONFIG_NSH_FATDEVNO=1
-CONFIG_NSH_FATSECTSIZE=512
-CONFIG_NSH_FATNSECTORS=1024
-CONFIG_NSH_FATMOUNTPT="/tmp"
-
-#
-# Architecture-specific NSH options
-#
-CONFIG_NSH_MMCSDSPIPORTNO=1
-CONFIG_NSH_MMCSDSLOTNO=0
-CONFIG_NSH_MMCSDMINOR=0
-
-#
-# Settings for examples/usbserial
-#
-CONFIG_EXAMPLES_USBSERIAL_INONLY=n
-CONFIG_EXAMPLES_USBSERIAL_OUTONLY=n
-CONFIG_EXAMPLES_USBSERIAL_ONLYSMALL=n
-CONFIG_EXAMPLES_USBSERIAL_ONLYBIG=n
-
-CONFIG_EXAMPLES_USBSERIAL_TRACEINIT=n
-CONFIG_EXAMPLES_USBSERIAL_TRACECLASS=n
-CONFIG_EXAMPLES_USBSERIAL_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
-
-#
-# Settings for examples/usbstorage
-#
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
-
-#
-# Stack and heap information
-#
-CONFIG_BOOT_RUNFROMFLASH=n
-CONFIG_BOOT_COPYTORAM=n
-CONFIG_CUSTOM_STACK=n
-CONFIG_IDLETHREAD_STACKSIZE=1024
-CONFIG_USERMAIN_STACKSIZE=2048
-CONFIG_PTHREAD_STACK_MIN=256
-CONFIG_PTHREAD_STACK_DEFAULT=2048
diff --git a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/setenv.sh b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/setenv.sh
deleted file mode 100755
index 7318183ac..000000000
--- a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/setenv.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-# configs/lpcxpresso-lpc1768/usbstorage/setenv.sh
-#
-#   Copyright (C) 2011 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.
-#
-
-if [ "$(basename $0)" = "setenv.sh" ] ; then
-  echo "You must source this script, not run it!" 1>&2
-  exit 1
-fi
-
-if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
-
-WD=`pwd`
-
-# This is where the buildroot might reside on a Linux or Cygwin system
-# export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
-
-# This is the default install location for Code Red on Linux
-export TOOLCHAIN_BIN="/usr/local/LPCXpresso/tools/bin"
-
-# This is the Cygwin path to the LPCXpresso 3.6 install location under Windows
-#export TOOLCHAIN_BIN="/cygdrive/c/nxp/lpcxpresso_3.6/Tools/bin"
-
-# This is the path to the LPCXpression tool subdirectory
-export LPCTOOL_DIR="${WD}/configs/lpcxpresso-lpc1768/tools"
-
-# Add the path to the toolchain to the PATH varialble
-export PATH="${TOOLCHAIN_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
-
-echo "PATH : ${PATH}"
diff --git a/nuttx/configs/mcu123-lpc214x/README.txt b/nuttx/configs/mcu123-lpc214x/README.txt
index 4d131d62f..e9e6c3710 100644
--- a/nuttx/configs/mcu123-lpc214x/README.txt
+++ b/nuttx/configs/mcu123-lpc214x/README.txt
@@ -388,11 +388,11 @@ usbserial:
   NOTE:  If you have problems with this configurationt, perhaps it is a
   consequence of the last USB driver checking (r4359)
 
-usbstorage:
------------
+usbmsc:
+-------
 
   This configuration directory exercises the USB mass storage
-  class driver at examples/usbstorage.  See examples/README.txt for
+  class driver at examples/usbmsc.  See examples/README.txt for
   more information.
 
   Default toolchain:  Buildroot
diff --git a/nuttx/configs/mcu123-lpc214x/composite/defconfig b/nuttx/configs/mcu123-lpc214x/composite/defconfig
index 919594605..912214a24 100644
--- a/nuttx/configs/mcu123-lpc214x/composite/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/composite/defconfig
@@ -383,7 +383,7 @@ CONFIG_EXAMPLES_USBSERIAL_ONLYSMALL=n
 CONFIG_EXAMPLES_USBSERIAL_ONLYBIG=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/mcu123-lpc214x/usbstorage/Make.defs b/nuttx/configs/mcu123-lpc214x/usbmsc/Make.defs
index a645e237b..a4b730d1f 100644
--- a/nuttx/configs/mcu123-lpc214x/usbstorage/Make.defs
+++ b/nuttx/configs/mcu123-lpc214x/usbmsc/Make.defs
@@ -1,5 +1,5 @@
 ##############################################################################
-# configs/mcu123-lpc214x/usbstorage/Make.defs
+# configs/mcu123-lpc214x/usbmsc/Make.defs
 #
 #   Copyright (C) 2008-2009, 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/nucleus2g/usbstorage/appconfig b/nuttx/configs/mcu123-lpc214x/usbmsc/appconfig
index 9653e14a3..2011b6519 100644
--- a/nuttx/configs/nucleus2g/usbstorage/appconfig
+++ b/nuttx/configs/mcu123-lpc214x/usbmsc/appconfig
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/nucleus2g/usbstorage/appconfig
+# configs/mcu123-lpc214x/usbmsc/appconfig
 #
 #   Copyright (C) 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -35,5 +35,5 @@
 
 # Path to example in apps/examples containing the user_start entry point
 
-CONFIGURED_APPS += examples/usbstorage
+CONFIGURED_APPS += examples/usbmsc
 
diff --git a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig b/nuttx/configs/mcu123-lpc214x/usbmsc/defconfig
index 1a650c1c2..6a19f399c 100644
--- a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/usbmsc/defconfig
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/mcu123-lpc214x/usbstorage/defconfig
+# configs/mcu123-lpc214x/usbmsc/defconfig
 #
 #   Copyright (C) 2008-2010, 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -340,7 +340,7 @@ CONFIG_EXAMPLES_USBSERIAL_ONLYSMALL=n
 CONFIG_EXAMPLES_USBSERIAL_ONLYBIG=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/mcu123-lpc214x/usbstorage/setenv.sh b/nuttx/configs/mcu123-lpc214x/usbmsc/setenv.sh
index 7ea83ccb6..fcfea484c 100755
--- a/nuttx/configs/mcu123-lpc214x/usbstorage/setenv.sh
+++ b/nuttx/configs/mcu123-lpc214x/usbmsc/setenv.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# configs/mcu123-lpc2148/usbstorage/setenv.sh
+# configs/mcu123-lpc214x/usbmsc/setenv.sh
 #
 #   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/mcu123-lpc214x/usbstorage/appconfig b/nuttx/configs/mcu123-lpc214x/usbstorage/appconfig
deleted file mode 100644
index 1ed11ca5e..000000000
--- a/nuttx/configs/mcu123-lpc214x/usbstorage/appconfig
+++ /dev/null
@@ -1,39 +0,0 @@
-############################################################################
-# configs/mcu123-lpc214x/usbstorage/appconfig
-#
-#   Copyright (C) 2011 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.
-#
-############################################################################
-
-# Path to example in apps/examples containing the user_start entry point
-
-CONFIGURED_APPS += examples/usbstorage
-
diff --git a/nuttx/configs/micropendous3/hello/defconfig b/nuttx/configs/micropendous3/hello/defconfig
index 1ed74d82c..50c72ba6c 100644
--- a/nuttx/configs/micropendous3/hello/defconfig
+++ b/nuttx/configs/micropendous3/hello/defconfig
@@ -393,7 +393,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/mirtoo/nsh/defconfig b/nuttx/configs/mirtoo/nsh/defconfig
index 3ef9279c7..7314c0197 100644
--- a/nuttx/configs/mirtoo/nsh/defconfig
+++ b/nuttx/configs/mirtoo/nsh/defconfig
@@ -473,7 +473,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/mirtoo/nxffs/defconfig b/nuttx/configs/mirtoo/nxffs/defconfig
index 43736ad71..acdde8416 100644
--- a/nuttx/configs/mirtoo/nxffs/defconfig
+++ b/nuttx/configs/mirtoo/nxffs/defconfig
@@ -516,7 +516,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/mirtoo/ostest/defconfig b/nuttx/configs/mirtoo/ostest/defconfig
index 9fa86bd61..f68a34374 100644
--- a/nuttx/configs/mirtoo/ostest/defconfig
+++ b/nuttx/configs/mirtoo/ostest/defconfig
@@ -449,7 +449,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/nucleus2g/README.txt b/nuttx/configs/nucleus2g/README.txt
index 10a69b850..1980ae6fd 100644
--- a/nuttx/configs/nucleus2g/README.txt
+++ b/nuttx/configs/nucleus2g/README.txt
@@ -543,8 +543,8 @@ Where <subdir> is one of the following:
     driver at examples/usbserial.  See examples/README.txt for
     more information.
 
-  usbstorage:
+  usbmsc:
     This configuration directory exercises the USB mass storage
-    class driver at examples/usbstorage.  See examples/README.txt for
+    class driver at examples/usbmsc.  See examples/README.txt for
     more information.
 
diff --git a/nuttx/configs/nucleus2g/usbstorage/Make.defs b/nuttx/configs/nucleus2g/usbmsc/Make.defs
index 8675a12e4..fc68a3744 100644
--- a/nuttx/configs/nucleus2g/usbstorage/Make.defs
+++ b/nuttx/configs/nucleus2g/usbmsc/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/nucleus2g/usbstorage/Make.defs
+# configs/nucleus2g/usbmsc/Make.defs
 #
 #   Copyright (C) 2010 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/stm3210e-eval/usbstorage/appconfig b/nuttx/configs/nucleus2g/usbmsc/appconfig
index 646e4f4ed..4999d4933 100644
--- a/nuttx/configs/stm3210e-eval/usbstorage/appconfig
+++ b/nuttx/configs/nucleus2g/usbmsc/appconfig
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/stm3210e-eval/usbstorage/appconfig
+# configs/nucleus2g/usbmsc/appconfig
 #
 #   Copyright (C) 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -35,5 +35,5 @@
 
 # Path to example in apps/examples containing the user_start entry point
 
-CONFIGURED_APPS += examples/usbstorage
+CONFIGURED_APPS += examples/usbmsc
 
diff --git a/nuttx/configs/nucleus2g/usbstorage/defconfig b/nuttx/configs/nucleus2g/usbmsc/defconfig
index 738e7fb23..a024d7057 100755
--- a/nuttx/configs/nucleus2g/usbstorage/defconfig
+++ b/nuttx/configs/nucleus2g/usbmsc/defconfig
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/nucleus2g/usbstorage/defconfig
+# configs/nucleus2g/usbmsc/defconfig
 #
 #   Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -439,7 +439,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/nucleus2g/usbstorage/setenv.sh b/nuttx/configs/nucleus2g/usbmsc/setenv.sh
index 2443be4e1..05943f635 100755
--- a/nuttx/configs/nucleus2g/usbstorage/setenv.sh
+++ b/nuttx/configs/nucleus2g/usbmsc/setenv.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# configs/nucleus2g/usbstorage/setenv.sh
+# configs/nucleus2g/usbmsc/setenv.sh
 #
 #   Copyright (C) 2010 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/olimex-lpc1766stk/README.txt b/nuttx/configs/olimex-lpc1766stk/README.txt
index 68a9bff6d..9f5948687 100644
--- a/nuttx/configs/olimex-lpc1766stk/README.txt
+++ b/nuttx/configs/olimex-lpc1766stk/README.txt
@@ -1056,9 +1056,9 @@ Where <subdir> is one of the following:
     driver at apps/examples/usbserial.  See apps/examples/README.txt for
     more information.
 
-  usbstorage:
+  usbmsc:
     This configuration directory exercises the USB mass storage
-    class driver at apps/examples/usbstorage.  See apps/examples/README.txt
+    class driver at apps/examples/usbmsc.  See apps/examples/README.txt
     for more information.
 
   zmodem:
diff --git a/nuttx/configs/olimex-lpc1766stk/nx/defconfig b/nuttx/configs/olimex-lpc1766stk/nx/defconfig
index a7c5c16f9..4fe4687d5 100755
--- a/nuttx/configs/olimex-lpc1766stk/nx/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/nx/defconfig
@@ -536,7 +536,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/olimex-lpc1766stk/ostest/defconfig b/nuttx/configs/olimex-lpc1766stk/ostest/defconfig
index cc7107cae..2a9f3ce4b 100755
--- a/nuttx/configs/olimex-lpc1766stk/ostest/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/ostest/defconfig
@@ -464,7 +464,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/olimex-lpc1766stk/usbstorage/Make.defs b/nuttx/configs/olimex-lpc1766stk/usbmsc/Make.defs
index adb4067f0..3e4002a14 100644
--- a/nuttx/configs/olimex-lpc1766stk/usbstorage/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/usbmsc/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/olimex-lpc1766stk/usbstorage/Make.defs
+# configs/olimex-lpc1766stk/usbmsc/Make.defs
 #
 #   Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/olimex-lpc1766stk/usbmsc/appconfig b/nuttx/configs/olimex-lpc1766stk/usbmsc/appconfig
new file mode 100644
index 000000000..da8acd704
--- /dev/null
+++ b/nuttx/configs/olimex-lpc1766stk/usbmsc/appconfig
@@ -0,0 +1,39 @@
+############################################################################
+# configs/olimex-lpc1766stk/usbmsc/appconfig
+#
+#   Copyright (C) 2011 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.
+#
+############################################################################
+
+# Path to example in apps/examples containing the user_start entry point
+
+CONFIGURED_APPS += examples/usbmsc
+
diff --git a/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig b/nuttx/configs/olimex-lpc1766stk/usbmsc/defconfig
index 23990eace..3a5ad422c 100755
--- a/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/usbmsc/defconfig
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/olimex-lpc1766stk/usbstorage/defconfig
+# configs/olimex-lpc1766stk/usbmsc/defconfig
 #
 #   Copyright (C) 2010-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -466,7 +466,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/olimex-lpc1766stk/usbstorage/setenv.sh b/nuttx/configs/olimex-lpc1766stk/usbmsc/setenv.sh
index 4e01bb195..5412c4b8a 100755
--- a/nuttx/configs/olimex-lpc1766stk/usbstorage/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/usbmsc/setenv.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# configs/olimex-lpc1766stk/usbstorage/setenv.sh
+# configs/olimex-lpc1766stk/usbmsc/setenv.sh
 #
 #   Copyright (C) 2010 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/olimex-lpc1766stk/usbstorage/appconfig b/nuttx/configs/olimex-lpc1766stk/usbstorage/appconfig
deleted file mode 100644
index 073634d41..000000000
--- a/nuttx/configs/olimex-lpc1766stk/usbstorage/appconfig
+++ /dev/null
@@ -1,39 +0,0 @@
-############################################################################
-# configs/olimex-lpc1766stk/usbstorage/appconfig
-#
-#   Copyright (C) 2011 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.
-#
-############################################################################
-
-# Path to example in apps/examples containing the user_start entry point
-
-CONFIGURED_APPS += examples/usbstorage
-
diff --git a/nuttx/configs/pic32-starterkit/README.txt b/nuttx/configs/pic32-starterkit/README.txt
index d295f5879..c65ee953c 100644
--- a/nuttx/configs/pic32-starterkit/README.txt
+++ b/nuttx/configs/pic32-starterkit/README.txt
@@ -1095,7 +1095,7 @@ Where <subdir> is one of the following:
 
       CONFIG_CDCACM=y         : Enable the CDCACM device
 
-    examples/usbstorage - There are some hooks in the appconfig file
+    examples/usbmsc - There are some hooks in the appconfig file
     to enable the USB mass storage device.  However, this device cannot
     work until support for the SD card is also incorporated.
 
@@ -1208,10 +1208,10 @@ Where <subdir> is one of the following:
 
   2. Changes to apps/.config.
 
-    a) Enable building of the examples/usbstorage:
+    a) Enable building of the examples/usbmsc:
 
-      -# CONFIGURED_APPS += examples/usbstorage
-      +  CONFIGURED_APPS += examples/usbstorage
+      -# CONFIGURED_APPS += examples/usbmsc
+      +  CONFIGURED_APPS += examples/usbmsc
 
   3. When NSH first comes up, you must manually create the RAM disk
      before exporting it:
diff --git a/nuttx/configs/pic32-starterkit/nsh/appconfig b/nuttx/configs/pic32-starterkit/nsh/appconfig
index 6fd17ae0c..6f6b4d561 100644
--- a/nuttx/configs/pic32-starterkit/nsh/appconfig
+++ b/nuttx/configs/pic32-starterkit/nsh/appconfig
@@ -55,8 +55,8 @@ ifeq ($(CONFIG_PIC32MX_USBDEV),y)
 # USB Mass Storage Class device configurations
 
 ifeq ($(CONFIG_USBMSC),y)
-#  Uncomment to enable the examples/usbstorage built-in
-#  CONFIGURED_APPS += examples/usbstorage
+#  Uncomment to enable the examples/usbmsc built-in
+#  CONFIGURED_APPS += examples/usbmsc
 endif
 
 # USB CDC/ACM serial device configurations
diff --git a/nuttx/configs/pic32-starterkit/nsh/defconfig b/nuttx/configs/pic32-starterkit/nsh/defconfig
index 32e4fa174..d9909c09a 100644
--- a/nuttx/configs/pic32-starterkit/nsh/defconfig
+++ b/nuttx/configs/pic32-starterkit/nsh/defconfig
@@ -625,7 +625,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/pic32-starterkit/nsh2/appconfig b/nuttx/configs/pic32-starterkit/nsh2/appconfig
index 83f7aa874..95712d484 100644
--- a/nuttx/configs/pic32-starterkit/nsh2/appconfig
+++ b/nuttx/configs/pic32-starterkit/nsh2/appconfig
@@ -55,8 +55,8 @@ ifeq ($(CONFIG_PIC32MX_USBDEV),y)
 # USB Mass Storage Class device configurations
 
 ifeq ($(CONFIG_USBMSC),y)
-#  Uncomment to enable the examples/usbstorage built-in
-#  CONFIGURED_APPS += examples/usbstorage
+#  Uncomment to enable the examples/usbmsc built-in
+#  CONFIGURED_APPS += examples/usbmsc
 endif
 
 # USB CDC/ACM serial device configurations
diff --git a/nuttx/configs/pic32-starterkit/nsh2/defconfig b/nuttx/configs/pic32-starterkit/nsh2/defconfig
index b6b0dac00..3b227b790 100644
--- a/nuttx/configs/pic32-starterkit/nsh2/defconfig
+++ b/nuttx/configs/pic32-starterkit/nsh2/defconfig
@@ -624,7 +624,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/pic32-starterkit/ostest/defconfig b/nuttx/configs/pic32-starterkit/ostest/defconfig
index 474ccfc34..3ab94f513 100644
--- a/nuttx/configs/pic32-starterkit/ostest/defconfig
+++ b/nuttx/configs/pic32-starterkit/ostest/defconfig
@@ -621,7 +621,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/pic32mx7mmb/README.txt b/nuttx/configs/pic32mx7mmb/README.txt
index 358b55e82..36ff444f4 100644
--- a/nuttx/configs/pic32mx7mmb/README.txt
+++ b/nuttx/configs/pic32mx7mmb/README.txt
@@ -776,10 +776,10 @@ Where <subdir> is one of the following:
 
   2. Changes to nuttx/.config.
 
-    a) Enable building of the examples/usbstorage:
+    a) Enable building of the examples/usbmsc:
 
-      -# CONFIGURED_APPS += examples/usbstorage
-      +  CONFIGURED_APPS += examples/usbstorage
+      -# CONFIGURED_APPS += examples/usbmsc
+      +  CONFIGURED_APPS += examples/usbmsc
 
   3. When NSH first comes up, you must manually create the RAM disk
      before exporting it:
diff --git a/nuttx/configs/pic32mx7mmb/nsh/appconfig b/nuttx/configs/pic32mx7mmb/nsh/appconfig
index faa1f49ce..679ab5997 100644
--- a/nuttx/configs/pic32mx7mmb/nsh/appconfig
+++ b/nuttx/configs/pic32mx7mmb/nsh/appconfig
@@ -55,7 +55,7 @@ ifeq ($(CONFIG_PIC32MX_USBDEV),y)
 # USB Mass Storage Class device configurations
 
 ifeq ($(CONFIG_USBMSC),y)
-  CONFIGURED_APPS += examples/usbstorage
+  CONFIGURED_APPS += examples/usbmsc
 else
 
 # USB CDC/ACM serial device configurations
diff --git a/nuttx/configs/pic32mx7mmb/nsh/defconfig b/nuttx/configs/pic32mx7mmb/nsh/defconfig
index 7bd1aed31..acb34b36e 100644
--- a/nuttx/configs/pic32mx7mmb/nsh/defconfig
+++ b/nuttx/configs/pic32mx7mmb/nsh/defconfig
@@ -737,7 +737,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/pic32mx7mmb/ostest/defconfig b/nuttx/configs/pic32mx7mmb/ostest/defconfig
index 0f9cbc95b..7df3171eb 100644
--- a/nuttx/configs/pic32mx7mmb/ostest/defconfig
+++ b/nuttx/configs/pic32mx7mmb/ostest/defconfig
@@ -621,7 +621,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/stm3210e-eval/README.txt b/nuttx/configs/stm3210e-eval/README.txt
index 7d36063a2..25f305d2f 100644
--- a/nuttx/configs/stm3210e-eval/README.txt
+++ b/nuttx/configs/stm3210e-eval/README.txt
@@ -736,7 +736,7 @@ Where <subdir> is one of the following:
     ----------- ----------------------- --------------------------------
     Built-in    None                    apps/examples/nx
     Apps                                apps/examples/nxhello
-                                        apps/examples/usbstorage (5)
+                                        apps/examples/usbmsc (5)
                                         apps/system/i2c
     =========== ======================= ================================
 
@@ -958,10 +958,10 @@ Where <subdir> is one of the following:
     In either the original appconfig file (before configuring)
     or in the final apps/.config file (after configuring).
 
-  usbstorage:
-  ----------
+  usbmsc:
+  -------
     This configuration directory exercises the USB mass storage
-    class driver at examples/usbstorage.  See examples/README.txt for
+    class driver at examples/usbmsc.  See examples/README.txt for
     more information.
 
       CONFIG_STM32_BUILDROOT=y      : NuttX buildroot under Linux or Cygwin
diff --git a/nuttx/configs/stm3210e-eval/composite/defconfig b/nuttx/configs/stm3210e-eval/composite/defconfig
index 2933e644c..c11a11080 100755
--- a/nuttx/configs/stm3210e-eval/composite/defconfig
+++ b/nuttx/configs/stm3210e-eval/composite/defconfig
@@ -520,7 +520,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/stm3210e-eval/nsh2/appconfig b/nuttx/configs/stm3210e-eval/nsh2/appconfig
index 72fa5cd7e..6a9ea36ba 100644
--- a/nuttx/configs/stm3210e-eval/nsh2/appconfig
+++ b/nuttx/configs/stm3210e-eval/nsh2/appconfig
@@ -50,7 +50,7 @@ CONFIGURED_APPS += examples/nx
 CONFIGURED_APPS += examples/nxhello
 #CONFIGURED_APPS += examples/nxlines
 #CONFIGURED_APPS += examples/nxtext
-CONFIGURED_APPS += examples/usbstorage
+CONFIGURED_APPS += examples/usbmsc
 
 ifeq ($(CONFIG_I2C),y)
 CONFIGURED_APPS += system/i2c
diff --git a/nuttx/configs/stm3210e-eval/nsh2/defconfig b/nuttx/configs/stm3210e-eval/nsh2/defconfig
index 02adfec10..27fc06616 100644
--- a/nuttx/configs/stm3210e-eval/nsh2/defconfig
+++ b/nuttx/configs/stm3210e-eval/nsh2/defconfig
@@ -693,7 +693,7 @@ CONFIG_EXAMPLES_NXLINES_BPP=16
 CONFIG_EXAMPLES_NXLINES_EXTERNINIT=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/stm3210e-eval/nxconsole/appconfig b/nuttx/configs/stm3210e-eval/nxconsole/appconfig
index e17e7f8f2..b7d22bf0b 100644
--- a/nuttx/configs/stm3210e-eval/nxconsole/appconfig
+++ b/nuttx/configs/stm3210e-eval/nxconsole/appconfig
@@ -43,7 +43,7 @@ CONFIGURED_APPS += nshlib
 # Optional built-in applications
 
 ifeq ($(CONFIG_USBDEV),y)
-CONFIGURED_APPS += examples/usbstorage
+CONFIGURED_APPS += examples/usbmsc
 endif
 
 ifeq ($(CONFIG_I2C),y)
diff --git a/nuttx/configs/stm3210e-eval/pm/appconfig b/nuttx/configs/stm3210e-eval/pm/appconfig
index c5cf06b39..07fb41bba 100644
--- a/nuttx/configs/stm3210e-eval/pm/appconfig
+++ b/nuttx/configs/stm3210e-eval/pm/appconfig
@@ -50,7 +50,7 @@ CONFIGURED_APPS += examples/nx
 CONFIGURED_APPS += examples/nxhello
 #CONFIGURED_APPS += examples/nxlines
 #CONFIGURED_APPS += examples/nxtext
-CONFIGURED_APPS += examples/usbstorage
+CONFIGURED_APPS += examples/usbmsc
 
 ifeq ($(CONFIG_I2C),y)
 CONFIGURED_APPS += system/i2c
diff --git a/nuttx/configs/stm3210e-eval/pm/defconfig b/nuttx/configs/stm3210e-eval/pm/defconfig
index 7ab655da3..8dc0665bf 100644
--- a/nuttx/configs/stm3210e-eval/pm/defconfig
+++ b/nuttx/configs/stm3210e-eval/pm/defconfig
@@ -738,7 +738,7 @@ CONFIG_EXAMPLES_NXLINES_BPP=16
 CONFIG_EXAMPLES_NXLINES_EXTERNINIT=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/stm3210e-eval/usbstorage/Make.defs b/nuttx/configs/stm3210e-eval/usbmsc/Make.defs
index 639d07810..23f3bc44f 100644
--- a/nuttx/configs/stm3210e-eval/usbstorage/Make.defs
+++ b/nuttx/configs/stm3210e-eval/usbmsc/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/stm3210e-eval/usbstorage/Make.defs
+# configs/stm3210e-eval/usbmsc/Make.defs
 #
 #   Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/stm3210e-eval/usbmsc/appconfig b/nuttx/configs/stm3210e-eval/usbmsc/appconfig
new file mode 100644
index 000000000..5b86cb0ec
--- /dev/null
+++ b/nuttx/configs/stm3210e-eval/usbmsc/appconfig
@@ -0,0 +1,39 @@
+############################################################################
+# configs/stm3210e-eval/usbmsc/appconfig
+#
+#   Copyright (C) 2011 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.
+#
+############################################################################
+
+# Path to example in apps/examples containing the user_start entry point
+
+CONFIGURED_APPS += examples/usbmsc
+
diff --git a/nuttx/configs/stm3210e-eval/usbstorage/defconfig b/nuttx/configs/stm3210e-eval/usbmsc/defconfig
index d768160c2..f9460bf3d 100755
--- a/nuttx/configs/stm3210e-eval/usbstorage/defconfig
+++ b/nuttx/configs/stm3210e-eval/usbmsc/defconfig
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/stm3210e-eval/usbstorage/defconfig
+# configs/stm3210e-eval/usbmsc/defconfig
 #
 #   Copyright (C) 2009, 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -477,7 +477,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/stm3210e-eval/usbstorage/setenv.sh b/nuttx/configs/stm3210e-eval/usbmsc/setenv.sh
index ff9a4bf8a..ff9a4bf8a 100755
--- a/nuttx/configs/stm3210e-eval/usbstorage/setenv.sh
+++ b/nuttx/configs/stm3210e-eval/usbmsc/setenv.sh
diff --git a/nuttx/configs/stm3220g-eval/nsh/defconfig b/nuttx/configs/stm3220g-eval/nsh/defconfig
index 483e57fcd..e090427f7 100644
--- a/nuttx/configs/stm3220g-eval/nsh/defconfig
+++ b/nuttx/configs/stm3220g-eval/nsh/defconfig
@@ -809,7 +809,7 @@ CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
 CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/stm3220g-eval/nsh2/defconfig b/nuttx/configs/stm3220g-eval/nsh2/defconfig
index c453efba1..d0028b2a7 100644
--- a/nuttx/configs/stm3220g-eval/nsh2/defconfig
+++ b/nuttx/configs/stm3220g-eval/nsh2/defconfig
@@ -796,7 +796,7 @@ CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
 CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/stm3220g-eval/ostest/defconfig b/nuttx/configs/stm3220g-eval/ostest/defconfig
index 8f1020a70..d26b7ccd6 100644
--- a/nuttx/configs/stm3220g-eval/ostest/defconfig
+++ b/nuttx/configs/stm3220g-eval/ostest/defconfig
@@ -697,7 +697,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/stm3240g-eval/nsh/defconfig b/nuttx/configs/stm3240g-eval/nsh/defconfig
index ec7a39ec8..1b69df006 100644
--- a/nuttx/configs/stm3240g-eval/nsh/defconfig
+++ b/nuttx/configs/stm3240g-eval/nsh/defconfig
@@ -809,7 +809,7 @@ CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
 CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/stm3240g-eval/nxconsole/defconfig b/nuttx/configs/stm3240g-eval/nxconsole/defconfig
index 926660168..19d738085 100644
--- a/nuttx/configs/stm3240g-eval/nxconsole/defconfig
+++ b/nuttx/configs/stm3240g-eval/nxconsole/defconfig
@@ -768,7 +768,7 @@ CONFIG_EXAMPLES_NXLINES_BPP=16
 CONFIG_EXAMPLES_NXLINES_EXTERNINIT=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/stm3240g-eval/nxwm/defconfig b/nuttx/configs/stm3240g-eval/nxwm/defconfig
index 3db718849..03534de40 100644
--- a/nuttx/configs/stm3240g-eval/nxwm/defconfig
+++ b/nuttx/configs/stm3240g-eval/nxwm/defconfig
@@ -836,7 +836,7 @@ CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
 CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/stm3240g-eval/webserver/defconfig b/nuttx/configs/stm3240g-eval/webserver/defconfig
index 959e6532c..8b7ba750b 100644
--- a/nuttx/configs/stm3240g-eval/webserver/defconfig
+++ b/nuttx/configs/stm3240g-eval/webserver/defconfig
@@ -804,7 +804,7 @@ CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
 CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/sure-pic32mx/README.txt b/nuttx/configs/sure-pic32mx/README.txt
index c15f7d082..c3fbfc2fe 100644
--- a/nuttx/configs/sure-pic32mx/README.txt
+++ b/nuttx/configs/sure-pic32mx/README.txt
@@ -735,7 +735,7 @@ Where <subdir> is one of the following:
         Drivers->USB Device Driver Support
           CONFIG_CDCACM=y           : Enable the CDCACM device
 
-      examples/usbstorage - There are some hooks in the appconfig file
+      examples/usbmsc - There are some hooks in the appconfig file
       to enable the USB mass storage class (MSC)device.  However, this device
       cannot work until support for the SD card is also incorporated.
 
@@ -743,7 +743,7 @@ Where <subdir> is one of the following:
           CONFIG_USBMSC=y           : Enables the USB MSC class
 
         Application Configuration->Examples:
-          CONFIG_EXAMPLES_USBSTORAGE=y  : Enhables apps/examples/usbstorage
+          CONFIG_EXAMPLES_USBSTORAGE=y  : Enhables apps/examples/usbmsc
 
     3. SD Card Support.
 
diff --git a/nuttx/configs/teensy/README.txt b/nuttx/configs/teensy/README.txt
index 51dcbd553..897d3b234 100644
--- a/nuttx/configs/teensy/README.txt
+++ b/nuttx/configs/teensy/README.txt
@@ -536,15 +536,15 @@ Where <subdir> is one of the following:
     to get it to fit within AVR memory constraints, it will probably be
     necessary to disable some OS features.
 
-  usbstorage:
+  usbmsc:
     This configuration directory exercises the USB mass storage
-    class driver at apps/examples/usbstorage.  See apps/examples/README.txt
+    class driver at apps/examples/usbmsc.  See apps/examples/README.txt
     for more information.  NOTE:  THIS CONFIGURATION HAS NOT YET BEEN
     DEBUGGED AND DOES NOT WORK!!!  ISSUES:  (1) THE SPI DRIVER IS UNTESTED,
     (2) THE USB DRIVER IS UNTESTED, AND (3) THE RAM USAGE MIGHT BE EXCESSIVE.
 
     Update 7/11:  (1) The SPI/SD driver has been verified, however, (2) I
-    believe that the current teensy/usbstorage configuration uses too
+    believe that the current teensy/usbmsc configuration uses too
     much SRAM for the system to behave sanely.  A lower memory footprint
     version of the mass storage driver will be required before this can
     be debugged
diff --git a/nuttx/configs/teensy/hello/defconfig b/nuttx/configs/teensy/hello/defconfig
index 77e69d0b5..1cb97f3cd 100644
--- a/nuttx/configs/teensy/hello/defconfig
+++ b/nuttx/configs/teensy/hello/defconfig
@@ -393,7 +393,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/teensy/usbstorage/Make.defs b/nuttx/configs/teensy/usbmsc/Make.defs
index da316dd26..9948f9655 100644
--- a/nuttx/configs/teensy/usbstorage/Make.defs
+++ b/nuttx/configs/teensy/usbmsc/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/teensy/usbstorage/Make.defs
+# configs/teensy/usbmsc/Make.defs
 #
 #   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y)
   MKDEP = $(TOPDIR)/tools/mknulldeps.sh
   ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
   ARCHXXINCLUDES = $(ARCHINCLUDES) "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/usbstorage/ld.script}"
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/usbmsc/ld.script}"
 else
   # Linux/Cygwin-native toolchain 
   MKDEP = $(TOPDIR)/tools/mkdeps.sh
   ARCHINCLUDES = -I. -isystem "$(TOPDIR)/include"
   ARCHXXINCLUDES =  $(ARCHINCLUDES) -isystem "$(TOPDIR)/include/cxx"
-  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/usbstorage/ld.script
+  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/usbmsc/ld.script
 endif
 
 CC = $(CROSSDEV)gcc
diff --git a/nuttx/configs/teensy/usbmsc/appconfig b/nuttx/configs/teensy/usbmsc/appconfig
new file mode 100644
index 000000000..0e5057ce4
--- /dev/null
+++ b/nuttx/configs/teensy/usbmsc/appconfig
@@ -0,0 +1,39 @@
+############################################################################
+# configs/teensy/usbmsc/appconfig
+#
+#   Copyright (C) 2011 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.
+#
+############################################################################
+
+# Path to example in apps/examples containing the user_start entry point
+
+CONFIGURED_APPS += examples/usbmsc
+
diff --git a/nuttx/configs/teensy/usbstorage/defconfig b/nuttx/configs/teensy/usbmsc/defconfig
index 16bd23cda..adc626bc4 100755
--- a/nuttx/configs/teensy/usbstorage/defconfig
+++ b/nuttx/configs/teensy/usbmsc/defconfig
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/teensy/usbstorage/defconfig
+# configs/teensy/usbmsc/defconfig
 #
 #   Copyright (C) 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -412,7 +412,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
diff --git a/nuttx/configs/teensy/usbstorage/ld.script b/nuttx/configs/teensy/usbmsc/ld.script
index 54163f002..9ee8e9178 100755
--- a/nuttx/configs/teensy/usbstorage/ld.script
+++ b/nuttx/configs/teensy/usbmsc/ld.script
@@ -1,5 +1,5 @@
 /**************************************************************************************
- * configs/teensy/usbstorage/ld.script
+ * configs/teensy/usbmsc/ld.script
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/teensy/usbstorage/setenv.sh b/nuttx/configs/teensy/usbmsc/setenv.sh
index 2f80197c3..e248c5f71 100755
--- a/nuttx/configs/teensy/usbstorage/setenv.sh
+++ b/nuttx/configs/teensy/usbmsc/setenv.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# configs/teensy/usbstorage/setenv.sh
+# configs/teensy/usbmsc/setenv.sh
 #
 #   Copyright (C) 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/ubw32/nsh/appconfig b/nuttx/configs/ubw32/nsh/appconfig
index 14e06cc4c..5760a5b4a 100644
--- a/nuttx/configs/ubw32/nsh/appconfig
+++ b/nuttx/configs/ubw32/nsh/appconfig
@@ -55,8 +55,8 @@ ifeq ($(CONFIG_PIC32MX_USBDEV),y)
 # USB Mass Storage Class device configurations
 
 ifeq ($(CONFIG_USBMSC),y)
-#  Uncomment to enable the examples/usbstorage built-in
-#  CONFIGURED_APPS += examples/usbstorage
+#  Uncomment to enable the examples/usbmsc built-in
+#  CONFIGURED_APPS += examples/usbmsc
 endif
 
 # USB CDC/ACM serial device configurations
diff --git a/nuttx/configs/ubw32/nsh/defconfig b/nuttx/configs/ubw32/nsh/defconfig
index 8e0e17535..3aba8ab51 100644
--- a/nuttx/configs/ubw32/nsh/defconfig
+++ b/nuttx/configs/ubw32/nsh/defconfig
@@ -470,7 +470,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbstorage
+# Settings for examples/usbmsc
 #
 CONFIG_EXAMPLES_USBMSC_NLUNS=1
 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
author	Gregory Nutt <gnutt@nuttx.org>	2013-09-05 08:07:03 -0600
committer	Gregory Nutt <gnutt@nuttx.org>	2013-09-05 08:07:03 -0600
commit	39b2be1e80f5e15b431456a7ab18ab2edf05a3a1 (patch)
tree	fd7939068ef642b851d41a52ed2653ca71fe7a3d /nuttx
parent	63490f1443d979623b3cf06232e34413506dfc94 (diff)
download	nuttx-39b2be1e80f5e15b431456a7ab18ab2edf05a3a1.tar.gz nuttx-39b2be1e80f5e15b431456a7ab18ab2edf05a3a1.tar.bz2 nuttx-39b2be1e80f5e15b431456a7ab18ab2edf05a3a1.zip