Move board specific files from examples/nsh to board source directories

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

23 files changed, 254 insertions, 35 deletions

diff --git a/nuttx/Documentation/NuttShell.html b/nuttx/Documentation/NuttShell.html
index 2ebad0a74..788e9ab00 100644
--- a/nuttx/Documentation/NuttShell.html
+++ b/nuttx/Documentation/NuttShell.html
@@ -8,7 +8,7 @@
   <tr align="center" bgcolor="#e4e4e4">
     <td>
       <h1><big><font color="#3c34ec"><i>NuttShell (NSH)</i></font></big></h1>
-      <p>Last Updated: March 28, 2009</p>
+      <p>Last Updated: June 08, 2009</p>
     </td>
   </tr>
 </table>
@@ -2076,6 +2076,15 @@ nsh>
       access NSH.
     </td>
   </tr>
+  <tr>
+    <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_ARCHINIT</code></b></td>
+    <td>
+      Set <code>CONFIG_EXAMPLES_NSH_ARCHINIT</code> if your board provides architecture
+      specific initialization  via the board-specific function <code>nsh_archinitialize()</code>.
+      This function will be called early in NSH initialization to allow board logic to
+      do such things as configure MMC/SD slots.
+    </td>
+  </tr>
 </table></center>
 
 <p>
diff --git a/nuttx/arch/arm/src/str71x/str71x_bspi.h b/nuttx/arch/arm/src/str71x/str71x_bspi.h
index 9fb2aa6d1..967b31dbe 100644
--- a/nuttx/arch/arm/src/str71x/str71x_bspi.h
+++ b/nuttx/arch/arm/src/str71x/str71x_bspi.h
@@ -96,17 +96,17 @@
 #define STR71X_BSPICSR1_WL8BIT      (0 << STR71X_BSPICSR1_WLSHIFT) /*   8-bits */

 #define STR71X_BSPICSR1_WL16BIT     (1 << STR71X_BSPICSR1_WLSHIFT) /*   16-bits */

 #define STR71X_BSPICSR1_RFESHIFT    12       /* Bits 12-15: Receive FIFO enable */

-#define STR71X_BSPICSR1_RFEMASK     (15 << STR71X_BSPICSR1_RFEMASK)

-#define STR71X_BSPICSR1_RFE1        (0 << STR71X_BSPICSR1_RFEMASK) /* Word 1 enabled */

-#define STR71X_BSPICSR1_RFE12       (1 << STR71X_BSPICSR1_RFEMASK) /* Word 1-2 enabled */

-#define STR71X_BSPICSR1_RFE13       (2 << STR71X_BSPICSR1_RFEMASK) /* Word 1-3 enabled */

-#define STR71X_BSPICSR1_RFE14       (3 << STR71X_BSPICSR1_RFEMASK) /* Word 1-4 enabled */

-#define STR71X_BSPICSR1_RFE15       (4 << STR71X_BSPICSR1_RFEMASK) /* Word 1-5 enabled */

-#define STR71X_BSPICSR1_RFE16       (5 << STR71X_BSPICSR1_RFEMASK) /* Word 1-6 enabled */

-#define STR71X_BSPICSR1_RFE17       (6 << STR71X_BSPICSR1_RFEMASK) /* Word 1-7 enabled */

-#define STR71X_BSPICSR1_RFE18       (7 << STR71X_BSPICSR1_RFEMASK) /* Word 1-8 enabled */

-#define STR71X_BSPICSR1_RFE19       (8 << STR71X_BSPICSR1_RFEMASK) /* Word 1-9 enabled */

-#define STR71X_BSPICSR1_RFE110      (9 << STR71X_BSPICSR1_RFEMASK) /* Word 1-10 enabled */

+#define STR71X_BSPICSR1_RFEMASK     (15 << STR71X_BSPICSR1_RFESHIFT)

