Tried to get the Composite driver working on the LPC2148 (and failed)

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4362 42af7a65-404d-4744-a932-0658087f49c3

10 files changed, 386 insertions, 37 deletions

diff --git a/nuttx/configs/mcu123-lpc214x/README.txt b/nuttx/configs/mcu123-lpc214x/README.txt
index b2f8dd2f9..c11a156b7 100644
--- a/nuttx/configs/mcu123-lpc214x/README.txt
+++ b/nuttx/configs/mcu123-lpc214x/README.txt
@@ -4,6 +4,20 @@ README
 This README discusses issues unique to NuttX configurations for the
 MCU-123 LPC2148 development board.
 
+Contents
+--------
+
+  o Development Environment
+  o GNU Toolchain Options
+  o NuttX buildroot Toolchain
+  o Flash Tools
+    - In System Programming (ISP) Mode
+    - LPC21ISP (Linux)
+    - FlashMagic (Windows/MAC)
+    - OpenOCD
+  o ARM/LPC214X-specific Configuration Options
+  o Configurations
+
 Development Environment
 ^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -115,9 +129,29 @@ NuttX buildroot Toolchain
 Flash Tools
 ^^^^^^^^^^^
 
+In System Programming (ISP) Mode
+--------------------------------
+
+1. Make sure you exit minicom (or whatever terminal emulator you are
+   using).  It will interfere with the download.
+
+2. On the MCU123 board, I need to put a jumper on JP3-INT. On that board,
+   JP3-INT is connected to P0.14 of LPC214x. When P0.14 is low and RTS is
+   changed from high to low, the LPC214x will enter ISP (In System
+   Programming) state.
+
+   Alternatively, you can just press the INT1 button while resetting.
+   The LEDs will be off if the LPC2148 successfully enters ISP mode.
+
+Resetting the board will enter ISP mode when the jumper is connected.
+
+LPC21ISP (Linux)
+----------------
+
+(ca. 2008)
 I use the lpc21isp tool to load NuttX into FLASH.  That tool is available
 in the files section at http://tech.groups.yahoo.com/group/lpc21isp/.  In
-order version 1.60 of lpc21isp for Linux, I had to make several changes.
+the older version 1.60 of lpc21isp for Linux, I had to make several changes.
 This changes are shown in lpc21ips-1.60.diff.
 
 I use the script lpc21isp.sh to perform the actual download.  You will
@@ -129,20 +163,60 @@ entering ISP mode).
 
 Here are the detailed steps I use:
 
-1. Make sure you exit minicom (or whatever terminal emulator you are
-   using).  It will interfere with the download.
-
-2. On the MCU123 board, I need to put a jumper on JP3-INT. On that board,
-   JP3-INT is connected to P0.14 of LPC214x. When P0.14 is low and RTS is
-   changed from high to low, the LPC214x will enter ISP (In System Programming) 
-   state.
+1. Setup ISP (In System Programming) mode (see above).
 
 3. Start lpc21isp.sh
 
-4. Reset the board
+4. Reset the board to 
+
+FlashMagic (Windows/MAC)
+------------------------
+
+(ca. 2012)
+You download FlashMagic for Windows or MAC here: http://www.flashmagictool.com
+
+1. Setup ISP (In System Programming) mode (see above).
+
+2. Start FlashMagic and setup communication parameters.
+
+   Device:           LPC2148
+   COM Port:         (will vary with PC)
+   Baud:             38400 (I am sure it can go faster).
+   Interface:        None (ISP)
+   Oscillator (MHz): 12
+
+   Check "Erase all Flash+Code Rd Prot"
+
+3. Select the nuttx.hex file (you will have to rename the nuttx.ihx
+   file generated by the make to nuttx.hex in order for the tool to
+   see it
+
+4. Options: Verify after programming
+
+5. Start and reset the board to entry ISP mode.  Or hold the INT1
+   button down after reset after you press start.
+
+NOTE:  FlashMagic will complain if the data section overlaps 
+       0x4000000-0x400001ff.
 
+OpenOCD
+-------
+
+I have the (really old) Olimex software installed at C:/gccfd.  Under
+Cygwin, I can do the following:
+
+1. Create a .cfg file:
+
+   $ cat /cygdrive/c/gccfd/openocd/lib/openocd/interface/arm-usb-ocd.cfg /cygdrive/c/gccfd/openocd/lib/openocd/target/lpc2148.cfg > lpc2148.cfg 
+
+2. Start OpenOCD:
+
+   /cygdrive/c/gccfd/openocd/bin/openocd-ftd2xx.exe -f lpc2148.cfg -s . &
+
+3. Start arm-*-gdb (whichever GDB your toolchain uses).
+   
 ARM/LPC214X-specific Configuration Options
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 	CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
 	   be set to:
@@ -264,20 +338,58 @@ can be selected as follow:
 
 Where <subdir> is one of the following:
 
-ostest:
-  This configuration directory, performs a simple OS test using
-  examples/ostest.
+composite:
+----------
+
+  A simple test of the USB Composite Device (see
+  apps/examples/README.txt and apps/examples/composite)
+
+  Default toolchain:  CodeSourcery for Windows
+  Output format:  ELF and Intel HEX
+
+  NOTE:  I could not get this to work!  Perhaps this is a
+  consequence of the last USB driver checking (r3170)
 
 nsh:
+----
+
   Configures the NuttShell (nsh) located at examples/nsh.  The
   Configuration enables only the serial NSH interfaces.
 
+  Default toolchain:  Buildroot
+  Output format:  ELF and binary
+
+ostest:
+-------
+
+  This configuration directory, performs a simple OS test using
+  examples/ostest.
+
+  Default toolchain:  Buildroot
+  Output format:  ELF and binary
+
 usbserial:
+----------
+
   This configuration directory exercises the USB serial class
   driver at examples/usbserial.  See examples/README.txt for
   more information.
 
+  Default toolchain:  Buildroot
+  Output format:  ELF and binary
+
+  NOTE:  If you have problems with this configurationt, perhaps it is a
+  consequence of the last USB driver checking (r3170)
+
 usbstorage:
+-----------
+
   This configuration directory exercises the USB mass storage
   class driver at examples/usbstorage.  See examples/README.txt for
   more information.
+
+  Default toolchain:  Buildroot
+  Output format:  ELF and binary
+
+  NOTE:  If you have problems with this configurationt, perhaps it is a
+  consequence of the last USB driver checking (r3170)
diff --git a/nuttx/configs/mcu123-lpc214x/composite/Make.defs b/nuttx/configs/mcu123-lpc214x/composite/Make.defs
index d6dfa3807..c6aa4cd6b 100644
--- a/nuttx/configs/mcu123-lpc214x/composite/Make.defs
+++ b/nuttx/configs/mcu123-lpc214x/composite/Make.defs
@@ -36,12 +36,13 @@
 include ${TOPDIR}/.config
 
 # The default value for CROSSDEV can be overridden from the make command line:
-#   make                         -- Will build for the NuttX buildroot toolchain
+#   make                         -- Will build for the CodeSourcery toolchain
+#   make CROSSDEV=arm-elf-       -- Will build for the NuttX buildroot toolchain
 #   make CROSSDEV=arm-eabi-      -- Will build for the devkitARM toolchain
 #   make CROSSDEV=arm-none-eabi- -- Will build for the CodeSourcery toolchain
 #   make CROSSDEV=arm-elf-       -- Will build for the NuttX buildroot toolchain
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-none-eabi-
 CC			= $(CROSSDEV)gcc
 CXX			= $(CROSSDEV)g++
 CPP			= $(CROSSDEV)gcc -E
diff --git a/nuttx/configs/mcu123-lpc214x/composite/defconfig b/nuttx/configs/mcu123-lpc214x/composite/defconfig
index 9ad8a8e2b..f8efcb263 100644
--- a/nuttx/configs/mcu123-lpc214x/composite/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/composite/defconfig
@@ -126,14 +126,18 @@ CONFIG_UART1_2STOP=0
 # CONFIG_INTELHEX_BINARY - make the Intel HEX binary format
 #   used with many different loaders using the GNU objcopy program
 #   Should not be selected if you are not using the GNU toolchain.
+# CONFIG_MOTOROLA_SREC - make the Motorola S-Record binary format
+#   used with many different loaders using the GNU objcopy program
+#   Should not be selected if you are not using the GNU toolchain.
 # CONFIG_RAW_BINARY - make a raw binary format file used with many
 #   different loaders using the GNU objcopy program.  This option
 #   should not be selected if you are not using the GNU toolchain.
 # CONFIG_HAVE_LIBM - toolchain supports libm.a
 #
 CONFIG_RRLOAD_BINARY=n
-CONFIG_INTELHEX_BINARY=n
-CONFIG_RAW_BINARY=y
+CONFIG_INTELHEX_BINARY=y
+CONFIG_MOTOROLA_SREC=n
+CONFIG_RAW_BINARY=n
 CONFIG_HAVE_LIBM=n
 
 #
@@ -332,8 +336,49 @@ CONFIG_PREALLOC_TIMERS=4
 #
 # CONFIG_FS_FAT - Enable FAT filesystem support
 # CONFIG_FAT_SECTORSIZE - Max supported sector size
+# CONFIG_FAT_LCNAMES - Enable use of the NT-style upper/lower case 8.3
+#   file name support.
+# CONFIG_FAT_LFN - Enable FAT long file names.  NOTE:  Microsoft claims
+#   patents on FAT long file name technology.  Please read the
+#   disclaimer in the top-level COPYING file and only enable this
+#   feature if you understand these issues.
+# CONFIG_FAT_MAXFNAME - If CONFIG_FAT_LFN is defined, then the
+#   default, maximum long file name is 255 bytes.  This can eat up
+#   a lot of memory (especially stack space).  If you are willing
+#   to live with some non-standard, short long file names, then
+#   define this value.  A good choice would be the same value as
+#   selected for CONFIG_NAME_MAX which will limit the visibility
+#   of longer file names anyway.
+# CONFIG_FS_NXFFS: Enable NuttX FLASH file system (NXFF) support.
+# CONFIG_NXFFS_ERASEDSTATE: The erased state of FLASH. 
+#   This must have one of the values of 0xff or 0x00.
+#   Default: 0xff.
+# CONFIG_NXFFS_PACKTHRESHOLD: When packing flash file data,
+#   don't both with file chunks smaller than this number of data bytes.
+# CONFIG_NXFFS_MAXNAMLEN: The maximum size of an NXFFS file name.
+#   Default: 255.
+# CONFIG_NXFFS_PACKTHRESHOLD: When packing flash file data,
+#   don't both with file chunks smaller than this number of data bytes.
+#   Default: 32.
+# CONFIG_NXFFS_TAILTHRESHOLD: clean-up can either mean
+#   packing files together toward the end of the file or, if file are
+#   deleted at the end of the file, clean up can simply mean erasing
+#   the end of FLASH memory so that it can be re-used again.  However,
+#   doing this can also harm the life of the FLASH part because it can
+#   mean that the tail end of the FLASH is re-used too often. This
+#   threshold determines if/when it is worth erased the tail end of FLASH
+#   and making it available for re-use (and possible over-wear).
+#   Default: 8192.
 # CONFIG_FS_ROMFS - Enable ROMFS filesystem support
+# CONFIG_FS_RAMMAP - For file systems that do not support XIP, this
+#   option will enable a limited form of memory mapping that is
+#   implemented by copying whole files into memory.
+#
 CONFIG_FS_FAT=n
+CONFIG_FAT_LCNAMES=y
+CONFIG_FAT_LFN=y
+CONFIG_FAT_MAXFNAME=32
+CONFIG_FS_NXFFS=n
 CONFIG_FS_ROMFS=n
 
 #
diff --git a/nuttx/configs/mcu123-lpc214x/composite/ld.script b/nuttx/configs/mcu123-lpc214x/composite/ld.script
index c97a2222f..4065f2991 100644
--- a/nuttx/configs/mcu123-lpc214x/composite/ld.script
+++ b/nuttx/configs/mcu123-lpc214x/composite/ld.script
@@ -40,14 +40,15 @@
  *
  * SRAM:
  *   The lpc2148 has 32Kb of on-chip static RAM beginning at address
- *   0x40000000.  The .data section will be relocated from _eronly
+ *   0x40000000. The first 512 bytes of RAM are reserved for used by
+ *   the bootloader.  The .data section will be relocated from _eronly
  *   to _sdata at boot time.
  */
 
 MEMORY
 {
 	flash (rx) : ORIGIN = 0x00000000, LENGTH = 500K
-	sram  (rw) : ORIGIN = 0x40000000, LENGTH = 32K - 32
+	sram  (rw) : ORIGIN = 0x40000200, LENGTH = 32K - 512 - 32
 }
 
 OUTPUT_ARCH(arm)
diff --git a/nuttx/configs/mcu123-lpc214x/composite/setenv.sh b/nuttx/configs/mcu123-lpc214x/composite/setenv.sh
index 58e78a92d..f2fb6cb4c 100755
--- a/nuttx/configs/mcu123-lpc214x/composite/setenv.sh
+++ b/nuttx/configs/mcu123-lpc214x/composite/setenv.sh
@@ -50,11 +50,11 @@ fi
 # This the Cygwin path to the location where I installed the CodeSourcery
 # toolchain under windows.  You will also have to edit this if you install
 # the CodeSourcery toolchain in any other location
-#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
+export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
 
 # This the Cygwin path to the location where I build the buildroot
 # toolchain.
-export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+#export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
 # This is the Cygwin path to the configuration scripts directory
 
diff --git a/nuttx/configs/mcu123-lpc214x/nsh/defconfig b/nuttx/configs/mcu123-lpc214x/nsh/defconfig
index 5c4b847b1..650621985 100644
--- a/nuttx/configs/mcu123-lpc214x/nsh/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/nsh/defconfig
@@ -1,8 +1,8 @@
 ############################################################################
 # configs/mcu123-lpc214x/nsh/defconfig
 #
-#   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Copyright (C) 2008-2010, 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
@@ -126,6 +126,9 @@ CONFIG_UART1_2STOP=0
 # CONFIG_INTELHEX_BINARY - make the Intel HEX binary format
 #   used with many different loaders using the GNU objcopy program
 #   Should not be selected if you are not using the GNU toolchain.
+# CONFIG_MOTOROLA_SREC - make the Motorola S-Record binary format
+#   used with many different loaders using the GNU objcopy program
+#   Should not be selected if you are not using the GNU toolchain.
 # CONFIG_RAW_BINARY - make a raw binary format file used with many
 #   different loaders using the GNU objcopy program.  This option
 #   should not be selected if you are not using the GNU toolchain.
@@ -133,6 +136,7 @@ CONFIG_UART1_2STOP=0
 #
 CONFIG_RRLOAD_BINARY=n
 CONFIG_INTELHEX_BINARY=n
+CONFIG_MOTOROLA_SREC=n
 CONFIG_RAW_BINARY=y
 CONFIG_HAVE_LIBM=n
 
@@ -331,8 +335,49 @@ CONFIG_PREALLOC_TIMERS=4
 #
 # CONFIG_FS_FAT - Enable FAT filesystem support
 # CONFIG_FAT_SECTORSIZE - Max supported sector size
+# CONFIG_FAT_LCNAMES - Enable use of the NT-style upper/lower case 8.3
+#   file name support.
+# CONFIG_FAT_LFN - Enable FAT long file names.  NOTE:  Microsoft claims
+#   patents on FAT long file name technology.  Please read the
+#   disclaimer in the top-level COPYING file and only enable this
+#   feature if you understand these issues.
+# CONFIG_FAT_MAXFNAME - If CONFIG_FAT_LFN is defined, then the
+#   default, maximum long file name is 255 bytes.  This can eat up
+#   a lot of memory (especially stack space).  If you are willing
+#   to live with some non-standard, short long file names, then
+#   define this value.  A good choice would be the same value as
+#   selected for CONFIG_NAME_MAX which will limit the visibility
+#   of longer file names anyway.
+# CONFIG_FS_NXFFS: Enable NuttX FLASH file system (NXFF) support.
+# CONFIG_NXFFS_ERASEDSTATE: The erased state of FLASH. 
+#   This must have one of the values of 0xff or 0x00.
+#   Default: 0xff.
+# CONFIG_NXFFS_PACKTHRESHOLD: When packing flash file data,
+#   don't both with file chunks smaller than this number of data bytes.
+# CONFIG_NXFFS_MAXNAMLEN: The maximum size of an NXFFS file name.
+#   Default: 255.
+# CONFIG_NXFFS_PACKTHRESHOLD: When packing flash file data,
+#   don't both with file chunks smaller than this number of data bytes.
+#   Default: 32.
+# CONFIG_NXFFS_TAILTHRESHOLD: clean-up can either mean
+#   packing files together toward the end of the file or, if file are
+#   deleted at the end of the file, clean up can simply mean erasing
+#   the end of FLASH memory so that it can be re-used again.  However,
+#   doing this can also harm the life of the FLASH part because it can
+#   mean that the tail end of the FLASH is re-used too often. This
+#   threshold determines if/when it is worth erased the tail end of FLASH
+#   and making it available for re-use (and possible over-wear).
+#   Default: 8192.
 # CONFIG_FS_ROMFS - Enable ROMFS filesystem support
+# CONFIG_FS_RAMMAP - For file systems that do not support XIP, this
+#   option will enable a limited form of memory mapping that is
+#   implemented by copying whole files into memory.
+#
 CONFIG_FS_FAT=y
+CONFIG_FAT_LCNAMES=y
+CONFIG_FAT_LFN=y
+CONFIG_FAT_MAXFNAME=32
+CONFIG_FS_NXFFS=n
 CONFIG_FS_ROMFS=n
 
 #
diff --git a/nuttx/configs/mcu123-lpc214x/ostest/defconfig b/nuttx/configs/mcu123-lpc214x/ostest/defconfig
index 923d1b39c..48ce72937 100644
--- a/nuttx/configs/mcu123-lpc214x/ostest/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/ostest/defconfig
@@ -1,8 +1,8 @@
 ############################################################################
 # configs/mcu123-lpc214x/ostest/defconfig
 #
-#   Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Copyright (C) 2007-2010, 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
@@ -126,6 +126,9 @@ CONFIG_UART1_2STOP=0
 # CONFIG_INTELHEX_BINARY - make the Intel HEX binary format
 #   used with many different loaders using the GNU objcopy program
 #   Should not be selected if you are not using the GNU toolchain.
+# CONFIG_MOTOROLA_SREC - make the Motorola S-Record binary format
+#   used with many different loaders using the GNU objcopy program
+#   Should not be selected if you are not using the GNU toolchain.
 # CONFIG_RAW_BINARY - make a raw binary format file used with many
 #   different loaders using the GNU objcopy program.  This option
 #   should not be selected if you are not using the GNU toolchain.
@@ -133,6 +136,7 @@ CONFIG_UART1_2STOP=0
 #
 CONFIG_RRLOAD_BINARY=n
 CONFIG_INTELHEX_BINARY=n
+CONFIG_MOTOROLA_SREC=n
 CONFIG_RAW_BINARY=y
 CONFIG_HAVE_LIBM=n
 
@@ -331,8 +335,49 @@ CONFIG_PREALLOC_TIMERS=4
 #
 # CONFIG_FS_FAT - Enable FAT filesystem support
 # CONFIG_FAT_SECTORSIZE - Max supported sector size
+# CONFIG_FAT_LCNAMES - Enable use of the NT-style upper/lower case 8.3
+#   file name support.
+# CONFIG_FAT_LFN - Enable FAT long file names.  NOTE:  Microsoft claims
+#   patents on FAT long file name technology.  Please read the
+#   disclaimer in the top-level COPYING file and only enable this
+#   feature if you understand these issues.
+# CONFIG_FAT_MAXFNAME - If CONFIG_FAT_LFN is defined, then the
+#   default, maximum long file name is 255 bytes.  This can eat up
+#   a lot of memory (especially stack space).  If you are willing
+#   to live with some non-standard, short long file names, then
+#   define this value.  A good choice would be the same value as
+#   selected for CONFIG_NAME_MAX which will limit the visibility
+#   of longer file names anyway.
+# CONFIG_FS_NXFFS: Enable NuttX FLASH file system (NXFF) support.
+# CONFIG_NXFFS_ERASEDSTATE: The erased state of FLASH. 
+#   This must have one of the values of 0xff or 0x00.
+#   Default: 0xff.
+# CONFIG_NXFFS_PACKTHRESHOLD: When packing flash file data,
+#   don't both with file chunks smaller than this number of data bytes.
+# CONFIG_NXFFS_MAXNAMLEN: The maximum size of an NXFFS file name.
+#   Default: 255.
+# CONFIG_NXFFS_PACKTHRESHOLD: When packing flash file data,
+#   don't both with file chunks smaller than this number of data bytes.
+#   Default: 32.
+# CONFIG_NXFFS_TAILTHRESHOLD: clean-up can either mean
+#   packing files together toward the end of the file or, if file are
+#   deleted at the end of the file, clean up can simply mean erasing
+#   the end of FLASH memory so that it can be re-used again.  However,
+#   doing this can also harm the life of the FLASH part because it can
+#   mean that the tail end of the FLASH is re-used too often. This
+#   threshold determines if/when it is worth erased the tail end of FLASH
+#   and making it available for re-use (and possible over-wear).
+#   Default: 8192.
 # CONFIG_FS_ROMFS - Enable ROMFS filesystem support
+# CONFIG_FS_RAMMAP - For file systems that do not support XIP, this
+#   option will enable a limited form of memory mapping that is
+#   implemented by copying whole files into memory.
+#
 CONFIG_FS_FAT=n
+CONFIG_FAT_LCNAMES=y
+CONFIG_FAT_LFN=y
+CONFIG_FAT_MAXFNAME=32
+CONFIG_FS_NXFFS=n
 CONFIG_FS_ROMFS=n
 
 #
diff --git a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig
index 109712125..32e1b5f85 100644
--- a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig
@@ -1,8 +1,8 @@
 ############################################################################
 # configs/mcu123-lpc214x/usbserial/defconfig
 #
-#   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Copyright (C) 2008-2010, 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
@@ -126,6 +126,9 @@ CONFIG_UART1_2STOP=0
 # CONFIG_INTELHEX_BINARY - make the Intel HEX binary format
 #   used with many different loaders using the GNU objcopy program
 #   Should not be selected if you are not using the GNU toolchain.
+# CONFIG_MOTOROLA_SREC - make the Motorola S-Record binary format
+#   used with many different loaders using the GNU objcopy program
+#   Should not be selected if you are not using the GNU toolchain.
 # CONFIG_RAW_BINARY - make a raw binary format file used with many
 #   different loaders using the GNU objcopy program.  This option
 #   should not be selected if you are not using the GNU toolchain.
@@ -133,6 +136,7 @@ CONFIG_UART1_2STOP=0
 #
 CONFIG_RRLOAD_BINARY=n
 CONFIG_INTELHEX_BINARY=n
+CONFIG_MOTOROLA_SREC=n
 CONFIG_RAW_BINARY=y
 CONFIG_HAVE_LIBM=n
 
@@ -331,8 +335,49 @@ CONFIG_PREALLOC_TIMERS=4
 #
 # CONFIG_FS_FAT - Enable FAT filesystem support
 # CONFIG_FAT_SECTORSIZE - Max supported sector size
+# CONFIG_FAT_LCNAMES - Enable use of the NT-style upper/lower case 8.3
+#   file name support.
+# CONFIG_FAT_LFN - Enable FAT long file names.  NOTE:  Microsoft claims
+#   patents on FAT long file name technology.  Please read the
+#   disclaimer in the top-level COPYING file and only enable this
+#   feature if you understand these issues.
+# CONFIG_FAT_MAXFNAME - If CONFIG_FAT_LFN is defined, then the
+#   default, maximum long file name is 255 bytes.  This can eat up
+#   a lot of memory (especially stack space).  If you are willing
+#   to live with some non-standard, short long file names, then
+#   define this value.  A good choice would be the same value as
+#   selected for CONFIG_NAME_MAX which will limit the visibility
+#   of longer file names anyway.
+# CONFIG_FS_NXFFS: Enable NuttX FLASH file system (NXFF) support.
+# CONFIG_NXFFS_ERASEDSTATE: The erased state of FLASH. 
+#   This must have one of the values of 0xff or 0x00.
+#   Default: 0xff.
+# CONFIG_NXFFS_PACKTHRESHOLD: When packing flash file data,
+#   don't both with file chunks smaller than this number of data bytes.
+# CONFIG_NXFFS_MAXNAMLEN: The maximum size of an NXFFS file name.
+#   Default: 255.
+# CONFIG_NXFFS_PACKTHRESHOLD: When packing flash file data,
+#   don't both with file chunks smaller than this number of data bytes.
+#   Default: 32.
+# CONFIG_NXFFS_TAILTHRESHOLD: clean-up can either mean
+#   packing files together toward the end of the file or, if file are
+#   deleted at the end of the file, clean up can simply mean erasing
+#   the end of FLASH memory so that it can be re-used again.  However,
+#   doing this can also harm the life of the FLASH part because it can
+#   mean that the tail end of the FLASH is re-used too often. This
+#   threshold determines if/when it is worth erased the tail end of FLASH
+#   and making it available for re-use (and possible over-wear).
+#   Default: 8192.
 # CONFIG_FS_ROMFS - Enable ROMFS filesystem support
+# CONFIG_FS_RAMMAP - For file systems that do not support XIP, this
+#   option will enable a limited form of memory mapping that is
+#   implemented by copying whole files into memory.
+#
 CONFIG_FS_FAT=n
+CONFIG_FAT_LCNAMES=y
+CONFIG_FAT_LFN=y
+CONFIG_FAT_MAXFNAME=32
+CONFIG_FS_NXFFS=n
 CONFIG_FS_ROMFS=n
 
 #
diff --git a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig
index e7ebfb70b..9f525b7f1 100644
--- a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig
@@ -1,8 +1,8 @@
 ############################################################################
 # configs/mcu123-lpc214x/usbstorage/defconfig
 #
-#   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Copyright (C) 2008-2010, 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
@@ -126,6 +126,9 @@ CONFIG_UART1_2STOP=0
 # CONFIG_INTELHEX_BINARY - make the Intel HEX binary format
 #   used with many different loaders using the GNU objcopy program
 #   Should not be selected if you are not using the GNU toolchain.
+# CONFIG_MOTOROLA_SREC - make the Motorola S-Record binary format
+#   used with many different loaders using the GNU objcopy program
+#   Should not be selected if you are not using the GNU toolchain.
 # CONFIG_RAW_BINARY - make a raw binary format file used with many
 #   different loaders using the GNU objcopy program.  This option
 #   should not be selected if you are not using the GNU toolchain.
@@ -133,6 +136,7 @@ CONFIG_UART1_2STOP=0
 #
 CONFIG_RRLOAD_BINARY=n
 CONFIG_INTELHEX_BINARY=n
+CONFIG_MOTOROLA_SREC=n
 CONFIG_RAW_BINARY=y
 CONFIG_HAVE_LIBM=n
 
@@ -332,8 +336,49 @@ CONFIG_PREALLOC_TIMERS=4
 #
 # CONFIG_FS_FAT - Enable FAT filesystem support
 # CONFIG_FAT_SECTORSIZE - Max supported sector size
+# CONFIG_FAT_LCNAMES - Enable use of the NT-style upper/lower case 8.3
+#   file name support.
+# CONFIG_FAT_LFN - Enable FAT long file names.  NOTE:  Microsoft claims
+#   patents on FAT long file name technology.  Please read the
+#   disclaimer in the top-level COPYING file and only enable this
+#   feature if you understand these issues.
+# CONFIG_FAT_MAXFNAME - If CONFIG_FAT_LFN is defined, then the
+#   default, maximum long file name is 255 bytes.  This can eat up
+#   a lot of memory (especially stack space).  If you are willing
+#   to live with some non-standard, short long file names, then
+#   define this value.  A good choice would be the same value as
+#   selected for CONFIG_NAME_MAX which will limit the visibility
+#   of longer file names anyway.
+# CONFIG_FS_NXFFS: Enable NuttX FLASH file system (NXFF) support.
+# CONFIG_NXFFS_ERASEDSTATE: The erased state of FLASH. 
+#   This must have one of the values of 0xff or 0x00.
+#   Default: 0xff.
+# CONFIG_NXFFS_PACKTHRESHOLD: When packing flash file data,
+#   don't both with file chunks smaller than this number of data bytes.
+# CONFIG_NXFFS_MAXNAMLEN: The maximum size of an NXFFS file name.
+#   Default: 255.
+# CONFIG_NXFFS_PACKTHRESHOLD: When packing flash file data,
+#   don't both with file chunks smaller than this number of data bytes.
+#   Default: 32.
+# CONFIG_NXFFS_TAILTHRESHOLD: clean-up can either mean
+#   packing files together toward the end of the file or, if file are
+#   deleted at the end of the file, clean up can simply mean erasing
+#   the end of FLASH memory so that it can be re-used again.  However,
+#   doing this can also harm the life of the FLASH part because it can
+#   mean that the tail end of the FLASH is re-used too often. This
+#   threshold determines if/when it is worth erased the tail end of FLASH
+#   and making it available for re-use (and possible over-wear).
+#   Default: 8192.
 # CONFIG_FS_ROMFS - Enable ROMFS filesystem support
+# CONFIG_FS_RAMMAP - For file systems that do not support XIP, this
+#   option will enable a limited form of memory mapping that is
+#   implemented by copying whole files into memory.
+#
 CONFIG_FS_FAT=n
+CONFIG_FAT_LCNAMES=y
+CONFIG_FAT_LFN=y
+CONFIG_FAT_MAXFNAME=32
+CONFIG_FS_NXFFS=n
 CONFIG_FS_ROMFS=n
 
 #
diff --git a/nuttx/configs/stm3240g-eval/README.txt b/nuttx/configs/stm3240g-eval/README.txt
index 5421e8593..119c5b0cd 100755
--- a/nuttx/configs/stm3240g-eval/README.txt
+++ b/nuttx/configs/stm3240g-eval/README.txt
@@ -583,14 +583,6 @@ Where <subdir> is one of the following:
     CONFIG_EXAMPLE_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) : Host side is IP: 10.0.0.1
     CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) : Server address used by which ever is client.
 
-  ostest:
-  ------
-    This configuration directory, performs a simple OS test using
-    examples/ostest.  By default, this project assumes that you are
-    using the DFU bootloader.
-
-    CONFIG_STM32_CODESOURCERYW=y  : CodeSourcery under Windows
-
   nsh:
   ---
     Configures the NuttShell (nsh) located at apps/examples/nsh.  The
@@ -668,3 +660,21 @@ Where <subdir> is one of the following:
 
        CONFIG_DEBUG_CAN
        CONFIG_CAN_REGDEBUG
+
+  ostest:
+  ------
+    This configuration directory, performs a simple OS test using
+    examples/ostest.  By default, this project assumes that you are
+    using the DFU bootloader.
+
+    CONFIG_STM32_CODESOURCERYW=y  : CodeSourcery under Windows
+
+telnetd:
+--------
+
+  A simple test of the Telnet daemon(see apps/netutils/README.txt,
+  apps/examples/README.txt, and apps/examples/telnetd).  This is
+  the same daemon that is used in the nsh configuration so if you
+  use NSH, then you don't care about this.  This test is good for
+  testing the Telnet daemon only because it works in a simpler
+  environment than does the nsh configuration.