+#define STR71X_BSPICSR1_RFE1        (0 << STR71X_BSPICSR1_RFESHIFT) /* Word 1 enabled */

+#define STR71X_BSPICSR1_RFE12       (1 << STR71X_BSPICSR1_RFESHIFT) /* Word 1-2 enabled */

+#define STR71X_BSPICSR1_RFE13       (2 << STR71X_BSPICSR1_RFESHIFT) /* Word 1-3 enabled */

+#define STR71X_BSPICSR1_RFE14       (3 << STR71X_BSPICSR1_RFESHIFT) /* Word 1-4 enabled */

+#define STR71X_BSPICSR1_RFE15       (4 << STR71X_BSPICSR1_RFESHIFT) /* Word 1-5 enabled */

+#define STR71X_BSPICSR1_RFE16       (5 << STR71X_BSPICSR1_RFESHIFT) /* Word 1-6 enabled */

+#define STR71X_BSPICSR1_RFE17       (6 << STR71X_BSPICSR1_RFESHIFT) /* Word 1-7 enabled */

+#define STR71X_BSPICSR1_RFE18       (7 << STR71X_BSPICSR1_RFESHIFT) /* Word 1-8 enabled */

+#define STR71X_BSPICSR1_RFE19       (8 << STR71X_BSPICSR1_RFESHIFT) /* Word 1-9 enabled */

+#define STR71X_BSPICSR1_RFE110      (9 << STR71X_BSPICSR1_RFESHIFT) /* Word 1-10 enabled */

 

 /* BSPI control/status register 2 */

 

diff --git a/nuttx/arch/arm/src/str71x/str71x_serial.c b/nuttx/arch/arm/src/str71x/str71x_serial.c
index 74ccd3a27..6002f1137 100644
--- a/nuttx/arch/arm/src/str71x/str71x_serial.c
+++ b/nuttx/arch/arm/src/str71x/str71x_serial.c
@@ -720,7 +720,7 @@ static inline int up_intinternal(struct uart_dev_s *dev)
 {
   struct up_dev_s *priv;
   int              passes;
-  boolean          handled;
+  boolean          handled = TRUE;
 
   priv = (struct up_dev_s*)dev->priv;
   DEBUGASSERT(priv && dev);
diff --git a/nuttx/configs/eagle100/httpd/defconfig b/nuttx/configs/eagle100/httpd/defconfig
index 8f410917d..14a635cea 100644
--- a/nuttx/configs/eagle100/httpd/defconfig
+++ b/nuttx/configs/eagle100/httpd/defconfig
@@ -481,6 +481,8 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
 # CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
 # CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
+# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+#   specific initialization (nsh_archinitialize()).
 #
 # If CONFIG_EXAMPLES_NSH_TELNET is selected:
 # CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
@@ -510,6 +512,7 @@ CONFIG_EXAMPLES_NSH_DISABLEBG=n
 CONFIG_EXAMPLES_NSH_ROMFSETC=n
 CONFIG_EXAMPLES_NSH_CONSOLE=y
 CONFIG_EXAMPLES_NSH_TELNET=n
+CONFIG_EXAMPLES_NSH_ARCHINIT=n
 CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
 CONFIG_EXAMPLES_NSH_DHCPC=n
 CONFIG_EXAMPLES_NSH_NOMAC=n
diff --git a/nuttx/configs/eagle100/nettest/defconfig b/nuttx/configs/eagle100/nettest/defconfig
index 96d82f693..c0debd1c6 100644
--- a/nuttx/configs/eagle100/nettest/defconfig
+++ b/nuttx/configs/eagle100/nettest/defconfig
@@ -472,6 +472,8 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
 # CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
 # CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
+# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+#   specific initialization (nsh_archinitialize()).
 #
 # If CONFIG_EXAMPLES_NSH_TELNET is selected:
 # CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
@@ -501,6 +503,7 @@ CONFIG_EXAMPLES_NSH_DISABLEBG=n
 CONFIG_EXAMPLES_NSH_ROMFSETC=n
 CONFIG_EXAMPLES_NSH_CONSOLE=y
 CONFIG_EXAMPLES_NSH_TELNET=n
+CONFIG_EXAMPLES_NSH_ARCHINIT=n
 CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
 CONFIG_EXAMPLES_NSH_DHCPC=n
 CONFIG_EXAMPLES_NSH_NOMAC=n
diff --git a/nuttx/configs/eagle100/nsh/defconfig b/nuttx/configs/eagle100/nsh/defconfig
index cbd62632f..6747e8467 100644
--- a/nuttx/configs/eagle100/nsh/defconfig
+++ b/nuttx/configs/eagle100/nsh/defconfig
@@ -457,6 +457,8 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
 # CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
 # CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
+# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+#   specific initialization (nsh_archinitialize()).
 #
 # If CONFIG_EXAMPLES_NSH_TELNET is selected:
 # CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
@@ -486,6 +488,7 @@ CONFIG_EXAMPLES_NSH_DISABLEBG=n
 CONFIG_EXAMPLES_NSH_ROMFSETC=n
 CONFIG_EXAMPLES_NSH_CONSOLE=y
 CONFIG_EXAMPLES_NSH_TELNET=n
+CONFIG_EXAMPLES_NSH_ARCHINIT=y
 CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
 CONFIG_EXAMPLES_NSH_DHCPC=n
 CONFIG_EXAMPLES_NSH_NOMAC=n
diff --git a/nuttx/configs/eagle100/ostest/defconfig b/nuttx/configs/eagle100/ostest/defconfig
index 066703054..f7f914833 100644
--- a/nuttx/configs/eagle100/ostest/defconfig
+++ b/nuttx/configs/eagle100/ostest/defconfig
@@ -457,6 +457,8 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
 # CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
 # CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
+# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+#   specific initialization (nsh_archinitialize()).
 #
 # If CONFIG_EXAMPLES_NSH_TELNET is selected:
 # CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
@@ -486,6 +488,7 @@ CONFIG_EXAMPLES_NSH_DISABLEBG=n
 CONFIG_EXAMPLES_NSH_ROMFSETC=n
 CONFIG_EXAMPLES_NSH_CONSOLE=y
 CONFIG_EXAMPLES_NSH_TELNET=n
+CONFIG_EXAMPLES_NSH_ARCHINIT=n
 CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
 CONFIG_EXAMPLES_NSH_DHCPC=n
 CONFIG_EXAMPLES_NSH_NOMAC=n
diff --git a/nuttx/configs/eagle100/src/Makefile b/nuttx/configs/eagle100/src/Makefile
index 455a5b85c..f2ca3a0d6 100644
--- a/nuttx/configs/eagle100/src/Makefile
+++ b/nuttx/configs/eagle100/src/Makefile
@@ -40,6 +40,9 @@ CFLAGS		+= -I$(TOPDIR)/sched
 ASRCS		= 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 CSRCS		= up_boot.c up_leds.c up_ethernet.c up_ssi.c
+ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+CSRCS		+= up_nsh.c
+endif
 COBJS		= $(CSRCS:.c=$(OBJEXT))
 
 SRCS		= $(ASRCS) $(CSRCS)
diff --git a/nuttx/examples/nsh/nsh_lm3s.c b/nuttx/configs/eagle100/src/up_nsh.c
index 791bf9d71..0cb36ac10 100644
--- a/nuttx/examples/nsh/nsh_lm3s.c
+++ b/nuttx/configs/eagle100/src/up_nsh.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * examples/nsh/nsh_lm3s.c
+ * config/eagle100/src/up_nsh.c
+ * arch/arm/src/board/up_nsh.c
  *
  *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -69,7 +70,7 @@
 #    define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0
 #  endif
 #else
-   /* Add configuration for new LPC214x boards here */
+   /* Add configuration for new LM3s boards here */
 #  error "Unrecognized lm3s board"
 #  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
 #  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
diff --git a/nuttx/configs/mcu123-lpc214x/nsh/defconfig b/nuttx/configs/mcu123-lpc214x/nsh/defconfig
index c84aad6df..23366a1ea 100644
--- a/nuttx/configs/mcu123-lpc214x/nsh/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/nsh/defconfig
@@ -519,6 +519,8 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
 # CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
 # CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
+# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+#   specific initialization (nsh_archinitialize()).
 #
 # If CONFIG_EXAMPLES_NSH_TELNET is selected:
 # CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
@@ -537,6 +539,7 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
 # CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
 # CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+#
 CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
 CONFIG_EXAMPLES_NSH_STRERROR=n
 CONFIG_EXAMPLES_NSH_LINELEN=64
@@ -547,6 +550,7 @@ CONFIG_EXAMPLES_NSH_DISABLEBG=n
 CONFIG_EXAMPLES_NSH_ROMFSETC=n
 CONFIG_EXAMPLES_NSH_CONSOLE=y
 CONFIG_EXAMPLES_NSH_TELNET=n
+CONFIG_EXAMPLES_NSH_ARCHINIT=y
 CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
 CONFIG_EXAMPLES_NSH_DHCPC=n
 CONFIG_EXAMPLES_NSH_NOMAC=n
diff --git a/nuttx/configs/mcu123-lpc214x/ostest/defconfig b/nuttx/configs/mcu123-lpc214x/ostest/defconfig
index ad5da5d30..142023777 100644
--- a/nuttx/configs/mcu123-lpc214x/ostest/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/ostest/defconfig
@@ -505,6 +505,8 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
 # CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
 # CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
+# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+#   specific initialization (nsh_archinitialize()).
 #
 # If CONFIG_EXAMPLES_NSH_TELNET is selected:
 # CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
@@ -523,6 +525,7 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
 # CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
 # CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+#
 CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
 CONFIG_EXAMPLES_NSH_STRERROR=n
 CONFIG_EXAMPLES_NSH_LINELEN=64
@@ -533,6 +536,7 @@ CONFIG_EXAMPLES_NSH_DISABLEBG=n
 CONFIG_EXAMPLES_NSH_ROMFSETC=n
 CONFIG_EXAMPLES_NSH_CONSOLE=y
 CONFIG_EXAMPLES_NSH_TELNET=n
+CONFIG_EXAMPLES_NSH_ARCHINIT=n
 CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
 CONFIG_EXAMPLES_NSH_DHCPC=n
 CONFIG_EXAMPLES_NSH_NOMAC=n
diff --git a/nuttx/configs/mcu123-lpc214x/src/Makefile b/nuttx/configs/mcu123-lpc214x/src/Makefile
index d71ee10ee..2dbb86362 100644
--- a/nuttx/configs/mcu123-lpc214x/src/Makefile
+++ b/nuttx/configs/mcu123-lpc214x/src/Makefile
@@ -41,6 +41,9 @@ CFLAGS		+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/arm -I
 ASRCS		= 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 CSRCS		= up_spi.c up_leds.c
+ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+CSRCS		+= up_nsh.c
+endif
 COBJS		= $(CSRCS:.c=$(OBJEXT))
 
 SRCS		= $(ASRCS) $(CSRCS)
diff --git a/nuttx/examples/nsh/nsh_lpc214x.c b/nuttx/configs/mcu123-lpc214x/src/up_nsh.c
index 937db8a61..18abb7435 100644
--- a/nuttx/examples/nsh/nsh_lpc214x.c
+++ b/nuttx/configs/mcu123-lpc214x/src/up_nsh.c
@@ -1,7 +1,8 @@
 /****************************************************************************
- * examples/nsh/nsh_lpc214x.c
+ * config/mcu123-lpc214x/src/up_nsh.c
+ * arch/arm/src/board/up_nsh.c
  *
- *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/configs/mcu123-lpc214x/src/up_spi.c b/nuttx/configs/mcu123-lpc214x/src/up_spi.c
index f2ca5196d..c8cd831ba 100644
--- a/nuttx/configs/mcu123-lpc214x/src/up_spi.c
+++ b/nuttx/configs/mcu123-lpc214x/src/up_spi.c
@@ -1,5 +1,6 @@
 /****************************************************************************
  * config/mcu123-lpc214x/src/up_spi.c
+ * arch/arm/src/board/up_spi.c
  *
  *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
diff --git a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig
index 0d95664cb..7760edbe5 100644
--- a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig
@@ -510,6 +510,8 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
 # CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
 # CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
+# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+#   specific initialization (nsh_archinitialize()).
 #
 # If CONFIG_EXAMPLES_NSH_TELNET is selected:
 # CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
@@ -528,6 +530,7 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
 # CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
 # CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+#
 CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
 CONFIG_EXAMPLES_NSH_STRERROR=n
 CONFIG_EXAMPLES_NSH_LINELEN=64
@@ -538,6 +541,7 @@ CONFIG_EXAMPLES_NSH_DISABLEBG=n
 CONFIG_EXAMPLES_NSH_ROMFSETC=n
 CONFIG_EXAMPLES_NSH_CONSOLE=y
 CONFIG_EXAMPLES_NSH_TELNET=n
+CONFIG_EXAMPLES_NSH_ARCHINIT=n
 CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
 CONFIG_EXAMPLES_NSH_DHCPC=n
 CONFIG_EXAMPLES_NSH_NOMAC=n
diff --git a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig
index 3cf08afc2..99750003d 100644
--- a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig
@@ -510,6 +510,8 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
 # CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
 # CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
+# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+#   specific initialization (nsh_archinitialize()).
 #
 # If CONFIG_EXAMPLES_NSH_TELNET is selected:
 # CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
@@ -538,6 +540,7 @@ CONFIG_EXAMPLES_NSH_DISABLEBG=n
 CONFIG_EXAMPLES_NSH_ROMFSETC=n
 CONFIG_EXAMPLES_NSH_CONSOLE=y
 CONFIG_EXAMPLES_NSH_TELNET=n
+CONFIG_EXAMPLES_NSH_ARCHINIT=n
 CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
 CONFIG_EXAMPLES_NSH_DHCPC=n
 CONFIG_EXAMPLES_NSH_NOMAC=n
diff --git a/nuttx/configs/olimex-strp711/nsh/defconfig b/nuttx/configs/olimex-strp711/nsh/defconfig
index efc40d293..ff01dcfab 100644
--- a/nuttx/configs/olimex-strp711/nsh/defconfig
+++ b/nuttx/configs/olimex-strp711/nsh/defconfig
@@ -116,7 +116,7 @@ CONFIG_STR71X_UART3=n
 CONFIG_STR71X_USB=n
 CONFIG_STR71X_CAN=n
 CONFIG_STR71X_BSPI0=n
-CONFIG_STR71X_BSPI1=n
+CONFIG_STR71X_BSPI1=y
 CONFIG_STR71X_HDLC=n
 CONFIG_STR71X_XTI=n
 CONFIG_STR71X_GPIO0=y
@@ -572,6 +572,8 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
 # CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
 # CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
+# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+#   specific initialization (nsh_archinitialize()).
 #
 # If CONFIG_EXAMPLES_NSH_TELNET is selected:
 # CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
@@ -600,6 +602,7 @@ CONFIG_EXAMPLES_NSH_DISABLEBG=n
 CONFIG_EXAMPLES_NSH_ROMFSETC=n
 CONFIG_EXAMPLES_NSH_CONSOLE=y
 CONFIG_EXAMPLES_NSH_TELNET=n
+CONFIG_EXAMPLES_NSH_ARCHINIT=y
 CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
 CONFIG_EXAMPLES_NSH_DHCPC=n
 CONFIG_EXAMPLES_NSH_NOMAC=n
diff --git a/nuttx/configs/olimex-strp711/ostest/defconfig b/nuttx/configs/olimex-strp711/ostest/defconfig
index 93c6886ec..9aa414471 100644
--- a/nuttx/configs/olimex-strp711/ostest/defconfig
+++ b/nuttx/configs/olimex-strp711/ostest/defconfig
@@ -572,6 +572,8 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
 # CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
 # CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
+# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+#   specific initialization (nsh_archinitialize()).
 #
 # If CONFIG_EXAMPLES_NSH_TELNET is selected:
 # CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
@@ -590,6 +592,7 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 # CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
 # CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
 # CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+#
 CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
 CONFIG_EXAMPLES_NSH_STRERROR=n
 CONFIG_EXAMPLES_NSH_LINELEN=64
@@ -600,6 +603,7 @@ CONFIG_EXAMPLES_NSH_DISABLEBG=n
 CONFIG_EXAMPLES_NSH_ROMFSETC=n
 CONFIG_EXAMPLES_NSH_CONSOLE=y
 CONFIG_EXAMPLES_NSH_TELNET=n
+CONFIG_EXAMPLES_NSH_ARCHINIT=n
 CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
 CONFIG_EXAMPLES_NSH_DHCPC=n
 CONFIG_EXAMPLES_NSH_NOMAC=n
diff --git a/nuttx/configs/olimex-strp711/src/Makefile b/nuttx/configs/olimex-strp711/src/Makefile
index 5d8c82b97..a46c97c84 100644
--- a/nuttx/configs/olimex-strp711/src/Makefile
+++ b/nuttx/configs/olimex-strp711/src/Makefile
@@ -41,6 +41,9 @@ CFLAGS		+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/arm -I
 ASRCS		= 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 CSRCS		= up_spi.c up_leds.c up_buttons.c
+ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+CSRCS		+= up_nsh.c
+endif
 COBJS		= $(CSRCS:.c=$(OBJEXT))
 
 SRCS		= $(ASRCS) $(CSRCS)
diff --git a/nuttx/configs/olimex-strp711/src/up_nsh.c b/nuttx/configs/olimex-strp711/src/up_nsh.c
new file mode 100644
index 000000000..cf4f55807
--- /dev/null
+++ b/nuttx/configs/olimex-strp711/src/up_nsh.c
@@ -0,0 +1,168 @@
+/****************************************************************************
+ * config/olimex-strp711/src/up_nsh.c
+ * arch/arm/src/board/up_nsh.c
+ *
+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <sys/types.h>
+
+#include <stdio.h>
+#include <debug.h>
+#include <errno.h>
+
+#include <nuttx/spi.h>
+#include <nuttx/mmcsd.h>
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+
+/* Configuration ************************************************************/
+
+/* PORT and SLOT number probably depend on the board configuration */
+
+#ifdef CONFIG_ARCH_BOARD_OLIMEX_STRP711
+#  define CONFIG_EXAMPLES_NSH_HAVEUSBDEV 1
+#  ifdef CONFIG_STR71X_BSPI1
+#    define CONFIG_EXAMPLES_NSH_HAVEMMCSD  1
+#    if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 1
+#      error "The Olimex STR-P711 MMC/SD is on BSPI1"
+#      undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO
+#      define CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO 0
+#    endif
+#    if !defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) || CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0
+#      error "The Olimex STR-P711 MMC/SD is on BSPI1 slot 0"
+#      undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
+#      define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0
+#    endif
+#  else
+#    undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  endif
+#else
+   /* Add configuration for new STR71x boards here */
+#  error "Unrecognized STR71x board"
+#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
+#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#endif
+
+/* Can't support USB features if USB is not enabled */
+
+#ifndef CONFIG_USBDEV
+#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
+#endif
+
+/* Can't support MMC/SD features if mountpoints are disabled */
+
+#if defined(CONFIG_DISABLE_MOUNTPOINT)
+#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#endif
+
+#ifndef CONFIG_EXAMPLES_NSH_MMCSDMINOR
+#  define CONFIG_EXAMPLES_NSH_MMCSDMINOR 0
+#endif
+
+/* Debug ********************************************************************/
+
+#ifdef CONFIG_CPP_HAVE_VARARGS
+#  ifdef CONFIG_DEBUG
+#    define message(...) lib_lowprintf(__VA_ARGS__)
+#  else
+#    define message(...) printf(__VA_ARGS__)
+#  endif
+#else
+#  ifdef CONFIG_DEBUG
+#    define message lib_lowprintf
+#  else
+#    define message printf
+#  endif
+#endif
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nsh_archinitialize
+ *
+ * Description:
+ *   Perform architecture specific initialization
+ *
+ ****************************************************************************/
+
+int nsh_archinitialize(void)
+{
+  FAR struct spi_dev_s *spi;
+  int ret;
+
+#ifdef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+
+  /* Get the SPI port */
+
+  message("nsh_archinitialize: Initializing SPI port %d\n",
+          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+
+  spi = up_spiinitialize(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+  if (!spi)
+    {
+      message("nsh_archinitialize: Failed to initialize SPI port %d\n",
+              CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+      return -ENODEV;
+    }
+
+  message("nsh_archinitialize: Successfully initialized SPI port %d\n",
+          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+
+  /* Bind the SPI port to the slot */
+
+  message("nsh_archinitialize: Binding SPI port %d to MMC/SD slot %d\n",
+          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+
+  ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, spi);
+  if (ret < 0)
+    {
+      message("nsh_archinitialize: Failed to bind SPI port %d to MMC/SD slot %d: %d\n",
+              CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, ret);
+      return ret;
+    }
+
+  message("nsh_archinitialize: Successfuly bound SPI port %d to MMC/SD slot %d\n",
+          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+#endif
+
+  return OK;
+}
diff --git a/nuttx/configs/olimex-strp711/src/up_spi.c b/nuttx/configs/olimex-strp711/src/up_spi.c
index 02b68bf72..dc520449d 100644
--- a/nuttx/configs/olimex-strp711/src/up_spi.c
+++ b/nuttx/configs/olimex-strp711/src/up_spi.c
@@ -116,7 +116,7 @@
 #define BSPI0_GPIO0_SCLK (0x0004)
 #define BSPI0_GPIO0_SS   (0x0008)
 
-#define BSPIO_GPIO0-ALT  (BSPI0_GPIO0_MISO|BSPI0_GPIO0_MOSI|BSPI0_GPIO0_SCLK)
+#define BSPIO_GPIO0_ALT  (BSPI0_GPIO0_MISO|BSPI0_GPIO0_MOSI|BSPI0_GPIO0_SCLK)
 #define BSPIO_GPIO0_OUT   BSPI0_GPIO0_SS
 #define BSPIO_GPIO0_ALL  (0x000f)
 
@@ -125,7 +125,7 @@
 #define BSPI1_GPIO0_SCLK (0x0040)
 #define BSPI1_GPIO0_SS   (0x0080)
 
-#define BSPI1_GPIO0-ALT  (BSPI1_GPIO0_MISO|BSPI1_GPIO0_MOSI|BSPI1_GPIO0_SCLK)
+#define BSPI1_GPIO0_ALT  (BSPI1_GPIO0_MISO|BSPI1_GPIO0_MOSI|BSPI1_GPIO0_SCLK)
 #define BSPI1_GPIO0_OUT   BSPI1_GPIO0_SS
 #define BSPI1_GPIO0_ALL  (0x00f0)
 
@@ -504,12 +504,12 @@ static ubyte spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
   ubyte ret = 0;
   uint16 reg16 = getreg16(STR71X_GPIO1_PD);
 
-  if ((re16 & MMCSD_GPIO1_WPIN) != 0)
+  if ((reg16 & MMCSD_GPIO1_WPIN) != 0)
     {
       ret |= SPI_STATUS_WRPROTECTED;
     }
 
-  if ((re16 & MMCSD_GPIO1_CPIN) != 0)
+  if ((reg16 & MMCSD_GPIO1_CPIN) != 0)
     {
       ret |= SPI_STATUS_PRESENT;
     }
@@ -653,7 +653,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size
  *
  ****************************************************************************/
 
-static void spi_recvblock(FAR struct spi_dev_s *dev, FAR const *buffer, size_t buflen)
+static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t buflen)
 {
   FAR struct str71x_spidev_s *priv = (FAR struct str71x_spidev_s *)dev;
   FAR ubyte *ptr = (FAR ubyte*)buffer;
@@ -736,7 +736,7 @@ FAR struct spi_dev_s *up_spiinitialize(int port)
       putreg16(reg16, STR71X_GPIO0_PC0);
 
       reg16  = getreg16(STR71X_GPIO0_PC1);
-      req16 &= ~BSPIO_GPIO0_ALL;
+      reg16 &= ~BSPIO_GPIO0_ALL;
       reg16 |= BSPIO_GPIO0_ALT;
       putreg16(reg16, STR71X_GPIO0_PC1);
 
@@ -778,7 +778,7 @@ FAR struct spi_dev_s *up_spiinitialize(int port)
       putreg16(reg16, STR71X_GPIO0_PC0);
 
       reg16  = getreg16(STR71X_GPIO0_PC1);
-      req16 &= ~BSPI1_GPIO0_ALL;
+      reg16 &= ~BSPI1_GPIO0_ALL;
       reg16 |= BSPI1_GPIO0_ALT;
       putreg16(reg16, STR71X_GPIO0_PC1);
 
diff --git a/nuttx/examples/nsh/Makefile b/nuttx/examples/nsh/Makefile
index 6cfae5161..341f59080 100644
--- a/nuttx/examples/nsh/Makefile
+++ b/nuttx/examples/nsh/Makefile
@@ -59,16 +59,6 @@ ifneq ($(CONFIG_EXAMPLES_NSH_DISABLESCRIPT),y)
 CSRCS	+= nsh_test.c
 endif
 
-ifeq ($(CONFIG_ARCH_CHIP),lpc214x)
-CSRCS	+= nsh_lpc214x.c
-CFLAGS	+= -DCONFIG_EXAMPLES_NSH_ARCHINIT=1
-endif
-
-ifeq ($(CONFIG_ARCH_CHIP),lm3s)
-CSRCS	+= nsh_lm3s.c
-CFLAGS	+= -DCONFIG_EXAMPLES_NSH_ARCHINIT=1
-endif
-
 AOBJS	= $(ASRCS:.S=$(OBJEXT))
 COBJS	= $(CSRCS:.c=$(OBJEXT))
 
diff --git a/nuttx/examples/nsh/README.txt b/nuttx/examples/nsh/README.txt
index 2a8d43f48..17a541eef 100644
--- a/nuttx/examples/nsh/README.txt
+++ b/nuttx/examples/nsh/README.txt
@@ -883,6 +883,12 @@ NSH-Specific Configuration Settings
       you may log into NuttX remotely using telnet in order to
       access NSH.
 
+  * CONFIG_EXAMPLES_NSH_ARCHINIT
+      Set if your board provides architecture specific initialization
+      via the board-specific function nsh_archinitialize().  This
+      function will be called early in NSH initialization to allow
+      board logic to do such things as configure MMC/SD slots.
+
   One or both of CONFIG_EXAMPLES_NSH_CONSOLE and CONFIG_EXAMPLES_NSH_TELNET
   must be defined.  If CONFIG_EXAMPLES_NSH_TELNET is selected, then there some
   other configuration settings that apply: