From c3bc22f07cb203c5a577b80467c8469d2a5ae9cb Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Thu, 27 Sep 2012 15:29:53 +0000
Subject: [PATCH 01/43] Definitions for ARMv7-M AIRCR register, Fixes for
 ADS7843 and SSD1289 driver, Missing build logic for examples/watchdog

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5198 42af7a65-404d-4744-a932-0658087f49c3
---
 apps/ChangeLog.txt                |  1 +
 apps/examples/Make.defs           |  4 ++++
 nuttx/ChangeLog                   |  6 ++++++
 nuttx/arch/arm/src/armv7-m/nvic.h |  8 ++++++++
 nuttx/drivers/input/ads7843e.c    | 23 ++++++++++++++++++++++-
 nuttx/drivers/lcd/ssd1289.c       | 20 +++++++++++++++++++-
 6 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index d24494f54a..64a923559b 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -345,3 +345,4 @@
 	  either the nuttx/ or the apps/ source trees.  This kludge makes it
 	  possible to configure NxWidgets/NxWM without too much trouble (with
 	  the tradeoff being a kind ugly structure and some maintenance issues).
+	* apps/examples/Make.defs: Missing support for apps/examples/watchdog.
diff --git a/apps/examples/Make.defs b/apps/examples/Make.defs
index a6e0ae88e4..e6b1f3ca3a 100644
--- a/apps/examples/Make.defs
+++ b/apps/examples/Make.defs
@@ -218,6 +218,10 @@ ifeq ($(CONFIG_EXAMPLES_USBTERM),y)
 CONFIGURED_APPS += examples/usbterm
 endif
 
+ifeq ($(CONFIG_EXAMPLES_WATCHDOG),y)
+CONFIGURED_APPS += examples/watchdog
+endif
+
 ifeq ($(CONFIG_EXAMPLES_WGET),y)
 CONFIGURED_APPS += examples/wget
 endif
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index adb52afce7..f472e87cd0 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3419,4 +3419,10 @@
 	  on the Shenzhou board.
 	* graphics/nxmu:  Correct some bad parameter checking that caused
 	  failures when DEBUG was enabled.
+	* arch/arm/src/armv7-m/nvic.h:  Add bit definitions for the AIRCR
+	  register.
+	* drivers/input/ads7843.c:  Need semaphore protection in logic
+	  that samples the position.
+	* drivers/lcd/ssd1289.c:  On some platforms we are unable to
+	  read the device ID -- reason unknown; workaround in place.
 
diff --git a/nuttx/arch/arm/src/armv7-m/nvic.h b/nuttx/arch/arm/src/armv7-m/nvic.h
index 1d30c5f7c2..ae56118c97 100644
--- a/nuttx/arch/arm/src/armv7-m/nvic.h
+++ b/nuttx/arch/arm/src/armv7-m/nvic.h
@@ -500,6 +500,14 @@
 #define NVIC_SYSHCON_BUSFAULTENA        (1 << 17) /* Bit 17: BusFault enabled */
 #define NVIC_SYSHCON_USGFAULTENA        (1 << 18) /* Bit 18: UsageFault enabled */
 
+/* Application Interrupt and Reset Control Register (AIRCR) */
+                                                  /* Bit 0:  Reserved */
+#define NVIC_AIRC_VECTCLRACTIVE         (1 << 1)  /* Bit 1:  Reserved for debug use */
+#define NVIC_AIRC_SYSRESETREQ           (1 << 2)  /* Bit 2:  System reset */
+                                                  /* Bits 3-14:  Reserved */
+#define NVIC_AIRC_ENDIANNESS            (1 << 15) /* Bit 15: 1=Big endian */
+                                                  /* Bits 16-31:  Reserved */
+
 /* Debug Exception and Monitor Control Register (DEMCR) */
 
 #define NVIC_DEMCR_VCCORERESET          (1 << 0)  /* Bit 0:  Reset Vector Catch */
diff --git a/nuttx/drivers/input/ads7843e.c b/nuttx/drivers/input/ads7843e.c
index 07e5e515df..679c25113e 100644
--- a/nuttx/drivers/input/ads7843e.c
+++ b/nuttx/drivers/input/ads7843e.c
@@ -555,6 +555,7 @@ static void ads7843e_worker(FAR void *arg)
   FAR struct ads7843e_dev_s    *priv = (FAR struct ads7843e_dev_s *)arg;
   FAR struct ads7843e_config_s *config;
   bool                          pendown;
+  int                           ret;
 
   ASSERT(priv != NULL);
 
@@ -565,10 +566,26 @@ static void ads7843e_worker(FAR void *arg)
   config = priv->config;
   DEBUGASSERT(config != NULL);
 
-  /* Disable the watchdog timer */
+  /* Disable the watchdog timer.  This is safe because it is started only
+   * by this function and this function is serialized on the worker thread.
+   */
 
   wd_cancel(priv->wdog);
 
+  /* Get exclusive access to the driver data structure */
+
+  do
+    {
+      ret = sem_wait(&priv->devsem);
+
+      /* This should only fail if the wait was canceled by an signal
+       * (and the worker thread will receive a lot of signals).
+       */
+
+      DEBUGASSERT(ret == OK || errno == EINTR);
+    }
+  while (ret < 0);
+
   /* Check for pen up or down by reading the PENIRQ GPIO. */
 
   pendown = config->pendown(config);
@@ -645,6 +662,10 @@ static void ads7843e_worker(FAR void *arg)
 errout:
   (void)ads7843e_sendcmd(priv, ADS7843_CMD_ENABPINIRQ);
   config->enable(config, true);
+
+  /* Release our lock on the state structure */
+
+  sem_post(&priv->devsem);
 }
 
 /****************************************************************************
diff --git a/nuttx/drivers/lcd/ssd1289.c b/nuttx/drivers/lcd/ssd1289.c
index 3d5ba96d31..f5f11b87dc 100644
--- a/nuttx/drivers/lcd/ssd1289.c
+++ b/nuttx/drivers/lcd/ssd1289.c
@@ -931,9 +931,27 @@ static inline int ssd1289_hwinitialize(FAR struct ssd1289_dev_s *priv)
 
   lcd->select(lcd);
 
+  /* Read the device ID.  Skip verification of the device ID is the LCD is
+   * write-only. What choice do we have?
+   */
+
 #ifndef CONFIG_LCD_NOGETRUN
   id = ssd1289_readreg(lcd, SSD1289_DEVCODE);
-  lcddbg("LCD ID: %04x\n", id);
+  if (id != 0)
+    {
+      lcddbg("LCD ID: %04x\n", id);
+    }
+
+  /* If we could not get the ID, then let's just assume that this is an SSD1289.
+   * Perhaps we have some early register access issues.  This seems to happen.
+   * But then perhaps we should not even bother to read the device ID at all?
+   */
+
+  else
+    {
+      lcddbg("No LCD ID, assuming SSD1289\n");
+      id = SSD1289_DEVCODE_VALUE;
+    }
 
   /* Check if the ID is for the SSD1289 */
 

From 7dc357a4e6e33773044b59b75d585f672f9649f8 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Thu, 27 Sep 2012 19:26:18 +0000
Subject: [PATCH 02/43] STM32 fixes for DM9161 PHY; Enhancements for ADS7843e
 touchscreen controller

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5199 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/ChangeLog                             |  11 +-
 nuttx/arch/arm/src/armv7-m/nvic.h           |  22 ++-
 nuttx/arch/arm/src/armv7-m/up_systemreset.c |  79 ++++++++
 nuttx/arch/arm/src/common/up_internal.h     |   4 +
 nuttx/arch/arm/src/stm32/Kconfig            |   1 +
 nuttx/arch/arm/src/stm32/Make.defs          |   4 +-
 nuttx/arch/arm/src/stm32/stm32_eth.c        |  79 ++++++++
 nuttx/configs/shenzhou/nsh/defconfig        |   5 +
 nuttx/configs/shenzhou/nxwm/defconfig       |  12 ++
 nuttx/configs/shenzhou/src/up_touchscreen.c |  10 +-
 nuttx/drivers/input/Kconfig                 | 191 ++++++++++++++++++-
 nuttx/drivers/input/ads7843e.c              | 198 +++++++++++++-------
 nuttx/drivers/input/ads7843e.h              |   2 +
 nuttx/include/nuttx/input/ads7843e.h        |  14 +-
 nuttx/include/nuttx/input/stmpe811.h        |   2 +-
 nuttx/net/Kconfig                           |   6 +
 16 files changed, 554 insertions(+), 86 deletions(-)
 create mode 100644 nuttx/arch/arm/src/armv7-m/up_systemreset.c

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index f472e87cd0..1e667ddcfa 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3425,4 +3425,13 @@
 	  that samples the position.
 	* drivers/lcd/ssd1289.c:  On some platforms we are unable to
 	  read the device ID -- reason unknown; workaround in place.
-
+	* drivers/input/ads7843.c:  Add thresholding options and an
+	  option to swap X and Y positions.  Fix some logic errors in
+	  the SPI locking/selecting logic.
+	* arch/arm/src/armv7-m/up_systemreset.c:  Add logic to reset
+	  the Cortex-Mx using the AIRCR register.  Contributed by Darcy
+	  Gong.
+	* arch/arm/src/stm32/up_eth.c:  Add logic specifically for the
+	  DM9161 PHY.  If the DM9161 failed to initialize, then use the
+	  up_sysemreset() logic to reset the MCU.  Contributed by Darcy
+	  Gong.
diff --git a/nuttx/arch/arm/src/armv7-m/nvic.h b/nuttx/arch/arm/src/armv7-m/nvic.h
index ae56118c97..6bd842a76a 100644
--- a/nuttx/arch/arm/src/armv7-m/nvic.h
+++ b/nuttx/arch/arm/src/armv7-m/nvic.h
@@ -175,7 +175,7 @@
 #define NVIC_CPUID_BASE_OFFSET          0x0d00 /* CPUID base register */
 #define NVIC_INTCTRL_OFFSET             0x0d04 /* Interrupt control state register */
 #define NVIC_VECTAB_OFFSET              0x0d08 /* Vector table offset register */
-#define NVIC_AIRC_OFFSET                0x0d0c /* Application interrupt/reset contol registr */
+#define NVIC_AIRCR_OFFSET               0x0d0c /* Application interrupt/reset contol registr */
 #define NVIC_SYSCON_OFFSET              0x0d10 /* System control register */
 #define NVIC_CFGCON_OFFSET              0x0d14 /* Configuration control register */
 #define NVIC_SYSH_PRIORITY_OFFSET(n)    (0x0d14 + 4*((n) >> 2))
@@ -348,7 +348,7 @@
 #define NVIC_CPUID_BASE                 (ARMV7M_NVIC_BASE + NVIC_CPUID_BASE_OFFSET)
 #define NVIC_INTCTRL                    (ARMV7M_NVIC_BASE + NVIC_INTCTRL_OFFSET)
 #define NVIC_VECTAB                     (ARMV7M_NVIC_BASE + NVIC_VECTAB_OFFSET)
-#define NVIC_AIRC                       (ARMV7M_NVIC_BASE + NVIC_AIRC_OFFSET)
+#define NVIC_AIRCR                      (ARMV7M_NVIC_BASE + NVIC_AIRCR_OFFSET)
 #define NVIC_SYSCON                     (ARMV7M_NVIC_BASE + NVIC_SYSCON_OFFSET)
 #define NVIC_CFGCON                     (ARMV7M_NVIC_BASE + NVIC_CFGCON_OFFSET)
 #define NVIC_SYSH_PRIORITY(n)           (ARMV7M_NVIC_BASE + NVIC_SYSH_PRIORITY_OFFSET(n))
@@ -501,12 +501,18 @@
 #define NVIC_SYSHCON_USGFAULTENA        (1 << 18) /* Bit 18: UsageFault enabled */
 
 /* Application Interrupt and Reset Control Register (AIRCR) */
-                                                  /* Bit 0:  Reserved */
-#define NVIC_AIRC_VECTCLRACTIVE         (1 << 1)  /* Bit 1:  Reserved for debug use */
-#define NVIC_AIRC_SYSRESETREQ           (1 << 2)  /* Bit 2:  System reset */
-                                                  /* Bits 3-14:  Reserved */
-#define NVIC_AIRC_ENDIANNESS            (1 << 15) /* Bit 15: 1=Big endian */
-                                                  /* Bits 16-31:  Reserved */
+
+#define NVIC_AIRCR_VECTRESET            (1 << 0)  /* Bit 0:  VECTRESET */
+#define NVIC_AIRCR_VECTCLRACTIVE        (1 << 1)  /* Bit 1:  Reserved for debug use */
+#define NVIC_AIRCR_SYSRESETREQ          (1 << 2)  /* Bit 2:  System reset */
+                                                  /* Bits 2-7:  Reserved */
+#define NVIC_AIRCR_PRIGROUP_SHIFT       (8)       /* Bits 8-14: PRIGROUP */
+#define NVIC_AIRCR_PRIGROUP_MASK        (7 << NVIC_AIRCR_PRIGROUP_SHIFT)
+#define NVIC_AIRCR_ENDIANNESS           (1 << 15) /* Bit 15: 1=Big endian */
+#define NVIC_AIRCR_VECTKEY_SHIFT        (16)      /* Bits 16-31: VECTKEY */
+#define NVIC_AIRCR_VECTKEY_MASK         (0xffff << NVIC_AIRCR_VECTKEY_SHIFT)
+#define NVIC_AIRCR_VECTKEYSTAT_SHIFT    (16)      /* Bits 16-31: VECTKEYSTAT */
+#define NVIC_AIRCR_VECTKEYSTAT_MASK     (0xffff << NVIC_AIRCR_VECTKEYSTAT_SHIFT)
 
 /* Debug Exception and Monitor Control Register (DEMCR) */
 
diff --git a/nuttx/arch/arm/src/armv7-m/up_systemreset.c b/nuttx/arch/arm/src/armv7-m/up_systemreset.c
new file mode 100644
index 0000000000..0d7bd2736a
--- /dev/null
+++ b/nuttx/arch/arm/src/armv7-m/up_systemreset.c
@@ -0,0 +1,79 @@
+/****************************************************************************
+ * arch/arm/src/armv7-m/up_systemreset.c
+ *
+ *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *           Darcy Gong
+ *
+ * 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 <stdint.h>
+
+#include "up_arch.h"
+#include "nvic.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+ /****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public functions
+ ****************************************************************************/
+
+void up_systemreset(void)
+{
+  uint32_t regval;
+
+  /* Set up for the system reset, retaining the priority group from the
+   * the AIRCR register.
+   */
+
+  regval  = getreg32(NVIC_AIRCR) & NVIC_AIRCR_PRIGROUP_MASK;
+  regval |= ((0x5fa << NVIC_AIRCR_VECTKEY_SHIFT) | NVIC_AIRCR_SYSRESETREQ);
+  putreg32(regval, NVIC_AIRCR);
+
+  /* Ensure completion of memory accesses */              
+
+  __asm volatile ("dsb");
+
+  /* Wait for the reset */
+
+  for (;;);
+}
diff --git a/nuttx/arch/arm/src/common/up_internal.h b/nuttx/arch/arm/src/common/up_internal.h
index 9f20775c09..42142c5e86 100644
--- a/nuttx/arch/arm/src/common/up_internal.h
+++ b/nuttx/arch/arm/src/common/up_internal.h
@@ -241,6 +241,10 @@ extern void up_pminitialize(void);
 #  define up_pminitialize()
 #endif
 
+#if defined(CONFIG_ARCH_CORTEXM3) || defined(CONFIG_ARCH_CORTEXM4)
+extern void up_systemreset(void) noreturn_function;
+#endif
+
 /* Interrupt handling *******************************************************/
 
 extern void up_irqinitialize(void);
diff --git a/nuttx/arch/arm/src/stm32/Kconfig b/nuttx/arch/arm/src/stm32/Kconfig
index 8d93fb104c..fe89119a48 100644
--- a/nuttx/arch/arm/src/stm32/Kconfig
+++ b/nuttx/arch/arm/src/stm32/Kconfig
@@ -269,6 +269,7 @@ config STM32_ETHMAC
 	bool "Ethernet MAC"
 	default n
 	depends on STM32_CONNECTIVITYLINE || STM32_STM32F20XX || STM32_STM32F40XX
+	select ARCH_HAVE_PHY
 
 config STM32_FSMC
 	bool "FSMC"
diff --git a/nuttx/arch/arm/src/stm32/Make.defs b/nuttx/arch/arm/src/stm32/Make.defs
index 24af16c951..e529629775 100644
--- a/nuttx/arch/arm/src/stm32/Make.defs
+++ b/nuttx/arch/arm/src/stm32/Make.defs
@@ -45,8 +45,8 @@ CMN_CSRCS	= up_assert.c up_blocktask.c up_copystate.c \
 		  up_initialize.c up_initialstate.c up_interruptcontext.c \
 		  up_memfault.c up_modifyreg8.c up_modifyreg16.c up_modifyreg32.c \
 		  up_releasepending.c up_releasestack.c up_reprioritizertr.c \
-		  up_schedulesigaction.c up_sigdeliver.c up_unblocktask.c \
-		  up_usestack.c up_doirq.c up_hardfault.c up_svcall.c
+		  up_schedulesigaction.c up_sigdeliver.c up_systemreset.c \
+		  up_unblocktask.c up_usestack.c up_doirq.c up_hardfault.c up_svcall.c
 
 ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y)
 CMN_ASRCS	+= up_exception.S
diff --git a/nuttx/arch/arm/src/stm32/stm32_eth.c b/nuttx/arch/arm/src/stm32/stm32_eth.c
index 2e892c9e54..81345fabf2 100644
--- a/nuttx/arch/arm/src/stm32/stm32_eth.c
+++ b/nuttx/arch/arm/src/stm32/stm32_eth.c
@@ -664,6 +664,9 @@ static void stm32_rxdescinit(FAR struct stm32_ethmac_s *priv);
 
 static int  stm32_phyread(uint16_t phydevaddr, uint16_t phyregaddr, uint16_t *value);
 static int  stm32_phywrite(uint16_t phydevaddr, uint16_t phyregaddr, uint16_t value);
+#ifdef CONFIG_PHY_DM9161
+static inline int stm32_dm9161(FAR struct stm32_ethmac_s *priv);
+#endif
 static int  stm32_phyinit(FAR struct stm32_ethmac_s *priv);
 
 /* MAC/DMA Initialization */
@@ -2479,6 +2482,72 @@ static int stm32_phywrite(uint16_t phydevaddr, uint16_t phyregaddr, uint16_t val
   return -ETIMEDOUT;
 }
 
+/****************************************************************************
+ * Function: stm32_dm9161
+ *
+ * Description:
+ *   Special workaround for the Davicom DM9161 PHY is required.  On power,
+ *   up, the PHY is not usually configured correctly but will work after
+ *   a powered-up reset.  This is really a workaround for some more
+ *   fundamental issue with the PHY clocking initialization, but the
+ *   root cause has not been studied (nor will it be with this workaround).
+ *
+ * Parameters:
+ *   priv - A reference to the private driver state structure
+ *
+ * Returned Value:
+ *   None
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_PHY_DM9161
+static inline int stm32_dm9161(FAR struct stm32_ethmac_s *priv)
+{
+  uint16_t phyval;
+  int ret;
+
+  /* Read the PHYID1 register;  A failure to read the PHY ID is one
+   * indication that check if the DM9161 PHY CHIP is not ready.
+   */
+
+  ret = stm32_phyread(CONFIG_STM32_PHYADDR, MII_PHYID1, &phyval);
+  if (ret < 0)
+    {
+      ndbg("Failed to read the PHY ID1: %d\n", ret);
+      return ret;
+    }
+
+  /* If we failed to read the PHY ID1 register, the reset the MCU to recover */
+
+  else if (phyval == 0xffff)
+    {
+      up_systemreset();
+    }
+
+  nvdbg("PHY ID1: 0x%04X\n", phyval);
+
+  /* Now check the "DAVICOM Specified Configuration Register (DSCR)", Register 16 */
+
+  ret = stm32_phyread(CONFIG_STM32_PHYADDR, 16, &phyval);
+  if (ret < 0)
+    {
+      ndbg("Failed to read the PHY Register 0x10: %d\n", ret);
+      return ret;
+    }
+
+  /* Bit 8 of the DSCR register is zero, the the DM9161 has not selected RMII.
+   * If RMII is not selected, then reset the MCU to recover.
+   */
+ 
+  else if ((phyval & (1 << 8)) == 0)
+    {
+      up_systemreset();
+    }
+
+  return OK;
+}
+#endif
+
 /****************************************************************************
  * Function: stm32_phyinit
  *
@@ -2524,6 +2593,16 @@ static int stm32_phyinit(FAR struct stm32_ethmac_s *priv)
     }
   up_mdelay(PHY_RESET_DELAY);
 
+  /* Special workaround for the Davicom DM9161 PHY is required. */
+
+#ifdef CONFIG_PHY_DM9161
+  ret = stm32_dm9161(priv);
+  if (ret < 0)
+    {
+      return ret;
+    }
+#endif
+
   /* Perform auto-negotion if so configured */
 
 #ifdef CONFIG_STM32_AUTONEG
diff --git a/nuttx/configs/shenzhou/nsh/defconfig b/nuttx/configs/shenzhou/nsh/defconfig
index 3528f6d605..706881cc03 100644
--- a/nuttx/configs/shenzhou/nsh/defconfig
+++ b/nuttx/configs/shenzhou/nsh/defconfig
@@ -377,6 +377,11 @@ CONFIG_USART2_2STOP=0
 # Networking Support
 #
 CONFIG_NET=y
+CONFIG_ARCH_HAVE_PHY=y
+# CONFIG_PHY_KS8721 is not set
+# CONFIG_PHY_DP83848C is not set
+# CONFIG_PHY_LAN8720 is not set
+CONFIG_PHY_DM9161=y
 # CONFIG_NET_NOINTS is not set
 CONFIG_NET_MULTIBUFFER=y
 # CONFIG_NET_IPv6 is not set
diff --git a/nuttx/configs/shenzhou/nxwm/defconfig b/nuttx/configs/shenzhou/nxwm/defconfig
index 29c83730e7..b529907c1d 100644
--- a/nuttx/configs/shenzhou/nxwm/defconfig
+++ b/nuttx/configs/shenzhou/nxwm/defconfig
@@ -359,6 +359,13 @@ CONFIG_RTC=y
 CONFIG_INPUT=y
 # CONFIG_INPUT_TSC2007 is not set
 CONFIG_INPUT_ADS7843E=y
+# CONFIG_ADS7843E_MULTIPLE is not set
+CONFIG_ADS7843E_SPIMODE=0
+CONFIG_ADS7843E_FREQUENCY=100000
+# CONFIG_ADS7843E_SWAPXY is not set
+CONFIG_ADS7843E_THRESHX=12
+CONFIG_ADS7843E_THRESHY=12
+# CONFIG_INPUT_STMPE811 is not set
 CONFIG_LCD=y
 # CONFIG_LCD_NOGETRUN is not set
 CONFIG_LCD_MAXCONTRAST=1
@@ -418,6 +425,11 @@ CONFIG_USART2_2STOP=0
 # Networking Support
 #
 CONFIG_NET=y
+CONFIG_ARCH_HAVE_PHY=y
+# CONFIG_PHY_KS8721 is not set
+# CONFIG_PHY_DP83848C is not set
+# CONFIG_PHY_LAN8720 is not set
+CONFIG_PHY_DM9161=y
 # CONFIG_NET_NOINTS is not set
 CONFIG_NET_MULTIBUFFER=y
 # CONFIG_NET_IPv6 is not set
diff --git a/nuttx/configs/shenzhou/src/up_touchscreen.c b/nuttx/configs/shenzhou/src/up_touchscreen.c
index 7f6d49eb5b..969b23be45 100644
--- a/nuttx/configs/shenzhou/src/up_touchscreen.c
+++ b/nuttx/configs/shenzhou/src/up_touchscreen.c
@@ -201,9 +201,17 @@ static void tsc_clear(FAR struct ads7843e_config_s *state)
 static bool tsc_busy(FAR struct ads7843e_config_s *state)
 {
   /* Hmmm... The ADS7843E BUSY pin is not brought out on the Shenzhou board.
-   * We will most certainly have to revisit this.
+   * We will most certainly have to revisit this.  There is this cryptic
+   * statement in the XPT2046 spec:  "No DCLK delay required with dedicated
+   * serial port."
+   *
+   * The busy state is used by the ADS7843E driver to control the delay
+   * between sending the command, then reading the returned data.
    */
 
+#if 0
+  up_udelay(1600); /* 1.6MS */
+#endif
   return false;
 }
 
diff --git a/nuttx/drivers/input/Kconfig b/nuttx/drivers/input/Kconfig
index 9fde35ff67..1f345ee144 100644
--- a/nuttx/drivers/input/Kconfig
+++ b/nuttx/drivers/input/Kconfig
@@ -2,6 +2,7 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
 config INPUT_TSC2007
 	bool "TI TSC2007 touchscreen controller"
 	default n
@@ -9,7 +10,29 @@ config INPUT_TSC2007
 	---help---
 		Enable support for the TI TSC2007 touchscreen controller
 
-		
+if INPUT_TSC2007
+
+config TSC2007_8BIT
+	bool "8-bit Conversions"
+	default n
+	---help---
+		Use faster, but less accurate, 8-bit conversions.  Default: 12-bit conversions.
+
+config TSC2007_MULTIPLE
+	bool "Multiple TSC2007 Devices"
+	default n
+	---help---
+		Can be defined to support multiple TSC2007 devices on board.
+
+config TSC2007_NPOLLWAITERS
+	int "Number poll waiters"
+	default 4
+	depends on !DISABLE_POLL
+	---help---
+		Maximum number of threads that can be waiting on poll()
+
+endif
+
 config INPUT_ADS7843E
 	bool "TI ADS7843/TSC2046 touchscreen controller"
 	default n
@@ -18,3 +41,169 @@ config INPUT_ADS7843E
 		Enable support for the TI/Burr-Brown ADS7842 touchscreen controller.  I believe
 		that driver should be compatibile with the TI/Burr-Brown TSC2046 and XPT2046
 		touchscreen controllers as well. 
+
+if INPUT_ADS7843E
+
+config ADS7843E_MULTIPLE
+	bool "Multiple ADS7843E Devices"
+	default n
+	---help---
+		Can be defined to support multiple ADS7843E devices on board.
+
+config ADS7843E_NPOLLWAITERS
+	int "Number poll waiters"
+	default 4
+	depends on !DISABLE_POLL
+	---help---
+		Maximum number of threads that can be waiting on poll()
+
+config ADS7843E_SPIMODE
+	int "SPI mode"
+	default 0
+	range 0,3
+	---help---
+		Controls the SPI mode.  The device should work in mode 0, but sometimes
+		you need to experiment.
+
+config ADS7843E_FREQUENCY
+	int "SPI frequency"
+	default 100000
+	---help---
+		Define to use a different SPI bus frequency.
+
+config ADS7843E_SWAPXY
+	bool "Swap X/Y"
+	default n
+	---help---
+		Reverse the meaning of X and Y to handle different LCD orientations.
+
+config ADS7843E_THRESHX
+	int "X threshold"
+	default 12
+	---help---
+		New touch positions will only be reported when the X or Y data changes by these
+		thresholds. This trades reduces data rate for some loss in dragging accuracy.  For
+		12-bit values so the raw ranges are 0-4095. So for example, if your display is
+		320x240, then THRESHX=13 and THRESHY=17 would correspond to one pixel.  Default: 12
+ 
+config ADS7843E_THRESHY
+	int "Y threshold"
+	default 12
+	---help---
+		New touch positions will only be reported when the X or Y data changes by these
+		thresholds. This trades reduces data rate for some loss in dragging accuracy.  For
+		12-bit values so the raw ranges are 0-4095. So for example, if your display is
+		320x240, then THRESHX=13 and THRESHY=17 would correspond to one pixel.  Default: 12
+
+endif
+
+config INPUT_STMPE811
+	bool "STMicro STMPE811 Driver"
+	default n
+	---help---
+		Enables support for the STMPE811 driver 
+
+if INPUT_STMPE811
+
+choice
+	prompt "STMPE Interface"
+	default STMPE811_I2C
+
+config STMPE811_SPI
+	bool "SPI Interface"
+	select SPI
+	---help---
+		Enables support for the SPI interface (not currently supported)
+
+config STMPE811_I2C
+	bool "STMPE811 I2C Interface"
+	select I2C
+	---help---
+		Enables support for the I2C interface
+
+endchoice
+
+config STMPE811_MULTIPLE
+	bool "Multiple STMPE811 Devices"
+	default n
+	---help---
+		Can be defined to support multiple STMPE811 devices on board.
+
+config STMPE811_NPOLLWAITERS
+	int "Number poll waiters"
+	default 4
+	depends on !DISABLE_POLL
+	---help---
+		Maximum number of threads that can be waiting on poll()
+
+config STMPE811_TSC_DISABLE
+	bool "Disable STMPE811 Touchscreen Support"
+	default n
+	---help---
+		Disable driver touchscreen functionality.
+
+config STMPE811_SWAPXY
+	bool "Swap X/Y"
+	default n
+	depends on !STMPE811_TSC_DISABLE
+	---help---
+		Reverse the meaning of X and Y to handle different LCD orientations.
+
+config STMPE811_THRESHX
+	int "X threshold"
+	default 12
+	depends on !STMPE811_TSC_DISABLE
+	---help---
+		STMPE811 touchscreen data comes in a a very high rate.  New touch positions
+		will only be reported when the X or Y data changes by these thresholds.
+		This trades reduces data rate for some loss in dragging accuracy.  The
+		STMPE811 is configure for 12-bit values so the raw ranges are 0-4095. So
+		for example, if your display is 320x240, then THRESHX=13 and THRESHY=17
+		would correspond to one pixel.  Default: 12
+ 
+config STMPE811_THRESHY
+	int "Y threshold"
+	default 12
+	depends on !STMPE811_TSC_DISABLE
+	---help---
+		STMPE811 touchscreen data comes in a a very high rate.  New touch positions
+		will only be reported when the X or Y data changes by these thresholds.
+		This trades reduces data rate for some loss in dragging accuracy.  The
+		STMPE811 is configure for 12-bit values so the raw ranges are 0-4095. So
+		for example, if your display is 320x240, then THRESHX=13 and THRESHY=17
+		would correspond to one pixel.  Default: 12
+
+config STMPE811_ADC_DISABLE
+	bool "Disable STMPE811 ADC Support"
+	default y
+	---help---
+		Disable driver ADC functionality.
+
+config STMPE811_GPIO_DISABLE
+	bool "Disable STMPE811 GPIO Support"
+	default y
+	---help---
+		Disable driver GPIO functionality.
+
+config STMPE811_GPIOINT_DISABLE
+	bool "Disable STMPE811 GPIO Interrupt Support"
+	default y
+	depends on !STMPE811_GPIO_DISABLE
+	---help---
+		Disable driver GPIO interrupt functionlality (ignored if GPIO functionality is
+		disabled).
+
+config STMPE811_TEMP_DISABLE
+	bool "Disable STMPE811 Temperature Sensor Support"
+	default y
+	---help---
+		Disable driver temperature sensor functionality.
+
+config STMPE811_REGDEBUG
+	bool "Enable Register-Level STMPE811 Debug"
+	default n
+	depends on DEBUG
+	---help---
+		Enable very low register-level debug output.
+
+endif
diff --git a/nuttx/drivers/input/ads7843e.c b/nuttx/drivers/input/ads7843e.c
index 679c25113e..ce45e4537b 100644
--- a/nuttx/drivers/input/ads7843e.c
+++ b/nuttx/drivers/input/ads7843e.c
@@ -79,6 +79,12 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
+/* This is a value for the threshold that guantees a big difference on the
+ * first pendown (but can't overflow).
+ */
+
+#define INVALID_THRESHOLD 0x1000
+
 /****************************************************************************
  * Private Types
  ****************************************************************************/
@@ -88,13 +94,14 @@
  ****************************************************************************/
 /* Low-level SPI helpers */
 
-static inline void ads7843e_configspi(FAR struct spi_dev_s *spi);
 #ifdef CONFIG_SPI_OWNBUS
-static inline void ads7843e_select(FAR struct spi_dev_s *spi);
-static inline void ads7843e_deselect(FAR struct spi_dev_s *spi);
+static inline void ads7843e_configspi(FAR struct spi_dev_s *spi);
+#  define ads7843e_lock(spi)
+#  define ads7843e_unlock(spi)
 #else
-static void ads7843e_select(FAR struct spi_dev_s *spi);
-static void ads7843e_deselect(FAR struct spi_dev_s *spi);
+#  define ads7843e_configspi(spi);
+static void ads7843e_lock(FAR struct spi_dev_s *spi);
+static void ads7843e_unlock(FAR struct spi_dev_s *spi);
 #endif
 
 static inline void ads7843e_waitbusy(FAR struct ads7843e_dev_s *priv);
@@ -157,13 +164,12 @@ static struct ads7843e_dev_s *g_ads7843elist;
  ****************************************************************************/
 
 /****************************************************************************
- * Function: ads7843e_select
+ * Function: ads7843e_lock
  *
  * Description:
- *   Select the SPI, locking and  re-configuring if necessary.  This function
- *   must be called before initiating any sequence of SPI operations. If we
- *   are sharing the SPI bus with other devices (CONFIG_SPI_OWNBUS undefined)
- *   then we need to lock and configure the SPI bus for each transfer.
+ *   Lock the SPI bus and re-configure as necessary.  This function must be
+ *   to assure: (1) exclusive access to the SPI bus, and (2) to assure that
+ *   the shared bus is properly configured for the touchscreen controller.
  *
  * Parameters:
  *   spi  - Reference to the SPI driver structure
@@ -175,42 +181,35 @@ static struct ads7843e_dev_s *g_ads7843elist;
  *
  ****************************************************************************/
 
-#ifdef CONFIG_SPI_OWNBUS
-static inline void ads7843e_select(FAR struct spi_dev_s *spi)
+#ifndef CONFIG_SPI_OWNBUS
+static void ads7843e_lock(FAR struct spi_dev_s *spi)
 {
-  /* We own the SPI bus, so just select the chip */
-
-  SPI_SELECT(spi, SPIDEV_TOUCHSCREEN, true);
-}
-#else
-static void ads7843e_select(FAR struct spi_dev_s *spi)
-{
-  /* Select ADS7843 chip (locking the SPI bus in case there are multiple
-   * devices competing for the SPI bus
+  /* Lock the SPI bus because there are multiple devices competing for the
+   * SPI bus
    */
 
   (void)SPI_LOCK(spi, true);
-  SPI_SELECT(spi, SPIDEV_TOUCHSCREEN, true);
 
-  /* Now make sure that the SPI bus is configured for the ADS7843 (it
-   * might have gotten configured for a different device while unlocked)
+  /* We have the lock.  Now make sure that the SPI bus is configured for the
+   * ADS7843 (it might have gotten configured for a different device while
+   * unlocked)
    */
 
+  SPI_SELECT(spi, SPIDEV_TOUCHSCREEN, true);
   SPI_SETMODE(spi, CONFIG_ADS7843E_SPIMODE);
   SPI_SETBITS(spi, 8);
   SPI_SETFREQUENCY(spi, CONFIG_ADS7843E_FREQUENCY);
+  SPI_SELECT(spi, SPIDEV_TOUCHSCREEN, false);
 }
 #endif
 
 /****************************************************************************
- * Function: ads7843e_deselect
+ * Function: ads7843e_unlock
  *
  * Description:
- *   De-select the SPI, unlocking as necessary.  This function must be
- *   after completing a sequence of SPI operations. If we are sharing the SPI
- *   bus with other devices (CONFIG_SPI_OWNBUS undefined) then we need to
- *   un-lock the SPI bus for each transfer, possibly losing the current
- *   configuration.
+ *   If we are sharing the SPI bus with other devices (CONFIG_SPI_OWNBUS
+ *   undefined) then we need to un-lock the SPI bus for each transfer,
+ *   possibly losing the current configuration.
  *
  * Parameters:
  *   spi  - Reference to the SPI driver structure
@@ -222,19 +221,11 @@ static void ads7843e_select(FAR struct spi_dev_s *spi)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_SPI_OWNBUS
-static inline void ads7843e_deselect(FAR struct spi_dev_s *spi)
+#ifndef CONFIG_SPI_OWNBUS
+static void ads7843e_unlock(FAR struct spi_dev_s *spi)
 {
-  /* We own the SPI bus, so just de-select the chip */
+  /* Relinquish the SPI bus. */
 
-  SPI_SELECT(spi, SPIDEV_TOUCHSCREEN, false);
-}
-#else
-static void ads7843e_deselect(FAR struct spi_dev_s *spi)
-{
-  /* De-select ADS7843 chip and relinquish the SPI bus. */
-
-  SPI_SELECT(spi, SPIDEV_TOUCHSCREEN, false);
   (void)SPI_LOCK(spi, false);
 }
 #endif
@@ -258,23 +249,20 @@ static void ads7843e_deselect(FAR struct spi_dev_s *spi)
  *
  ****************************************************************************/
 
+#ifdef CONFIG_SPI_OWNBUS
 static inline void ads7843e_configspi(FAR struct spi_dev_s *spi)
 {
-  idbg("Mode: %d Bits: 8 Frequency: %d\n",
-       CONFIG_ADS7843E_SPIMODE, CONFIG_ADS7843E_FREQUENCY);
-
   /* Configure SPI for the ADS7843.  But only if we own the SPI bus.  Otherwise, don't
    * bother because it might change.
    */
 
-#ifdef CONFIG_SPI_OWNBUS
   SPI_SELECT(spi, SPIDEV_TOUCHSCREEN, true);
   SPI_SETMODE(spi, CONFIG_ADS7843E_SPIMODE);
   SPI_SETBITS(spi, 8);
   SPI_SETFREQUENCY(spi, CONFIG_ADS7843E_FREQUENCY);
   SPI_SELECT(spi, SPIDEV_TOUCHSCREEN, false);
-#endif
 }
+#endif
 
 /****************************************************************************
  * Name: ads7843e_waitbusy
@@ -296,7 +284,7 @@ static uint16_t ads7843e_sendcmd(FAR struct ads7843e_dev_s *priv, uint8_t cmd)
 
   /* Select the ADS7843E */
 
-  ads7843e_select(priv->spi);
+  SPI_SELECT(priv->spi, SPIDEV_TOUCHSCREEN, true);
 
   /* Send the command */
 
@@ -306,7 +294,7 @@ static uint16_t ads7843e_sendcmd(FAR struct ads7843e_dev_s *priv, uint8_t cmd)
   /* Read the data */
 
   SPI_RECVBLOCK(priv->spi, buffer, 2);
-  ads7843e_deselect(priv->spi);
+  SPI_SELECT(priv->spi, SPIDEV_TOUCHSCREEN, false);
 
   result = ((uint16_t)buffer[0] << 8) | (uint16_t)buffer[1];
   result = result >> 4;
@@ -554,6 +542,10 @@ static void ads7843e_worker(FAR void *arg)
 {
   FAR struct ads7843e_dev_s    *priv = (FAR struct ads7843e_dev_s *)arg;
   FAR struct ads7843e_config_s *config;
+  uint16_t                      x;
+  uint16_t                      y;
+  uint16_t                      xdiff;
+  uint16_t                      ydiff;
   bool                          pendown;
   int                           ret;
 
@@ -572,6 +564,10 @@ static void ads7843e_worker(FAR void *arg)
 
   wd_cancel(priv->wdog);
 
+  /* Lock the SPI bus so that we have exclusive access */
+
+  ads7843e_lock(priv->spi);
+
   /* Get exclusive access to the driver data structure */
 
   do
@@ -594,13 +590,20 @@ static void ads7843e_worker(FAR void *arg)
 
   if (!pendown)
     {
-      /* Ignore the interrupt if the pen was already up (CONTACT_NONE == pen up and
-       * already reported.  CONTACT_UP == pen up, but not reported)
+      /* The pen is up.. reset thresholding variables. */
+
+      priv->threshx = INVALID_THRESHOLD;
+      priv->threshy = INVALID_THRESHOLD;
+
+      /* Ignore the interrupt if the pen was already up (CONTACT_NONE == pen up
+       * and already reported; CONTACT_UP == pen up, but not reported)
        */
 
-      if (priv->sample.contact == CONTACT_NONE)
+      if (priv->sample.contact == CONTACT_NONE ||
+          priv->sample.contact == CONTACT_UP)
+
         {
-          goto errout;
+          goto ignored;
         }
 
       /* The pen is up.  NOTE: We know from a previous test, that this is a
@@ -618,14 +621,57 @@ static void ads7843e_worker(FAR void *arg)
 
   else if (priv->sample.contact == CONTACT_UP)
     {
-       goto errout;
+      /* If we have not yet processed the last pen up event, then we
+       * cannot handle this pen down event. We will have to discard it.  That
+       * should be okay because we will set the timer to to sample again
+       * later.
+       */
+
+       wd_start(priv->wdog, ADS7843E_WDOG_DELAY, ads7843e_wdog, 1, (uint32_t)priv);
+       goto ignored;
     }
   else
     {
       /* Handle pen down events.  First, sample positional values. */
 
-      priv->sample.x = ads7843e_sendcmd(priv, ADS7843_CMD_XPOSITION);
-      priv->sample.y = ads7843e_sendcmd(priv, ADS7843_CMD_YPOSITION);
+#ifdef CONFIG_ADS7843E_SWAPXY
+      x = ads7843e_sendcmd(priv, ADS7843_CMD_YPOSITION);
+      y = ads7843e_sendcmd(priv, ADS7843_CMD_XPOSITION);
+#else
+      x = ads7843e_sendcmd(priv, ADS7843_CMD_XPOSITION);
+      y = ads7843e_sendcmd(priv, ADS7843_CMD_YPOSITION);
+#endif
+
+      /* Perform a thresholding operation so that the results will be more stable.
+       * If the difference from the last sample is small, then ignore the event.
+       * REVISIT:  Should a large change in pressure also generate a event?
+       */
+
+      xdiff = x > priv->threshx ? (x - priv->threshx) : (priv->threshx - x);
+      ydiff = y > priv->threshy ? (y - priv->threshy) : (priv->threshy - y);
+
+      /* Continue to sample the position while the pen is down */
+
+      wd_start(priv->wdog, ADS7843E_WDOG_DELAY, ads7843e_wdog, 1, (uint32_t)priv);
+
+      /* Check the thresholds.  Bail if there is no significant difference */
+
+      if (xdiff < CONFIG_ADS7843E_THRESHX && ydiff < CONFIG_ADS7843E_THRESHY)
+        {
+          /* Little or no change in either direction ... don't report anything. */
+
+          goto ignored;
+        }
+
+      /* When we see a big difference, snap to the new x/y thresholds */
+
+      priv->threshx       = x;
+      priv->threshy       = y;
+
+      /* Update the x/y position in the sample data */
+
+      priv->sample.x      = priv->threshx;
+      priv->sample.y      = priv->threshy;
 
       /* The X/Y positional data is now valid */
 
@@ -642,10 +688,6 @@ static void ads7843e_worker(FAR void *arg)
 
           priv->sample.contact = CONTACT_DOWN;
         }
-
-      /* Continue to sample the position while the pen is down */
-
-       wd_start(priv->wdog, ADS7843E_WDOG_DELAY, ads7843e_wdog, 1, (uint32_t)priv);
     }
 
   /* Indicate the availability of new sample data for this ID */
@@ -659,13 +701,15 @@ static void ads7843e_worker(FAR void *arg)
 
   /* Exit, re-enabling ADS7843E interrupts */
 
-errout:
+ignored:
+
   (void)ads7843e_sendcmd(priv, ADS7843_CMD_ENABPINIRQ);
   config->enable(config, true);
 
-  /* Release our lock on the state structure */
+  /* Release our lock on the state structure and unlock the SPI bus */
 
   sem_post(&priv->devsem);
+  ads7843e_unlock(priv->spi);
 }
 
 /****************************************************************************
@@ -1119,7 +1163,7 @@ errout:
  *
  ****************************************************************************/
 
-int ads7843e_register(FAR struct spi_dev_s *dev,
+int ads7843e_register(FAR struct spi_dev_s *spi,
                       FAR struct ads7843e_config_s *config, int minor)
 {
   FAR struct ads7843e_dev_s *priv;
@@ -1129,11 +1173,11 @@ int ads7843e_register(FAR struct spi_dev_s *dev,
 #endif
   int ret;
 
-  ivdbg("dev: %p minor: %d\n", dev, minor);
+  ivdbg("spi: %p minor: %d\n", spi, minor);
 
   /* Debug-only sanity checks */
 
-  DEBUGASSERT(dev != NULL && config != NULL && minor >= 0 && minor < 100);
+  DEBUGASSERT(spi != NULL && config != NULL && minor >= 0 && minor < 100);
 
   /* Create and initialize a ADS7843E device driver instance */
 
@@ -1151,11 +1195,14 @@ int ads7843e_register(FAR struct spi_dev_s *dev,
   /* Initialize the ADS7843E device driver instance */
 
   memset(priv, 0, sizeof(struct ads7843e_dev_s));
-  priv->spi    = dev;             /* Save the SPI device handle */
-  priv->config = config;          /* Save the board configuration */
-  priv->wdog   = wd_create();     /* Create a watchdog timer */
-  sem_init(&priv->devsem,  0, 1); /* Initialize device structure semaphore */
-  sem_init(&priv->waitsem, 0, 0); /* Initialize pen event wait semaphore */
+  priv->spi     = spi;               /* Save the SPI device handle */
+  priv->config  = config;            /* Save the board configuration */
+  priv->wdog    = wd_create();       /* Create a watchdog timer */
+  priv->threshx = INVALID_THRESHOLD; /* Initialize thresholding logic */
+  priv->threshy = INVALID_THRESHOLD; /* Initialize thresholding logic */
+
+  sem_init(&priv->devsem,  0, 1);    /* Initialize device structure semaphore */
+  sem_init(&priv->waitsem, 0, 0);    /* Initialize pen event wait semaphore */
 
   /* Make sure that interrupts are disabled */
 
@@ -1171,14 +1218,25 @@ int ads7843e_register(FAR struct spi_dev_s *dev,
       goto errout_with_priv;
     }
 
+  idbg("Mode: %d Bits: 8 Frequency: %d\n",
+       CONFIG_ADS7843E_SPIMODE, CONFIG_ADS7843E_FREQUENCY);
+
+  /* Lock the SPI bus so that we have exclusive access */
+
+  ads7843e_lock(spi);
+
   /* Configure the SPI interface */
 
-  ads7843e_configspi(dev);
+  ads7843e_configspi(spi);
 
   /* Enable the PEN IRQ */
   
   ads7843e_sendcmd(priv, ADS7843_CMD_ENABPINIRQ);
 
+  /* Unlock the bus */
+
+  ads7843e_unlock(spi);
+
   /* Register the device as an input device */
 
   (void)snprintf(devname, DEV_NAMELEN, DEV_FORMAT, minor);
diff --git a/nuttx/drivers/input/ads7843e.h b/nuttx/drivers/input/ads7843e.h
index 43b79c7b7d..6fd70d98bd 100644
--- a/nuttx/drivers/input/ads7843e.h
+++ b/nuttx/drivers/input/ads7843e.h
@@ -139,6 +139,8 @@ struct ads7843e_dev_s
   uint8_t nwaiters;                     /* Number of threads waiting for ADS7843E data */
   uint8_t id;                           /* Current touch point ID */
   volatile bool penchange;              /* An unreported event is buffered */
+  uint16_t threshx;                     /* Thresholding X value */
+  uint16_t threshy;                     /* Thresholding Y value */
   sem_t devsem;                         /* Manages exclusive access to this structure */
   sem_t waitsem;                        /* Used to wait for the availability of data */
 
diff --git a/nuttx/include/nuttx/input/ads7843e.h b/nuttx/include/nuttx/input/ads7843e.h
index 53aa2f227a..fe4382f2fc 100644
--- a/nuttx/include/nuttx/input/ads7843e.h
+++ b/nuttx/include/nuttx/input/ads7843e.h
@@ -70,6 +70,16 @@
 #  define CONFIG_ADS7843E_SPIMODE SPIDEV_MODE0
 #endif
 
+/* Thresholds */
+
+#ifndef CONFIG_ADS7843E_THRESHX
+#  define CONFIG_ADS7843E_THRESHX 12
+#endif
+
+#ifndef CONFIG_ADS7843E_THRESHY
+#  define CONFIG_ADS7843E_THRESHY 12
+#endif
+
 /* Check for some required settings.  This can save the user a lot of time
  * in getting the right configuration.
  */
@@ -149,7 +159,7 @@ extern "C" {
  *   number
  *
  * Input Parameters:
- *   dev     - An SPI driver instance
+ *   spi     - An SPI driver instance
  *   config  - Persistent board configuration data
  *   minor   - The input device minor number
  *
@@ -159,7 +169,7 @@ extern "C" {
  *
  ****************************************************************************/
 
-EXTERN  int ads7843e_register(FAR struct spi_dev_s *dev,
+EXTERN  int ads7843e_register(FAR struct spi_dev_s *spi,
                              FAR struct ads7843e_config_s *config,
                              int minor);
 
diff --git a/nuttx/include/nuttx/input/stmpe811.h b/nuttx/include/nuttx/input/stmpe811.h
index cea54a34f3..fc311f7c45 100644
--- a/nuttx/include/nuttx/input/stmpe811.h
+++ b/nuttx/include/nuttx/input/stmpe811.h
@@ -85,7 +85,7 @@
  * CONFIG_STMPE811_TEMP_DISABLE
  *   Disable driver temperature sensor functionality.
  * CONFIG_STMPE811_REGDEBUG
- *   Enabled very low register-level debug output.  Requires CONFIG_DEBUG.
+ *   Enable very low register-level debug output.  Requires CONFIG_DEBUG.
  * CONFIG_STMPE811_THRESHX and CONFIG_STMPE811_THRESHY
  *   STMPE811 touchscreen data comes in a a very high rate.  New touch positions
  *   will only be reported when the X or Y data changes by these thresholds.
diff --git a/nuttx/net/Kconfig b/nuttx/net/Kconfig
index 718b28b8fd..d4ea8befb5 100644
--- a/nuttx/net/Kconfig
+++ b/nuttx/net/Kconfig
@@ -18,6 +18,9 @@ choice
 	prompt "Board PHY Selection"
 	depends on ARCH_HAVE_PHY
 	default PHY_KS8721
+	---help---
+		Identify the PHY on your board.  This setting is not used by all Ethernet
+		drivers no do all Ethernet drivers support all PHYs.
 
 config PHY_KS8721
 	bool "Micrel KS8721 PHY"
@@ -28,6 +31,9 @@ config PHY_DP83848C
 config PHY_LAN8720
 	bool "SMSC LAN8720 PHY"
 
+config PHY_DM9161
+	bool "Davicom DM9161 PHY"
+
 endchoice
 
 config NET_NOINTS

From f664e163e5b861f80a013423fbe1018a2de38ed0 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Thu, 27 Sep 2012 20:15:24 +0000
Subject: [PATCH 03/43] Fix STM32 SPI3 remap logic

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5200 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/ChangeLog                             | 3 +++
 nuttx/arch/arm/src/stm32/stm32_gpio.c       | 1 +
 nuttx/configs/shenzhou/nxwm/defconfig       | 6 +++---
 nuttx/configs/shenzhou/src/up_touchscreen.c | 3 ---
 nuttx/drivers/input/ads7843e.c              | 3 +--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 1e667ddcfa..48ebddfca0 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3435,3 +3435,6 @@
 	  DM9161 PHY.  If the DM9161 failed to initialize, then use the
 	  up_sysemreset() logic to reset the MCU.  Contributed by Darcy
 	  Gong.
+	* arch/arm/src/stm32/stm32_gpio.c:  Add missing logic to set bit
+	  for SPI3 remap.  This fixes the XPT2046 touchscreen driver using
+	  drivers/input/ads7843.c
diff --git a/nuttx/arch/arm/src/stm32/stm32_gpio.c b/nuttx/arch/arm/src/stm32/stm32_gpio.c
index 4703e82089..1dedd7ce70 100644
--- a/nuttx/arch/arm/src/stm32/stm32_gpio.c
+++ b/nuttx/arch/arm/src/stm32/stm32_gpio.c
@@ -128,6 +128,7 @@ static inline void stm32_gpioremap(void)
   val |= AFIO_MAPR_SPI1_REMAP;
 #endif
 #ifdef CONFIG_STM32_SPI3_REMAP
+  val |= AFIO_MAPR_SPI3_REMAP;
 #endif
 
 #ifdef CONFIG_STM32_I2C1_REMAP
diff --git a/nuttx/configs/shenzhou/nxwm/defconfig b/nuttx/configs/shenzhou/nxwm/defconfig
index b529907c1d..811ba02667 100644
--- a/nuttx/configs/shenzhou/nxwm/defconfig
+++ b/nuttx/configs/shenzhou/nxwm/defconfig
@@ -362,9 +362,9 @@ CONFIG_INPUT_ADS7843E=y
 # CONFIG_ADS7843E_MULTIPLE is not set
 CONFIG_ADS7843E_SPIMODE=0
 CONFIG_ADS7843E_FREQUENCY=100000
-# CONFIG_ADS7843E_SWAPXY is not set
-CONFIG_ADS7843E_THRESHX=12
-CONFIG_ADS7843E_THRESHY=12
+CONFIG_ADS7843E_SWAPXY=y
+CONFIG_ADS7843E_THRESHX=39
+CONFIG_ADS7843E_THRESHY=51
 # CONFIG_INPUT_STMPE811 is not set
 CONFIG_LCD=y
 # CONFIG_LCD_NOGETRUN is not set
diff --git a/nuttx/configs/shenzhou/src/up_touchscreen.c b/nuttx/configs/shenzhou/src/up_touchscreen.c
index 969b23be45..4740f60a50 100644
--- a/nuttx/configs/shenzhou/src/up_touchscreen.c
+++ b/nuttx/configs/shenzhou/src/up_touchscreen.c
@@ -209,9 +209,6 @@ static bool tsc_busy(FAR struct ads7843e_config_s *state)
    * between sending the command, then reading the returned data.
    */
 
-#if 0
-  up_udelay(1600); /* 1.6MS */
-#endif
   return false;
 }
 
diff --git a/nuttx/drivers/input/ads7843e.c b/nuttx/drivers/input/ads7843e.c
index ce45e4537b..27060bd078 100644
--- a/nuttx/drivers/input/ads7843e.c
+++ b/nuttx/drivers/input/ads7843e.c
@@ -951,8 +951,7 @@ static ssize_t ads7843e_read(FAR struct file *filep, FAR char *buffer, size_t le
 
       if (sample.valid)
         {
-          report->point[0].flags  = TOUCH_UP | TOUCH_ID_VALID |
-                                    TOUCH_POS_VALID | TOUCH_PRESSURE_VALID;
+          report->point[0].flags  = TOUCH_UP | TOUCH_ID_VALID | TOUCH_POS_VALID;
         }
       else
         {

From 8e47dd37d61f50a3c1ef985a93db0180b2688e1c Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Thu, 27 Sep 2012 20:55:15 +0000
Subject: [PATCH 04/43] Fix ID tagging in ADS7843/XPT2046 touchscreen driver

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5201 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/drivers/input/ads7843e.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nuttx/drivers/input/ads7843e.c b/nuttx/drivers/input/ads7843e.c
index 27060bd078..06969e6d27 100644
--- a/nuttx/drivers/input/ads7843e.c
+++ b/nuttx/drivers/input/ads7843e.c
@@ -936,7 +936,7 @@ static ssize_t ads7843e_read(FAR struct file *filep, FAR char *buffer, size_t le
   report = (FAR struct touch_sample_s *)buffer;
   memset(report, 0, SIZEOF_TOUCH_SAMPLE_S(1));
   report->npoints            = 1;
-  report->point[0].id        = priv->id;
+  report->point[0].id        = sample.id;
   report->point[0].x         = sample.x;
   report->point[0].y         = sample.y;
 

From 343817a6fd4a9d7f7ea393071ad2e0935162bdec Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Fri, 28 Sep 2012 19:24:46 +0000
Subject: [PATCH 05/43] Turn off LCD reading on Shenzhou board (needs some TLC
 before it will be usable)

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5202 42af7a65-404d-4744-a932-0658087f49c3
---
 NxWidgets/ChangeLog.txt                 |   2 +
 NxWidgets/Kconfig                       |  11 ++-
 apps/ChangeLog.txt                      |   2 +
 apps/NxWidgets/Kconfig                  |  11 ++-
 nuttx/ChangeLog                         |   8 ++
 nuttx/configs/shenzhou/README.txt       |  42 +++++++---
 nuttx/configs/shenzhou/nxwm/defconfig   |   6 +-
 nuttx/configs/shenzhou/src/up_ssd1289.c |  10 +--
 nuttx/drivers/lcd/ssd1289.c             | 103 +++++++++++++++++++++---
 9 files changed, 159 insertions(+), 36 deletions(-)

diff --git a/NxWidgets/ChangeLog.txt b/NxWidgets/ChangeLog.txt
index 840c0640bc..03b416001c 100644
--- a/NxWidgets/ChangeLog.txt
+++ b/NxWidgets/ChangeLog.txt
@@ -168,3 +168,5 @@
   exactly sure how to do that.
 * libnxwidgets/Makefile and NxWidgets/nxwm/Makefile:  Need updates
   for consistency with recent changes to NuttX build system (>= 6.22)
+* Kconfig:  Add option to turn on the memory monitor feature of the
+  NxWidgets/NxWM unit tests.
diff --git a/NxWidgets/Kconfig b/NxWidgets/Kconfig
index 1d7852507c..6befd1ace9 100644
--- a/NxWidgets/Kconfig
+++ b/NxWidgets/Kconfig
@@ -3,7 +3,7 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-menuconfig NXWIDGETS
+config NXWIDGETS
 	bool "Enable NxWidgets"
 	default n
 	depends on NX && HAVE_CXX
@@ -201,9 +201,16 @@ config NXWIDGETS_CURSORCONTROL_SIZE
 		of cursor controls that can between entered by NX polling cycles
 		without losing data.  Default: 4
 
+config NXWIDGET_MEMMONITOR
+	bool "Memory Usage Monitor"
+	default n
+	---help---
+		Enable memory usage monitor instrumentation.  This feature is only
+		used by the NxWidget/NxWM unit tests.
+
 endif
 
-menuconfig NXWM
+config NXWM
 	bool "Enable NxWM"
 	default n
 	depends on NXWIDGETS && NX_MULTIUSER
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index 64a923559b..a14f513237 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -346,3 +346,5 @@
 	  possible to configure NxWidgets/NxWM without too much trouble (with
 	  the tradeoff being a kind ugly structure and some maintenance issues).
 	* apps/examples/Make.defs: Missing support for apps/examples/watchdog.
+	* apps/NxWidgets/Kconfig:  Add option to turn on the memory monitor
+	  feature of the NxWidgets/NxWM unit tests.
diff --git a/apps/NxWidgets/Kconfig b/apps/NxWidgets/Kconfig
index 1d7852507c..6befd1ace9 100644
--- a/apps/NxWidgets/Kconfig
+++ b/apps/NxWidgets/Kconfig
@@ -3,7 +3,7 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-menuconfig NXWIDGETS
+config NXWIDGETS
 	bool "Enable NxWidgets"
 	default n
 	depends on NX && HAVE_CXX
@@ -201,9 +201,16 @@ config NXWIDGETS_CURSORCONTROL_SIZE
 		of cursor controls that can between entered by NX polling cycles
 		without losing data.  Default: 4
 
+config NXWIDGET_MEMMONITOR
+	bool "Memory Usage Monitor"
+	default n
+	---help---
+		Enable memory usage monitor instrumentation.  This feature is only
+		used by the NxWidget/NxWM unit tests.
+
 endif
 
-menuconfig NXWM
+config NXWM
 	bool "Enable NxWM"
 	default n
 	depends on NXWIDGETS && NX_MULTIUSER
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 48ebddfca0..70c31dceea 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3438,3 +3438,11 @@
 	* arch/arm/src/stm32/stm32_gpio.c:  Add missing logic to set bit
 	  for SPI3 remap.  This fixes the XPT2046 touchscreen driver using
 	  drivers/input/ads7843.c
+	* configs/shenzhou/src/up_ssd1289.c:  Fix naming error in
+	  conditional compilation.
+	* configs/shenzhou/nxwm/defconfig:  Disable reading from the LCD.
+	  This does not work.  The hardware and the driver support the
+	  capability, but there is some bug that causes memory corruption.
+	  The work around for now:  Just disable reading from the LCD.
+	* drivers/lcd/ssd1289.c:  Add some logic to reduce the amount of
+	  output when CONFIG_DEBUG_LCD is enabled.
diff --git a/nuttx/configs/shenzhou/README.txt b/nuttx/configs/shenzhou/README.txt
index 9c358c5a5d..515b487e73 100644
--- a/nuttx/configs/shenzhou/README.txt
+++ b/nuttx/configs/shenzhou/README.txt
@@ -702,11 +702,11 @@ Where <subdir> is one of the following:
     This is a special configuration setup for the NxWM window manager
     UnitTest.  The NxWM window manager can be found here:
 
-      trunk/NxWidgets/nxwm
+      nuttx-code/NxWidgets/nxwm
 
     The NxWM unit test can be found at:
 
-      trunk/NxWidgets/UnitTests/nxwm
+      nuttx-code/NxWidgets/UnitTests/nxwm
 
     NOTE:  JP6 selects between the touchscreen interrupt and the MII
     interrupt.  It should be positioned 1-2 to enable the touchscreen
@@ -714,13 +714,13 @@ Where <subdir> is one of the following:
 
     Documentation for installing the NxWM unit test can be found here:
 
-      trunk/NxWidgets/UnitTests/README.txt
+      nuttx-code/NxWidgets/UnitTests/README.txt
 
     Here is the quick summary of the build steps:
 
     1. Intall the nxwm configuration
 
-       $ cd ~/nuttx/trunk/nuttx/tools
+       $ cd ~/nuttx/nuttx-code/tools
        $ ./configure.sh shenzhou/nxwm
 
     2. Make the build context (only)
@@ -732,25 +732,41 @@ Where <subdir> is one of the following:
 
     3. Install the nxwm unit test
 
-       $ cd ~/nuttx/trunk/NxWidgets
-       $ tools/install.sh ~/nuttx/trunk/apps nxwm
+       $ cd ~/nuttx/nuttx-code/NxWidgets
+       $ tools/install.sh ~/nuttx/nuttx-code/apps nxwm
        Creating symbolic link
-        - To ~/nuttx/trunk/NxWidgets/UnitTests/nxwm
-        - At ~/nuttx/trunk/apps/external
+        - To ~/nuttx/nuttx-code/NxWidgets/UnitTests/nxwm
+        - At ~/nuttx/nuttx-code/apps/external
 
     4. Build the NxWidgets library
 
-       $ cd ~/nuttx/trunk/NxWidgets/libnxwidgets
-       $ make TOPDIR=~/nuttx/trunk/nuttx
+       $ cd ~/nuttx/nuttx-code/NxWidgets/libnxwidgets
+       $ make TOPDIR=~/nuttx/nuttx-code
        ...
 
     5. Build the NxWM library
 
-       $ cd ~/nuttx/trunk/NxWidgets/nxwm
-       $ make TOPDIR=~//nuttx/trunk/nuttx
+       $ cd ~/nuttx/nuttx-code/NxWidgets/nxwm
+       $ make TOPDIR=~/nuttx/nuttx-code
        ...
 
     6. Built NuttX with the installed unit test as the application
 
-       $ cd ~/nuttx/trunk/nuttx
+       $ cd ~/nuttx/nuttx-code
        $ make
+
+    NOTE: Reading from the LCD is not currently supported by this
+    configuration.  The hardware will support reading from the LCD
+    and drivers/lcd/ssd1289.c also supports reading from the LCD.
+    This limits some graphics capabilities.
+
+    If you enable reading from the LCD, you will see some memory
+    corruption.  If you get inspired to debug this problem, you can
+    turn the LCD read functionality back on by setting:
+
+      -CONFIG_LCD_NOGETRUN=y
+      +# CONFIG_LCD_NOGETRUN is not set
+
+      -CONFIG_NX_WRITEONLY=y
+      +# CONFIG_NX_WRITEONLY is not set
+ 
\ No newline at end of file
diff --git a/nuttx/configs/shenzhou/nxwm/defconfig b/nuttx/configs/shenzhou/nxwm/defconfig
index 811ba02667..4b84144b62 100644
--- a/nuttx/configs/shenzhou/nxwm/defconfig
+++ b/nuttx/configs/shenzhou/nxwm/defconfig
@@ -197,7 +197,6 @@ CONFIG_STM32_PHYSR_100FD=0x8000
 CONFIG_STM32_RMII=y
 CONFIG_STM32_RMII_MCO=y
 # CONFIG_STM32_RMII_EXTCLK is not set
-# CONFIG_STM32_ETHMAC_REGDEBUG is not set
 
 #
 # USB Host Configuration
@@ -367,7 +366,7 @@ CONFIG_ADS7843E_THRESHX=39
 CONFIG_ADS7843E_THRESHY=51
 # CONFIG_INPUT_STMPE811 is not set
 CONFIG_LCD=y
-# CONFIG_LCD_NOGETRUN is not set
+CONFIG_LCD_NOGETRUN=y
 CONFIG_LCD_MAXCONTRAST=1
 CONFIG_LCD_MAXPOWER=1
 # CONFIG_LCD_P14201 is not set
@@ -487,7 +486,7 @@ CONFIG_FAT_MAXFNAME=32
 CONFIG_NX=y
 CONFIG_NX_LCDDRIVER=y
 CONFIG_NX_NPLANES=1
-# CONFIG_NX_WRITEONLY is not set
+CONFIG_NX_WRITEONLY=y
 
 #
 # Supported Pixel Depths
@@ -1075,6 +1074,7 @@ CONFIG_NXWIDGETS_CONTINUE_REPEAT_TIME=200
 CONFIG_NXWIDGETS_DOUBLECLICK_TIME=350
 CONFIG_NXWIDGETS_KBDBUFFER_SIZE=16
 CONFIG_NXWIDGETS_CURSORCONTROL_SIZE=4
+# CONFIG_NXWIDGET_MEMMONITOR is not set
 CONFIG_NXWM=y
 
 #
diff --git a/nuttx/configs/shenzhou/src/up_ssd1289.c b/nuttx/configs/shenzhou/src/up_ssd1289.c
index 00e0ac0ddc..50a99bddf7 100644
--- a/nuttx/configs/shenzhou/src/up_ssd1289.c
+++ b/nuttx/configs/shenzhou/src/up_ssd1289.c
@@ -122,7 +122,7 @@ static void stm32_lcdshow(FAR struct stm32_lower_s *priv, FAR const char *msg);
 #endif
 
 static void stm32_wrdata(FAR struct stm32_lower_s *priv, uint16_t data);
-#ifndef CONFIG_SSD1289_WRONLY
+#ifndef CONFIG_LCD_NOGETRUN
 static inline uint16_t stm32_rddata(FAR struct stm32_lower_s *priv);
 #endif
 
@@ -131,7 +131,7 @@ static inline uint16_t stm32_rddata(FAR struct stm32_lower_s *priv);
 static void stm32_select(FAR struct ssd1289_lcd_s *dev);
 static void stm32_deselect(FAR struct ssd1289_lcd_s *dev);
 static void stm32_index(FAR struct ssd1289_lcd_s *dev, uint8_t index);
-#ifndef CONFIG_SSD1289_WRONLY
+#ifndef CONFIG_LCD_NOGETRUN
 static uint16_t stm32_read(FAR struct ssd1289_lcd_s *dev);
 #endif
 static void stm32_write(FAR struct ssd1289_lcd_s *dev, uint16_t data);
@@ -253,7 +253,7 @@ static struct stm32_lower_s g_lcdlower =
     .select    = stm32_select,
     .deselect  = stm32_deselect,
     .index     = stm32_index,
-#ifndef CONFIG_SSD1289_WRONLY
+#ifndef CONFIG_LCD_NOGETRUN
     .read      = stm32_read,
 #endif
     .write     = stm32_write,
@@ -326,7 +326,7 @@ static void stm32_wrdata(FAR struct stm32_lower_s *priv, uint16_t data)
  *
  ************************************************************************************/
 
-#ifndef CONFIG_SSD1289_WRONLY
+#ifndef CONFIG_LCD_NOGETRUN
 static inline uint16_t stm32_rddata(FAR struct stm32_lower_s *priv)
 {
   uint16_t regval;
@@ -407,7 +407,7 @@ static void stm32_index(FAR struct ssd1289_lcd_s *dev, uint8_t index)
  *
  ************************************************************************************/
 
-#ifndef CONFIG_SSD1289_WRONLY
+#ifndef CONFIG_LCD_NOGETRUN
 static uint16_t stm32_read(FAR struct ssd1289_lcd_s *dev)
 {
   FAR struct stm32_lower_s *priv = (FAR struct stm32_lower_s *)dev;
diff --git a/nuttx/drivers/lcd/ssd1289.c b/nuttx/drivers/lcd/ssd1289.c
index f5f11b87dc..e42b5bdedc 100644
--- a/nuttx/drivers/lcd/ssd1289.c
+++ b/nuttx/drivers/lcd/ssd1289.c
@@ -229,8 +229,8 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg              dbg
-#  define lcdvdbg             vdbg
+#  define lcddbg  dbg
+#  define lcdvdbg vdbg
 #else
 #  define lcddbg(x...)
 #  define lcdvdbg(x...)
@@ -253,6 +253,16 @@ struct ssd1289_dev_s
   FAR struct ssd1289_lcd_s *lcd;  /* The contained platform-specific, LCD interface */
   uint8_t power;                  /* Current power setting */
 
+  /* These fields simplify and reduce debug output */
+
+#ifdef CONFIG_DEBUG_LCD
+  bool put;                       /* Last raster operation was a putrun */
+  fb_coord_t firstrow;            /* First row of the run */
+  fb_coord_t lastrow;             /* Last row of the run */
+  fb_coord_t col;                 /* Column of the run */
+  size_t npixels;                 /* Length of the run */
+#endif
+
   /* This is working memory allocated by the LCD driver for each LCD device
    * and for each color plane.  This memory will hold one raster line of data.
    * The size of the allocated run buffer must therefore be at least
@@ -287,6 +297,19 @@ static void ssd1289_setcursor(FAR struct ssd1289_lcd_s *lcd, uint16_t column,
 
 /* LCD Data Transfer Methods */
 
+#if 0 /* Sometimes useful */
+static void ssd1289_dumprun(FAR const char *msg, FAR uint16_t *run, size_t npixels);
+#else
+#  define ssd1289_dumprun(m,r,n)
+#endif
+
+#ifdef CONFIG_DEBUG_LCD
+static void ssd1289_showrun(FAR struct ssd1289_dev_s *priv, fb_coord_t row,
+                            fb_coord_t col, size_t npixels, bool put);
+#else
+#  define ssd1289_showrun(p,r,c,n,b)
+#endif
+
 static int ssd1289_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
              size_t npixels);
 static int ssd1289_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
@@ -488,6 +511,64 @@ static void ssd1289_dumprun(FAR const char *msg, FAR uint16_t *run, size_t npixe
 }
 #endif
 
+/**************************************************************************************
+ * Name:  ssd1289_showrun
+ *
+ * Description:
+ *   When LCD debug is enabled, try to reduce then amount of ouptut data generated by
+ *   ssd1289_putrun and ssd1289_getrun
+ *
+ **************************************************************************************/
+
+#ifdef CONFIG_DEBUG_LCD
+static void ssd1289_showrun(FAR struct ssd1289_dev_s *priv, fb_coord_t row,
+                            fb_coord_t col, size_t npixels, bool put)
+{
+  fb_coord_t nextrow = priv->lastrow + 1;
+
+  /* Has anything changed (other than the row is the next row in the sequence)? */
+
+  if (put == priv->put && row == nextrow && col == priv->col &&
+      npixels == priv->npixels)
+    {
+      /* No, just update the last row */
+
+      priv->lastrow = nextrow;
+    }
+  else
+    {
+      /* Yes... then this is the end of the preceding sequence.  Output the last run
+       * (if there were more than one run in the sequence).
+       */
+
+      if (priv->firstrow != priv->lastrow)
+        {
+          lcddbg("...\n");
+          lcddbg("%s row: %d col: %d npixels: %d\n",
+                 priv->put ? "PUT" : "GET",
+                 priv->lastrow, priv->col, priv->npixels);
+        }
+
+      /* And we are starting a new sequence.  Output the first run of the
+       * new sequence
+       */
+
+      lcddbg("%s row: %d col: %d npixels: %d\n",
+             put ? "PUT" : "GET", row, col, npixels);
+
+      /* And save information about the run so that we can detect continuations
+       * of the sequence.
+       */
+
+      priv->put      = put;
+      priv->firstrow = row;
+      priv->lastrow  = row;
+      priv->col      = col;
+      priv->npixels  = npixels;
+    }
+}
+#endif
+
 /**************************************************************************************
  * Name:  ssd1289_putrun
  *
@@ -512,7 +593,7 @@ static int ssd1289_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buf
  
   /* Buffer must be provided and aligned to a 16-bit address boundary */
 
-  lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  ssd1289_showrun(priv, row, col, npixels, true);
   DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
 
   /* Select the LCD */
@@ -536,7 +617,7 @@ static int ssd1289_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buf
       ssd1289_gramselect(lcd);
       ssd1289_gramwrite(lcd, *src);
 
-      /* Increment to next column */
+      /* Increment to the next column */
 
       src++;
       col++;
@@ -581,7 +662,7 @@ static int ssd1289_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buf
       ssd1289_gramselect(lcd);
       ssd1289_gramwrite(lcd, *src);
 
-      /* Increment to next column */
+      /* Increment to the next column */
 
       src++;
       col--;
@@ -604,7 +685,7 @@ static int ssd1289_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buf
       ssd1289_gramselect(lcd);
       ssd1289_gramwrite(lcd, *src);
 
-      /* Decrement to next column */
+      /* Decrement to the next column */
 
       src++;
       col++;
@@ -632,7 +713,7 @@ static int ssd1289_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buf
  **************************************************************************************/
 
 static int ssd1289_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
-                       size_t npixels)
+                          size_t npixels)
 {
 #ifndef CONFIG_LCD_NOGETRUN
   FAR struct ssd1289_dev_s *priv = &g_lcddev;
@@ -643,7 +724,7 @@ static int ssd1289_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
  
   /* Buffer must be provided and aligned to a 16-bit address boundary */
 
-  lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  ssd1289_showrun(priv, row, col, npixels, false);
   DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
 
   /* Select the LCD */
@@ -666,7 +747,7 @@ static int ssd1289_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
       ssd1289_readsetup(lcd, &accum);
       *dest++ = ssd1289_gramread(lcd, &accum);
 
-      /* Increment to next column */
+      /* Increment to the next column */
 
       col++;
     }
@@ -715,7 +796,7 @@ static int ssd1289_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
       ssd1289_readsetup(lcd, &accum);
       *dest++ = ssd1289_gramread(lcd, &accum);
 
-      /* Increment to next column */
+      /* Increment to the next column */
 
       col--;
     }
@@ -738,7 +819,7 @@ static int ssd1289_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
       ssd1289_readsetup(lcd, &accum);
       *dest++ = ssd1289_gramread(lcd, &accum);
 
-      /* Decrement to next column */
+      /* Decrement to the next column */
 
       col++;
     }

From 4333422d5fb28a10118a186f8af53c903a49b7bc Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Fri, 28 Sep 2012 22:45:12 +0000
Subject: [PATCH 06/43] Put Shenzhou NxWM config on a diet

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5203 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/ChangeLog                       |  4 ++
 nuttx/configs/shenzhou/README.txt     |  6 +-
 nuttx/configs/shenzhou/nxwm/defconfig | 81 ++++++++-------------------
 3 files changed, 31 insertions(+), 60 deletions(-)

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 70c31dceea..ed9962df0f 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3446,3 +3446,7 @@
 	  The work around for now:  Just disable reading from the LCD.
 	* drivers/lcd/ssd1289.c:  Add some logic to reduce the amount of
 	  output when CONFIG_DEBUG_LCD is enabled.
+	* configs/shenzhou/nxwm/defconfig:  Bug found and fixed... The
+	  original configuration had too much stuff turned on.  Reducing
+	  stack sizes, some features, and buffer sizes made the
+	  configuration reliable (Reading from the LCD is still disabled).
diff --git a/nuttx/configs/shenzhou/README.txt b/nuttx/configs/shenzhou/README.txt
index 515b487e73..fcc39de74d 100644
--- a/nuttx/configs/shenzhou/README.txt
+++ b/nuttx/configs/shenzhou/README.txt
@@ -760,9 +760,9 @@ Where <subdir> is one of the following:
     and drivers/lcd/ssd1289.c also supports reading from the LCD.
     This limits some graphics capabilities.
 
-    If you enable reading from the LCD, you will see some memory
-    corruption.  If you get inspired to debug this problem, you can
-    turn the LCD read functionality back on by setting:
+    Reading from the LCD is not supported only because it has not
+    been test.  If you get inspired to test this feature, you can
+    turn the LCD read functionality on by setting:
 
       -CONFIG_LCD_NOGETRUN=y
       +# CONFIG_LCD_NOGETRUN is not set
diff --git a/nuttx/configs/shenzhou/nxwm/defconfig b/nuttx/configs/shenzhou/nxwm/defconfig
index 4b84144b62..1b21fbd1ba 100644
--- a/nuttx/configs/shenzhou/nxwm/defconfig
+++ b/nuttx/configs/shenzhou/nxwm/defconfig
@@ -121,15 +121,15 @@ CONFIG_STM32_CODESOURCERYW=y
 # CONFIG_STM32_CRC is not set
 # CONFIG_STM32_DMA1 is not set
 # CONFIG_STM32_DMA2 is not set
-CONFIG_STM32_BKP=y
+# CONFIG_STM32_BKP is not set
 # CONFIG_STM32_CAN1 is not set
 # CONFIG_STM32_DAC1 is not set
 # CONFIG_STM32_DAC2 is not set
 CONFIG_STM32_ETHMAC=y
-CONFIG_STM32_I2C1=y
+# CONFIG_STM32_I2C1 is not set
 # CONFIG_STM32_I2C2 is not set
 # CONFIG_STM32_IWDG is not set
-CONFIG_STM32_PWR=y
+# CONFIG_STM32_PWR is not set
 # CONFIG_STM32_SPI1 is not set
 # CONFIG_STM32_SPI2 is not set
 CONFIG_STM32_SPI3=y
@@ -149,14 +149,12 @@ CONFIG_STM32_USART2=y
 # CONFIG_STM32_USB is not set
 # CONFIG_STM32_WWDG is not set
 CONFIG_STM32_SPI=y
-CONFIG_STM32_I2C=y
 
 #
 # Alternate Pin Mapping
 #
 CONFIG_STM32_USART2_REMAP=y
 CONFIG_STM32_SPI3_REMAP=y
-# CONFIG_STM32_I2C1_REMAP is not set
 CONFIG_STM32_ETH_REMAP=y
 # CONFIG_STM32_JTAG_DISABLE is not set
 CONFIG_STM32_JTAG_FULL_ENABLE=y
@@ -171,15 +169,6 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_STM32_SPI_INTERRUPTS is not set
 # CONFIG_STM32_SPI_DMA is not set
 
-#
-# I2C Configuration
-#
-# CONFIG_STM32_I2C_DYNTIMEO is not set
-CONFIG_STM32_I2CTIMEOSEC=0
-CONFIG_STM32_I2CTIMEOMS=500
-CONFIG_STM32_I2CTIMEOTICKS=500
-# CONFIG_STM32_I2C_DUTY16_9 is not set
-
 #
 # Ethernet MAC configuration
 #
@@ -285,10 +274,10 @@ CONFIG_SDCLONE_DISABLE=y
 CONFIG_SCHED_WORKQUEUE=y
 CONFIG_SCHED_WORKPRIORITY=192
 CONFIG_SCHED_WORKPERIOD=50000
-CONFIG_SCHED_WORKSTACKSIZE=2048
+CONFIG_SCHED_WORKSTACKSIZE=1024
 CONFIG_SIG_SIGWORK=4
 # CONFIG_SCHED_LPWORK is not set
-CONFIG_SCHED_WAITPID=y
+# CONFIG_SCHED_WAITPID is not set
 # CONFIG_SCHED_ATEXIT is not set
 CONFIG_SCHED_ONEXIT=y
 CONFIG_SCHED_ONEXIT_MAX=1
@@ -323,9 +312,9 @@ CONFIG_PREALLOC_TIMERS=4
 #
 # CONFIG_CUSTOM_STACK is not set
 CONFIG_IDLETHREAD_STACKSIZE=1024
-CONFIG_USERMAIN_STACKSIZE=2048
+CONFIG_USERMAIN_STACKSIZE=1024
 CONFIG_PTHREAD_STACK_MIN=256
-CONFIG_PTHREAD_STACK_DEFAULT=2048
+CONFIG_PTHREAD_STACK_DEFAULT=1024
 
 #
 # Device Drivers
@@ -336,22 +325,13 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_PWM is not set
-CONFIG_I2C=y
-# CONFIG_I2C_SLAVE is not set
-CONFIG_I2C_TRANSFER=y
-# CONFIG_I2C_WRITEREAD is not set
-CONFIG_I2C_POLLED=y
-# CONFIG_I2C_TRACE is not set
+# CONFIG_I2C is not set
 CONFIG_ARCH_HAVE_I2CRESET=y
-# CONFIG_I2C_RESET is not set
 CONFIG_SPI=y
 # CONFIG_SPI_OWNBUS is not set
 CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_CMDDATA is not set
-CONFIG_RTC=y
-# CONFIG_RTC_DATETIME is not set
-# CONFIG_RTC_HIRES is not set
-# CONFIG_RTC_ALARM is not set
+# CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_ANALOG is not set
 # CONFIG_BCH is not set
@@ -432,16 +412,16 @@ CONFIG_PHY_DM9161=y
 # CONFIG_NET_NOINTS is not set
 CONFIG_NET_MULTIBUFFER=y
 # CONFIG_NET_IPv6 is not set
-CONFIG_NSOCKET_DESCRIPTORS=10
+CONFIG_NSOCKET_DESCRIPTORS=16
 CONFIG_NET_NACTIVESOCKETS=16
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_BUFSIZE=562
 # CONFIG_NET_TCPURGDATA is not set
 CONFIG_NET_TCP=y
-CONFIG_NET_TCP_CONNS=40
-CONFIG_NET_MAX_LISTENPORTS=40
+CONFIG_NET_TCP_CONNS=16
+CONFIG_NET_MAX_LISTENPORTS=16
 CONFIG_NET_TCP_READAHEAD_BUFSIZE=562
-CONFIG_NET_NTCP_READAHEAD_BUFFERS=16
+CONFIG_NET_NTCP_READAHEAD_BUFFERS=4
 CONFIG_NET_TCP_RECVDELAY=0
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_UDP=y
@@ -464,12 +444,7 @@ CONFIG_NET_ARPTAB_SIZE=16
 #
 # File system configuration
 #
-CONFIG_FS_FAT=y
-CONFIG_FAT_LCNAMES=y
-CONFIG_FAT_LFN=y
-CONFIG_FAT_MAXFNAME=32
-# CONFIG_FS_FATTIME is not set
-# CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FS_FAT is not set
 # CONFIG_FS_RAMMAP is not set
 # CONFIG_NFS is not set
 # CONFIG_FS_NXFFS is not set
@@ -962,7 +937,7 @@ CONFIG_NETUTILS_WEBCLIENT=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
-CONFIG_NSH_BUILTIN_APPS=y
+# CONFIG_NSH_BUILTIN_APPS is not set
 
 #
 # Disable Individual commands
@@ -1016,9 +991,9 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
 CONFIG_NSH_TELNETD_DAEMONPRIO=100
-CONFIG_NSH_TELNETD_DAEMONSTACKSIZE=2048
+CONFIG_NSH_TELNETD_DAEMONSTACKSIZE=1596
 CONFIG_NSH_TELNETD_CLIENTPRIO=100
-CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=2048
+CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=1596
 CONFIG_NSH_IOBUFFER_SIZE=512
 CONFIG_NSH_IPADDR=0x0a000002
 CONFIG_NSH_DRIPADDR=0x0a000001
@@ -1036,10 +1011,10 @@ CONFIG_NXWIDGETS=y
 CONFIG_NXWIDGETS_DEVNO=0
 CONFIG_NXWIDGETS_VPLANE=0
 CONFIG_NXWIDGETS_SERVERPRIO=51
-CONFIG_NXWIDGETS_SERVERSTACK=2048
+CONFIG_NXWIDGETS_SERVERSTACK=1596
 CONFIG_NXWIDGETS_CLIENTPRIO=50
 CONFIG_NXWIDGETS_LISTENERPRIO=50
-CONFIG_NXWIDGETS_LISTENERSTACK=2048
+CONFIG_NXWIDGETS_LISTENERSTACK=1596
 # CONFIG_NXWIDGETS_EXTERNINIT is not set
 # CONFIG_NXWIDGET_EVENTWAIT is not set
 
@@ -1128,13 +1103,13 @@ CONFIG_NXWM_STARTWINDOW_MQNAME="/dev/nxwm"
 CONFIG_NXWM_STARTWINDOW_MXMSGS=32
 CONFIG_NXWM_STARTWINDOW_MXMPRIO=42
 CONFIG_NXWM_STARTWINDOW_PRIO=50
-CONFIG_NXWM_STARTWINDOW_STACKSIZE=2048
+CONFIG_NXWM_STARTWINDOW_STACKSIZE=1596
 
 #
 # NxConsole Window Configuration
 #
 CONFIG_NXWM_NXCONSOLE_PRIO=50
-CONFIG_NXWM_NXCONSOLE_STACKSIZE=2048
+CONFIG_NXWM_NXCONSOLE_STACKSIZE=1596
 CONFIG_NXWM_NXCONSOLE_WCOLOR=
 CONFIG_NXWM_NXCONSOLE_FONTCOLOR=
 CONFIG_NXWM_NXCONSOLE_FONTID=
@@ -1148,7 +1123,7 @@ CONFIG_NXWM_TOUCHSCREEN_DEVNO=0
 CONFIG_NXWM_TOUCHSCREEN_DEVPATH="/dev/input0"
 CONFIG_NXWM_TOUCHSCREEN_SIGNO=5
 CONFIG_NXWM_TOUCHSCREEN_LISTENERPRIO=50
-CONFIG_NXWM_TOUCHSCREEN_LISTENERSTACK=
+CONFIG_NXWM_TOUCHSCREEN_LISTENERSTACK=1596
 CONFIG_NXWM_KEYBOARD=y
 
 #
@@ -1158,7 +1133,7 @@ CONFIG_NXWM_KEYBOARD_DEVPATH="/dev/console"
 CONFIG_NXWM_KEYBOARD_SIGNO=6
 CONFIG_NXWM_KEYBOARD_BUFSIZE=16
 CONFIG_NXWM_KEYBOARD_LISTENERPRIO=50
-CONFIG_NXWM_KEYBOARD_LISTENERSTACK=2048
+CONFIG_NXWM_KEYBOARD_LISTENERSTACK=1024
 
 #
 # Calibration display settings
@@ -1170,7 +1145,7 @@ CONFIG_NXWM_CALIBRATION_TOUCHEDCOLOR=
 CONFIG_NXWM_CALIBRATION_ICON=""
 CONFIG_NXWM_CALIBRATION_SIGNO=5
 CONFIG_NXWM_CALIBRATION_LISTENERPRIO=50
-CONFIG_NXWM_CALIBRATION_LISTENERSTACK=2048
+CONFIG_NXWM_CALIBRATION_LISTENERSTACK=1024
 
 #
 # Calibration display settings
@@ -1191,14 +1166,6 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5
 #
 # I2C tool
 #
-CONFIG_SYSTEM_I2CTOOL=y
-CONFIG_I2CTOOL_BUILTIN=y
-CONFIG_I2CTOOL_MINBUS=1
-CONFIG_I2CTOOL_MAXBUS=3
-CONFIG_I2CTOOL_MINADDR=0x03
-CONFIG_I2CTOOL_MAXADDR=0x77
-CONFIG_I2CTOOL_MAXREGADDR=0xff
-CONFIG_I2CTOOL_DEFFREQ=100000
 
 #
 # FLASH Program Installation

From ccb682f332e5ad1d9cdfd97a9a3ee12e6d00b898 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sat, 29 Sep 2012 14:13:04 +0000
Subject: [PATCH 07/43] Fix problem with ping that prevent ping from going
 outside local network (Darcy Gong)

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5204 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/ChangeLog                            |   3 +
 nuttx/configs/shenzhou/README.txt          |  23 +--
 nuttx/configs/sim/README.txt               |   6 +-
 nuttx/configs/stm3220g-eval/README.txt     |  29 ++--
 nuttx/configs/stm3220g-eval/nxwm/defconfig |  14 +-
 nuttx/configs/stm3240g-eval/README.txt     |  29 ++--
 nuttx/net/uip/uip_icmpping.c               | 161 +++++++++++----------
 7 files changed, 145 insertions(+), 120 deletions(-)

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index ed9962df0f..526c8a3350 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3450,3 +3450,6 @@
 	  original configuration had too much stuff turned on.  Reducing
 	  stack sizes, some features, and buffer sizes made the
 	  configuration reliable (Reading from the LCD is still disabled).
+	* net/uip/uip_icmpping.c:  Fix problem that prevented ping from
+	  going outside of local network.  Submitted by Darcy Gong
+
diff --git a/nuttx/configs/shenzhou/README.txt b/nuttx/configs/shenzhou/README.txt
index fcc39de74d..1f3f254aab 100644
--- a/nuttx/configs/shenzhou/README.txt
+++ b/nuttx/configs/shenzhou/README.txt
@@ -716,11 +716,12 @@ Where <subdir> is one of the following:
 
       nuttx-code/NxWidgets/UnitTests/README.txt
 
-    Here is the quick summary of the build steps:
+    Here is the quick summary of the build steps (Assuming that all of
+    the required packages are available in a directory ~/nuttx-code):
 
     1. Intall the nxwm configuration
 
-       $ cd ~/nuttx/nuttx-code/tools
+       $ cd ~/nuttx-code/tools
        $ ./configure.sh shenzhou/nxwm
 
     2. Make the build context (only)
@@ -732,27 +733,27 @@ Where <subdir> is one of the following:
 
     3. Install the nxwm unit test
 
-       $ cd ~/nuttx/nuttx-code/NxWidgets
-       $ tools/install.sh ~/nuttx/nuttx-code/apps nxwm
+       $ cd ~/nuttx-code/NxWidgets
+       $ tools/install.sh ~/nuttx-code/apps nxwm
        Creating symbolic link
-        - To ~/nuttx/nuttx-code/NxWidgets/UnitTests/nxwm
-        - At ~/nuttx/nuttx-code/apps/external
+        - To ~/nuttx-code/NxWidgets/UnitTests/nxwm
+        - At ~/nuttx-code/apps/external
 
     4. Build the NxWidgets library
 
-       $ cd ~/nuttx/nuttx-code/NxWidgets/libnxwidgets
-       $ make TOPDIR=~/nuttx/nuttx-code
+       $ cd ~/nuttx-code/NxWidgets/libnxwidgets
+       $ make TOPDIR=~/nuttx-code
        ...
 
     5. Build the NxWM library
 
-       $ cd ~/nuttx/nuttx-code/NxWidgets/nxwm
-       $ make TOPDIR=~/nuttx/nuttx-code
+       $ cd ~/nuttx-code/NxWidgets/nxwm
+       $ make TOPDIR=~/nuttx-code
        ...
 
     6. Built NuttX with the installed unit test as the application
 
-       $ cd ~/nuttx/nuttx-code
+       $ cd ~/nuttx-code
        $ make
 
     NOTE: Reading from the LCD is not currently supported by this
diff --git a/nuttx/configs/sim/README.txt b/nuttx/configs/sim/README.txt
index 833ec58dc7..b8a921e7f4 100644
--- a/nuttx/configs/sim/README.txt
+++ b/nuttx/configs/sim/README.txt
@@ -409,15 +409,15 @@ nxwm
   This is a special configuration setup for the NxWM window manager
   UnitTest.  The NxWM window manager can be found here:
 
-    trunk/NxWidgets/nxwm
+    nuttx-code/NxWidgets/nxwm
 
   The NxWM unit test can be found at:
 
-    trunk/NxWidgets/UnitTests/nxwm
+    nuttx-code/NxWidgets/UnitTests/nxwm
 
   Documentation for installing the NxWM unit test can be found here:
 
-    trunk/NxWidgets/UnitTests/READEM.txt
+    nuttx-code/NxWidgets/UnitTests/READEM.txt
 
   NOTE:  There is an issue with running this example under the
   simulation.  In the default configuration, this example will
diff --git a/nuttx/configs/stm3220g-eval/README.txt b/nuttx/configs/stm3220g-eval/README.txt
index b3b7fd476f..89c6b92330 100644
--- a/nuttx/configs/stm3220g-eval/README.txt
+++ b/nuttx/configs/stm3220g-eval/README.txt
@@ -947,21 +947,22 @@ Where <subdir> is one of the following:
     This is a special configuration setup for the NxWM window manager
     UnitTest.  The NxWM window manager can be found here:
 
-      trunk/NxWidgets/nxwm
+      nuttx-code/NxWidgets/nxwm
 
     The NxWM unit test can be found at:
 
-      trunk/NxWidgets/UnitTests/nxwm
+      nuttx-code/NxWidgets/UnitTests/nxwm
 
     Documentation for installing the NxWM unit test can be found here:
 
-      trunk/NxWidgets/UnitTests/README.txt
+      nuttx-code/NxWidgets/UnitTests/README.txt
 
-    Here is the quick summary of the build steps:
+    Here is the quick summary of the build steps (Assuming that all of
+    the required packages are available in a directory ~/nuttx-code):
 
     1. Intall the nxwm configuration
 
-       $ cd ~/nuttx/trunk/nuttx/tools
+       $ cd ~/nuttx-code/nuttx/tools
        $ ./configure.sh stm3220g-eval/nxwm
 
     2. Make the build context (only)
@@ -973,27 +974,27 @@ Where <subdir> is one of the following:
 
     3. Install the nxwm unit test
 
-       $ cd ~/nuttx/trunk/NxWidgets
-       $ tools/install.sh ~/nuttx/trunk/apps nxwm
+       $ cd ~/nuttx-code/NxWidgets
+       $ tools/install.sh ~/nuttx-code/apps nxwm
        Creating symbolic link
-        - To ~/nuttx/trunk/NxWidgets/UnitTests/nxwm
-        - At ~/nuttx/trunk/apps/external
+        - To ~/nuttx-code/NxWidgets/UnitTests/nxwm
+        - At ~/nuttx-code/apps/external
 
     4. Build the NxWidgets library
 
-       $ cd ~/nuttx/trunk/NxWidgets/libnxwidgets
-       $ make TOPDIR=~/nuttx/trunk/nuttx
+       $ cd ~/nuttx-code/NxWidgets/libnxwidgets
+       $ make TOPDIR=~/nuttx-code/nuttx
        ...
 
     5. Build the NxWM library
 
-       $ cd ~/nuttx/trunk/NxWidgets/nxwm
-       $ make TOPDIR=~//nuttx/trunk/nuttx
+       $ cd ~/nuttx-code/NxWidgets/nxwm
+       $ make TOPDIR=~/nuttx-code/nuttx
        ...
 
     6. Built NuttX with the installed unit test as the application
 
-       $ cd ~/nuttx/trunk/nuttx
+       $ cd ~/nuttx-code/nuttx
        $ make
 
   ostest:
diff --git a/nuttx/configs/stm3220g-eval/nxwm/defconfig b/nuttx/configs/stm3220g-eval/nxwm/defconfig
index 7b7028cf84..83c2f48417 100644
--- a/nuttx/configs/stm3220g-eval/nxwm/defconfig
+++ b/nuttx/configs/stm3220g-eval/nxwm/defconfig
@@ -507,7 +507,7 @@ CONFIG_STMPE811_THRESHX=39
 CONFIG_STMPE811_THRESHY=51
 
 #
-# USB Device Configuration
+# STM32 USB OTG FS Device Configuration
 #
 CONFIG_USBDEV=n
 CONFIG_USBDEV_ISOCHRONOUS=n
@@ -518,6 +518,18 @@ CONFIG_USBDEV_MAXPOWER=100
 CONFIG_USBDEV_TRACE=n
 CONFIG_USBDEV_TRACE_NRECORDS=128
 
+#
+# STM32 USB OTG FS Host Configuration
+#
+CONFIG_USBHOST=n
+#CONFIG_STM32_OTGFS_RXFIFO_SIZE
+#CONFIG_STM32_OTGFS_NPTXFIFO_SIZE
+#CONFIG_STM32_OTGFS_PTXFIFO_SIZE
+#CONFIG_STM32_OTGFS_DESCSIZE
+CONFIG_STM32_OTGFS_SOFINTR=n
+CONFIG_STM32_USBHOST_REGDEBUG=n
+CONFIG_STM32_USBHOST_PKTDUMP=n
+
 #
 # USB Serial Device Configuration
 #
diff --git a/nuttx/configs/stm3240g-eval/README.txt b/nuttx/configs/stm3240g-eval/README.txt
index 75ca1ea77f..df98f087d5 100644
--- a/nuttx/configs/stm3240g-eval/README.txt
+++ b/nuttx/configs/stm3240g-eval/README.txt
@@ -1226,21 +1226,22 @@ Where <subdir> is one of the following:
     This is a special configuration setup for the NxWM window manager
     UnitTest.  The NxWM window manager can be found here:
 
-      trunk/NxWidgets/nxwm
+      nuttx-code/NxWidgets/nxwm
 
     The NxWM unit test can be found at:
 
-      trunk/NxWidgets/UnitTests/nxwm
+      nuttx-code/NxWidgets/UnitTests/nxwm
 
     Documentation for installing the NxWM unit test can be found here:
 
-      trunk/NxWidgets/UnitTests/README.txt
+      nuttx-code/NxWidgets/UnitTests/README.txt
 
-    Here is the quick summary of the build steps:
+    Here is the quick summary of the build steps (Assuming that all of
+    the required packages are available in a directory ~/nuttx-code):
 
     1. Intall the nxwm configuration
 
-       $ cd ~/nuttx/trunk/nuttx/tools
+       $ cd ~/nuttx-code/nuttx/tools
        $ ./configure.sh stm3240g-eval/nxwm
 
     2. Make the build context (only)
@@ -1252,27 +1253,27 @@ Where <subdir> is one of the following:
 
     3. Install the nxwm unit test
 
-       $ cd ~/nuttx/trunk/NxWidgets
-       $ tools/install.sh ~/nuttx/trunk/apps nxwm
+       $ cd ~/nuttx-code/NxWidgets
+       $ tools/install.sh ~/nuttx-code/apps nxwm
        Creating symbolic link
-        - To ~/nuttx/trunk/NxWidgets/UnitTests/nxwm
-        - At ~/nuttx/trunk/apps/external
+        - To ~/nuttx-code/NxWidgets/UnitTests/nxwm
+        - At ~/nuttx-code/apps/external
 
     4. Build the NxWidgets library
 
-       $ cd ~/nuttx/trunk/NxWidgets/libnxwidgets
-       $ make TOPDIR=~/nuttx/trunk/nuttx
+       $ cd ~/nuttx-code/NxWidgets/libnxwidgets
+       $ make TOPDIR=~/nuttx-code/nuttx
        ...
 
     5. Build the NxWM library
 
-       $ cd ~/nuttx/trunk/NxWidgets/nxwm
-       $ make TOPDIR=~//nuttx/trunk/nuttx
+       $ cd ~/nuttx-code/NxWidgets/nxwm
+       $ make TOPDIR=~/nuttx-code/nuttx
        ...
 
     6. Built NuttX with the installed unit test as the application
 
-       $ cd ~/nuttx/trunk/nuttx
+       $ cd ~/nuttx-code/nuttx
        $ make
 
   ostest:
diff --git a/nuttx/net/uip/uip_icmpping.c b/nuttx/net/uip/uip_icmpping.c
index 356187d099..e3ebf72520 100644
--- a/nuttx/net/uip/uip_icmpping.c
+++ b/nuttx/net/uip/uip_icmpping.c
@@ -148,122 +148,129 @@ static inline int ping_timeout(struct icmp_ping_s *pstate)
  ****************************************************************************/
 
 static uint16_t ping_interrupt(struct uip_driver_s *dev, void *conn,
-                             void *pvpriv, uint16_t flags)
+                               void *pvpriv, uint16_t flags)
 {
   struct icmp_ping_s *pstate = (struct icmp_ping_s *)pvpriv;
   uint8_t *ptr;
-  int failcode = -ETIMEDOUT;
   int i;
 
   nllvdbg("flags: %04x\n", flags);
   if (pstate)
     {
-      /* Check if this device is on the same network as the destination device. */
+      /* Check if this is a ICMP ECHO reply.  If so, return the sequence
+       * number to the caller.  NOTE: We may not even have sent the
+       * requested ECHO request; this could have been the delayed ECHO
+       * response from a previous ping.
+       */
 
-      if (!uip_ipaddr_maskcmp(pstate->png_addr, dev->d_ipaddr, dev->d_netmask))
+      if ((flags & UIP_ECHOREPLY) != 0 && conn != NULL)
         {
-          /* Destination address was not on the local network served by this
-           * device.  If a timeout occurs, then the most likely reason is
-           * that the destination address is not reachable.
-           */
+          struct uip_icmpip_hdr *icmp = (struct uip_icmpip_hdr *)conn;
+          nlldbg("ECHO reply: id=%d seqno=%d\n",
+                 ntohs(icmp->id), ntohs(icmp->seqno));
 
-          nllvdbg("Not reachable\n");
-          failcode = -ENETUNREACH;
-        }
-      else
-        {
-          /* Check if this is a ICMP ECHO reply.  If so, return the sequence
-           * number to the caller.  NOTE: We may not even have sent the
-           * requested ECHO request; this could have been the delayed ECHO
-           * response from a previous ping.
-           */
-
-          if ((flags & UIP_ECHOREPLY) != 0 && conn != NULL)
+          if (ntohs(icmp->id) == pstate->png_id)
             {
-              struct uip_icmpip_hdr *icmp = (struct uip_icmpip_hdr *)conn;
-              nlldbg("ECHO reply: id=%d seqno=%d\n", ntohs(icmp->id), ntohs(icmp->seqno));
+              /* Consume the ECHOREPLY */
 
-              if (ntohs(icmp->id) == pstate->png_id)
-                {
-                  /* Consume the ECHOREPLY */
+              flags     &= ~UIP_ECHOREPLY;
+              dev->d_len = 0;
 
-                  flags &= ~UIP_ECHOREPLY;
-                  dev->d_len = 0;
+              /* Return the result to the caller */
 
-                  /* Return the result to the caller */
-
-                  pstate->png_result = OK;
-                  pstate->png_seqno  = ntohs(icmp->seqno);
-                  goto end_wait;
-                }
+              pstate->png_result = OK;
+              pstate->png_seqno  = ntohs(icmp->seqno);
+              goto end_wait;
             }
+        }
 
-          /* Check:
-           *   If the outgoing packet is available (it may have been claimed
-           *   by a sendto interrupt serving a different thread
-           * -OR-
-           *   If the output buffer currently contains unprocessed incoming
-           *   data.
-           * -OR-
-           *   If we have alread sent the ECHO request
+      /* Check:
+       *   If the outgoing packet is available (it may have been claimed
+       *   by a sendto interrupt serving a different thread)
+       * -OR-
+       *   If the output buffer currently contains unprocessed incoming
+       *   data.
+       * -OR-
+       *   If we have alread sent the ECHO request
+       *
+       * In the first two cases, we will just have to wait for the next
+       * polling cycle.
+       */
+
+      if (dev->d_sndlen <= 0 &&           /* Packet available */
+          (flags & UIP_NEWDATA) == 0 &&   /* No incoming data */
+          !pstate->png_sent)              /* Request not sent */
+        {
+          struct uip_icmpip_hdr *picmp = ICMPBUF;
+
+          /* We can send the ECHO request now.
            *
-           * In the first two cases, we will just have to wait for the next
-           * polling cycle.
+           * Format the ICMP ECHO request packet
            */
 
-          if (dev->d_sndlen <= 0 &&           /* Packet available */
-              (flags & UIP_NEWDATA) == 0 &&   /* No incoming data */
-              !pstate->png_sent)              /* Request not sent */
-            {
-              struct uip_icmpip_hdr *picmp = ICMPBUF;
-
-              /* We can send the ECHO request now.
-               *
-               * Format the ICMP ECHO request packet
-               */
-
-              picmp->type  = ICMP_ECHO_REQUEST;
-              picmp->icode = 0;
+          picmp->type  = ICMP_ECHO_REQUEST;
+          picmp->icode = 0;
 #ifndef CONFIG_NET_IPv6
-              picmp->id    = htons(pstate->png_id);
-              picmp->seqno = htons(pstate->png_seqno);
+          picmp->id    = htons(pstate->png_id);
+          picmp->seqno = htons(pstate->png_seqno);
 #else
 # error "IPv6 ECHO Request not implemented"
 #endif
-              /* Add some easily verifiable data */
+          /* Add some easily verifiable data */
 
-              for (i = 0, ptr = ICMPDAT; i < pstate->png_datlen; i++)
-                {
-                  *ptr++ = i;
-                }
-
-              /* Send the ICMP echo request.  Note that d_sndlen is set to
-               * the size of the ICMP payload and does not include the size
-               * of the ICMP header.
-               */
-
-              nlldbg("Send ECHO request: seqno=%d\n", pstate->png_seqno);
-
-              dev->d_sndlen = pstate->png_datlen + 4;
-              uip_icmpsend(dev, &pstate->png_addr);
-              pstate->png_sent = true;
-              return flags;
+          for (i = 0, ptr = ICMPDAT; i < pstate->png_datlen; i++)
+            {
+              *ptr++ = i;
             }
+
+          /* Send the ICMP echo request.  Note that d_sndlen is set to
+           * the size of the ICMP payload and does not include the size
+           * of the ICMP header.
+           */
+
+          nlldbg("Send ECHO request: seqno=%d\n", pstate->png_seqno);
+
+          dev->d_sndlen = pstate->png_datlen + 4;
+          uip_icmpsend(dev, &pstate->png_addr);
+          pstate->png_sent = true;
+          return flags;
         }
 
       /* Check if the selected timeout has elapsed */
 
       if (ping_timeout(pstate))
         {
-          /* Yes.. report the timeout */
+          int failcode;
+
+          /* Check if this device is on the same network as the destination
+           * device.
+           */
+
+          if (!uip_ipaddr_maskcmp(pstate->png_addr, dev->d_ipaddr, dev->d_netmask))
+            {
+              /* Destination address was not on the local network served by this
+               * device.  If a timeout occurs, then the most likely reason is
+               * that the destination address is not reachable.
+               */
+
+              nlldbg("Not reachable\n");
+              failcode = -ENETUNREACH;
+            }
+          else
+            {
+              nlldbg("Ping timeout\n");
+              failcode = -ETIMEDOUT;
+            }
+
+          /* Report the failure */
 
-          nlldbg("Ping timeout\n");
           pstate->png_result = failcode;
           goto end_wait;
         }
 
       /* Continue waiting */
     }
+
   return flags;
 
 end_wait:

From de53b28fd3ae24a81513278390ba02a5417cf8ac Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sat, 29 Sep 2012 15:58:41 +0000
Subject: [PATCH 08/43] Prep for NxWidgets 1.3 release

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5205 42af7a65-404d-4744-a932-0658087f49c3
---
 NxWidgets/ChangeLog.txt    |  4 +++-
 NxWidgets/ReleaseNotes.txt | 15 +++++++++++++++
 apps/ChangeLog.txt         |  4 +++-
 nuttx/ChangeLog            |  3 ++-
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/NxWidgets/ChangeLog.txt b/NxWidgets/ChangeLog.txt
index 03b416001c..06709996f9 100644
--- a/NxWidgets/ChangeLog.txt
+++ b/NxWidgets/ChangeLog.txt
@@ -158,7 +158,7 @@
 * nxwm/Makefile:  Fix error that creapt in during some other
   recent check-ins.
 
-1.3 2012-xx-xx Gregory Nutt <gnutt@nuttx.org>
+1.3 2012-09-29 Gregory Nutt <gnutt@nuttx.org>
 
 * UnitTests/*/main.cxx:  Change entry point name to be consistent
   with with entry point naming conventions introduced in NuttX
@@ -170,3 +170,5 @@
   for consistency with recent changes to NuttX build system (>= 6.22)
 * Kconfig:  Add option to turn on the memory monitor feature of the
   NxWidgets/NxWM unit tests.
+
+1.4 2012-xx-xx Gregory Nutt <gnutt@nuttx.org>
diff --git a/NxWidgets/ReleaseNotes.txt b/NxWidgets/ReleaseNotes.txt
index 96ce29e1a9..7d3fb7aaa3 100644
--- a/NxWidgets/ReleaseNotes.txt
+++ b/NxWidgets/ReleaseNotes.txt
@@ -97,3 +97,18 @@ Bugfixes:
 
 As well as other, less critical bugs (see the ChangeLog for details)
 
+NxWidgets-1.3
+=============
+
+The 4th release of the NxWidgets package as made on September 29, 2012.  This
+release depends on NuttX-6.22 or above and should not be used with older
+NuttX releases.
+
+There are no functional changes in this release of NxWidgets.  This release
+is required in order to retain compatibility with the most recent versions
+of NuttX.  These comptibility changes include:
+
+* Naming of function entry points
+* Build system changes
+* Changes needed for the NuttX configuration tool
+
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index a14f513237..8eb96ac695 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -279,7 +279,7 @@
 	* apps/*/Make.defs:  Numerous fixes needed to use the automated
 	  configuration (from Richard Cochran).
 
-6.22 2012-xx-xx Gregory Nutt <gnutt@nuttx.org>
+6.22 2012-09-29 Gregory Nutt <gnutt@nuttx.org>
 
 	* apps/netutils/thttpd/thttpd_cgi.c:  Missing NULL in argv[]
 	  list (contributed by Kate).
@@ -348,3 +348,5 @@
 	* apps/examples/Make.defs: Missing support for apps/examples/watchdog.
 	* apps/NxWidgets/Kconfig:  Add option to turn on the memory monitor
 	  feature of the NxWidgets/NxWM unit tests.
+
+6.23 2012-xx-xx Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 526c8a3350..438d89a918 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3177,7 +3177,7 @@
 	* arch/arm/src/stm32/stm32_otgfshost.c:  This driver now appears to be
 	  functional (although more testing is necesary).
 
-6.22 2012-xx-xx Gregory Nutt <gnutt@nuttx.org>
+6.22 2012-09-29 Gregory Nutt <gnutt@nuttx.org>
 
 	* include/semaphore.h, sched/sem_holders.c, and lib/semaphore/sem_init.c:
 	  Fix some strange (and probably wrong) list handling when
@@ -3453,3 +3453,4 @@
 	* net/uip/uip_icmpping.c:  Fix problem that prevented ping from
 	  going outside of local network.  Submitted by Darcy Gong
 
+6.23 2012-09-29 Gregory Nutt <gnutt@nuttx.org>

From 253d3ab52353d640f11a95a148105d04d96a1d29 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sat, 29 Sep 2012 19:10:52 +0000
Subject: [PATCH 09/43] Prep for 6.22 Release

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5206 42af7a65-404d-4744-a932-0658087f49c3
---
 apps/ChangeLog.txt             |    4 +-
 nuttx/ChangeLog                |   26 +-
 nuttx/Documentation/NuttX.html | 1069 +++++++++++++++++---------------
 nuttx/ReleaseNotes             |  104 ++++
 4 files changed, 681 insertions(+), 522 deletions(-)

diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index 8eb96ac695..75f02754b5 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -286,7 +286,7 @@
 	* apps/nshlib/nsh_parse.c: CONFIG_NSH_DISABLE_WGET not CONFIG_NSH_DISABLE_GET
 	  in one location (found by Kate).
 	* apps/examples/ostest/prioinherit.c:  Limit the number of test
-	  threds to no more than 3 of each priority.  Bad things happen
+	  threads to no more than 3 of each priority.  Bad things happen
 	  when the existing logic tried to created several hundred test
 	  treads!
 	* apps/nshlib/nsh.h:  Both CONFIG_LIBC_STRERROR and CONFIG_NSH_STRERROR
@@ -341,7 +341,7 @@
 	* apps/netutils/webserver/httpd.c:  Add support for Keep-alive connections
 	  (from Kate).
 	* apps/NxWidget/Kconfig:  This is a kludge.  I created this NxWidgets
-	  directory that ONLY contains Kconfig.  NxWidgets does not like in
+	  directory that ONLY contains Kconfig.  NxWidgets does not live in
 	  either the nuttx/ or the apps/ source trees.  This kludge makes it
 	  possible to configure NxWidgets/NxWM without too much trouble (with
 	  the tradeoff being a kind ugly structure and some maintenance issues).
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 438d89a918..ef9e771325 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3193,7 +3193,7 @@
 	  speed/duplex.  This does not work for certain PHYs.  Still some unresolved
 	  issues (also from Kate).
 	* tools/Config.mk, Makefile, configs/*/Make.defs:  Add a new Makefile
-	  fragement to de-quoate certain strings from the Kconfig logic that
+	  fragment to de-quote certain strings from the Kconfig logic that
 	  need to be used at path segments (Richard Cochran).
 	* arch/arm/src/stm32/stm32_usbotghost.c:  The STM32 USB host driver only
 	  works with debug turned on.  The problem appears to be that with debug
@@ -3201,7 +3201,7 @@
 	  reveals a variety of errors.  This check in improves NAK robustness
 	  for control transfers but does not resolve all of the issues.
 	* configs/stm3220g-eval/*/defconfig:  Calibrated delay loop.  It had
-	  never been calibrated was was way off.
+	  never been calibrated was way off.
 	* sched/sem_holder.c: Add logic to handler some priority inheritance
 	  cases when sem_post() is called from an interrupt handler.  The
 	  logic is clearly wrong, but it is not known if this is the
@@ -3212,13 +3212,13 @@
 	  CONFIG_LIBC_STRERROR_SHORT that can be used to output shortened
 	  strings by strerror().
 	* arch/arm/src/stm32/stm32_usbotghost.c:  Finally... the USB OTG FS
-	  appears to handle NAKing correctly is complete.
+	  appears to handle NAKing correctly.
 	* configs/stm32f4discovery/*:  Added and verifed support for USB OTG FS
 	  host on the STM32F4Discovery board.
 	* configs/*/defconfig: Remove configuration documentation from config
 	  files.  It is redundant, error-prone, and difficult to maintain.
 	  Configuration documentation is available in configs/README.txt for
-	  common configurations and in configs/*/README.txt for board and MCU_
+	  common configurations and in configs/*/README.txt for board and MCU-
 	  specific configurations.
 	* configs/stm3240g-eval: Add USB host support.
 	* sched/os_bring.c, configs/*/defconfig, tools/mkconfig.c, and others:  Added
@@ -3226,7 +3226,7 @@
 	  the default entry from user_start to some other symbol.  Contributed by
 	  Kate. NOTE: This change does introduce a minor backward incompatibility.
 	  For example, if your application uses NSH as its start-up program, then your
-	  code will not fail because it will be unable to find "user_start".  The fix
+	  build will now fail because it will be unable to find "user_start".  The fix
 	  for this link failure is to add the following to your configuration file:
 	  CONFIG_USER_ENTRYPOINT="nsh_main".
 	* libs/stdio/lib_libfread.c and lib_*flush*.c:  Correct a couple of
@@ -3269,7 +3269,7 @@
 	  CONFIG_HEAP2_SIZE (decimal) instead of CONFIG_HEAP2_END (hex).
 	* tools/configure.sh:  Don't append the apps directory path setting
 	  if the correct setting is already in defined in the defconfig file.
-	* fs/fat/fs_utils.c:  Improper constructed bool expression.  This
+	* fs/fat/fs_utils.c:  Improperly constructed bool expression.  This
 	  would cause many unnecessary writes to FLASH (Thanks Ronen Vainish).
 	* Kconfig: Verify configuration settings for the LPC43xx.  This includes
 	  some corrections to configuration variable names and defconfig settings.
@@ -3319,13 +3319,13 @@
 	  in all places.
 	* drivers/enc28j60.c, include/nuttx/net/enc28j60.h, and 
 	  olimex-strp711/src/up_enc28j60.c:  No longer passes IRQ number
-	  as a parameters.  Instead now passes a call table to manage
+	  as a parameter.  Instead now passes a call table to manage
 	  ENC28J60 GPIO interrupts.  That is because GPIO interrupts are
 	  handled in different ways by different MCUs and some do not
 	  support IRQ numbers for GPIO interrupts.
 	* mm/mm_gran* and include/nuttx/gran.h:  Add a simple granule-
 	  based allocator.  The intent of this allocator is to support
-	  simple allocation of DMA I/O buffers.  The initiali check-in
+	  simple allocation of DMA I/O buffers.  The initial check-in
 	  is code complete but untested (not event built into the
 	  mm/Makefile yet.
 	* confgs/fire-stm32v2: The board port is basically functional.
@@ -3352,7 +3352,7 @@
 	* arch/arm/include/armv7-m/irq.h:  Fix a critical bug in irqsave().
 	  It looks like sometimes the compile will re-order some instructions
 	  inapproapriately.  This end result is that interrupts will get
-	  stuff off.
+	  stuck off.
 	* drivers/mtd/w25.c:  Beginning of a driver for the Windbond SPI
 	  FLASH family (W25x16, W25x32, and W25x64).  The initial check-in
 	  is basically just the SST25 driver with some name changes.
@@ -3372,7 +3372,7 @@
 	  I2C reset logic to recover from locked devices on the bus.
 	* configs/*/*/Make.defs, tools/Config.mk, Makefile:  Refactor all
 	  common make definitions from the various Make.defs files into
-	  the common tools/Make.mk.  Add support for a verbosity options:
+	  the common tools/Config.mk.  Add support for a verbosity options:
 	  Specify V=1 on the make command line in order to see the exact
 	  commands used in the build (Contributed by Richard Cochran).
 	* drivers/net/enc28j60.c:  The ENC28J60 Ethernet driver is
@@ -3400,17 +3400,17 @@
 	* configs/shenzhou/src/up_lcd.c:  Oops. Shenzhou LCD does not
 	  have an SSD1289 controller.  Its an ILI93xx.  Ported the
 	  STM3240G-EVAL ILI93xx driver to work on the Shenzhou board.
-	* configs/shenzhou/nxwm:  Added an NxWM configuratino for the
+	* configs/shenzhou/nxwm:  Added an NxWM configuration for the
 	  Shenzhou board.  This is untested on initial check-in.  It will
 	  be used to verify the Shenzhou LCD driver (and eventually the
 	  touchscreen driver).
 	* configs/shenzhou/src/up_touchscreen.c:  Add ADS7843E touchscreen
 	  support for the Shenzhou board.  The initial check-in is untested
-	  and basically a clone of the the touchscreen support fro the SAM-3U.
+	  and basically a clone of the the touchscreen support for the SAM-3U.
 	* tools/cfgparser.c: There are some NxWidget configuration
 	  settings that must be de-quoted.
 	* arch/arm/src/stm32/Kconfig: There is no SPI4.  Some platforms
-	  SPI3 and some do not (still not clear).
+	  support SPI3 and some do not (still not clear).
 	* nuttx/configs/shenzhou: Various fixes to build new NxWM
 	  configuration.
 	* configs/shenzhou:  Oops.  The Shenzhou LCD is and SSD1289,
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html
index 84e0024ef8..0370a708df 100644
--- a/nuttx/Documentation/NuttX.html
+++ b/nuttx/Documentation/NuttX.html
@@ -8,7 +8,7 @@
   <tr align="center" bgcolor="#e4e4e4">
     <td>
       <h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
-      <p>Last Updated: August 25, 2012</p>
+      <p>Last Updated: September 29, 2012</p>
     </td>
   </tr>
 </table>
@@ -480,6 +480,7 @@
     <p>
       <li>Supports character and block drivers as well as specialized driver interfaces.</li>
     </p>
+  </td>
 </tr>
 <tr>
   <td><br></td>
@@ -489,6 +490,7 @@
         Network, USB (host), USB (device), serial, CAN, ADC, DAC, PWM, Quadrature Encoder, and watchdog timer driver architectures.
       </li>
     </p>
+  </td>
 </tr>
 <tr>
   <td><br></td>
@@ -498,6 +500,7 @@
         RAMDISK, pipes, FIFO, <code>/dev/null</code>, <code>/dev/zero</code>, and loop drivers.
       </li>
     </p>
+  </td>
 </tr>
 <tr>
   <td><br></td>
@@ -505,6 +508,7 @@
     <p>
       <li>Generic driver for SPI-based or SDIO-based MMC/SD/SDH cards.</li>
     </p>
+  </td>
 </tr>
 <tr>
   <td><br></td>
@@ -512,6 +516,7 @@
     <p>
       <li><a href="NuttXPortingGuide.html#pwrmgmt">Power management</a> sub-system.</li>
     </p>
+  </td>
 </tr>
 <tr>
   <td><br></td>
@@ -519,6 +524,7 @@
     <p>
       <li>ModBus support provided by built-in <a href="http://freemodbus.berlios.de/">FreeModBus</a> version 1.5.0.</li>
     </p>
+  </td>
 </tr>
 
 <tr>
@@ -533,6 +539,7 @@
     <p>
       <li>Fully integrated into the OS.</li>
     </p>
+  </td>
 </tr>
 
 <tr>
@@ -547,6 +554,7 @@
     <p>
       <li>TCP/IP, UDP, ICMP, IGMPv2 (client) stacks.</li>
     </p>
+  </td>
 </tr>
 <tr>
   <td><br></td>
@@ -554,6 +562,7 @@
     <p>
       <li>SLIP</li>
     </p>
+  </td>
 </tr>
 <tr>
   <td><br></td>
@@ -561,6 +570,7 @@
     <p>
       <li>Small footprint (based on uIP).</li>
     </p>
+  </td>
 </tr>
 <tr>
   <td><br></td>
@@ -568,6 +578,7 @@
     <p>
       <li>BSD compatible socket layer.</li>
     </p>
+  </td>
 </tr>
 <tr>
   <td><br></td>
@@ -575,6 +586,7 @@
     <p>
       <li>Networking utilities (DHCP server and client, SMTP client, TELNET client, FTP server and client, TFTP client, HTTP server and client).  Inheritable TELNET sessions (as &quot;controlling terminal&quot;)</li>
     </p>
+  </td>
 </tr>
 <tr>
   <td><br></td>
@@ -584,6 +596,7 @@
         NFS Client. Client side support for a Network File System (NFS, version 3, UDP).
       </li>
     </p>
+  </td>
 </tr>
 <tr>
   <td><br></td>
@@ -594,6 +607,27 @@
         integrated with <a href="NuttXNxFlat.html">NXFLAT</a> to provide true, embedded CGI.
       </li>
     </p>
+  </td>
+</tr>
+<tr>
+  <td><br></td>
+  <td>
+    <p>
+      <li>
+        UDP Network Discover (Contributed by Richard Cochran).
+      </li>
+    </p>
+  </td>
+</tr>
+<tr>
+  <td><br></td>
+  <td>
+    <p>
+      <li>
+        XML RPC Server (Contributed by Richard Cochran).
+      </li>
+    </p>
+  </td>
 </tr>
 
 <tr>
@@ -974,264 +1008,205 @@
   </tr>
 </table>
 
-<h2>NuttX-6.21 Release Notes</h2>
+<h2>NuttX-6.22 Release Notes</h2>
 <p>
-  The 88<sup>th</sup> release of NuttX, Version 6.21, was made on August 25, 2012, and is available for download from the
+  The 89<sup>th</sup> release of NuttX, Version 6.22, was made on September 29, 2012, and is available for download from the
   <a href="http://sourceforge.net/projects/nuttx/files/">SourceForge</a> website.
-  Note that the release consists of two tarballs:  <code>nuttx-6.21.tar.gz</code> and <code>apps-6.21.tar.gz</code>.
+  Note that the release consists of two tarballs:  <code>nuttx-6.22.tar.gz</code> and <code>apps-6.22.tar.gz</code>.
   Both may be needed (see the top-level <code>nuttx/README.txt</code> file for build information)
   The change log associated with the release is available <a href="#currentrelease">here</a>.
   Unreleased changes after this release are available in SVN.
   These unreleased changes are also listed <a href="#pendingchanges">here</a>.
 </p>
 <p>
-  This release corresponds with SVN release number: r5052
+  This release corresponds with SVN release number: r5206,
+  Note that all SVN information has been stripped from the tarballs.
+  If you need the SVN configuration, you should check out directly from SVN.
+  Revision r5206 should equivalent to release 6.22 of NuttX 6.22:
 </p>
+<ul><pre>
+svn checkout -r5206 svn://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
+</pre></ul>
+<p>Or</p>
+<ul><pre>
+svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
+</pre></ul>
+
 <p>
   <b>Additional new features and extended functionality</b>
 </p>
 <ul>
-  <li><b>Core</b>
-    <ul>
-      <li>
-        Add support for multiple registered <code>atexit()</code> functions.
-      </li>
-      <li>
-        Syslog extended: 
-        Now any character driver may be used for the debug logging device.
-        Mountpoint traversal logic.
-      </li>
-      </ul>
+  <li>
+    <p>
+      <b>RTOS</b>:
+      Application entry point is no longer user_start, but can be configured using <code>CONFIG_USER_ENTRYPOINT</code>.
+      NuttX now supports two work queues:  A lower priority work queue (for extended processing) and a higher priority work queue (for quick, high priority operations).
+    </p>
   </li>
-  <li><b>Common Drivers</b>
-    <ul>
-      <li>
-        Added support for the TI PGA112-7 amplifier/multiplexor.
-      </li>
-    </ul>
+  <li>
+    <p>
+      <b>Memory Management</b>:
+      Added a new granule-based allocated that can be used to manage, aligned and quantized DMA memory.
+    </p>
   </li>
-  <li><b>NXP LPC43XX</b>
-    <ul>
-      <li>
-        Added clock ramp-up logic to run at 204 MHz.
-      </li>
-    </ul>
+  <li>
+    <p>
+      <b>File System</b>:
+      Add hooks to allocate I/O memory with and external allocated (need if required by DMA).
+    </p>
   </li>
-  <li><b>NXP LPC43XX Drivers</b>
-    <ul>
-      <li>
-        SPIFI block driver
-      </li>
-      <li>
-        RS-485 support
-      </li>
-      <li>
-        Minimal termios support
-      </li>
-      <li>
-        Framework for USB0 device controller driver.
-      </li>
-    </ul>
+  <li>
+    <p>
+      <b>Networking</b>:
+      ENC28J60 driver is (finally) verified.
+    </p>
   </li>
-  <li><b>NXP LPC17XX Drivers</b>
-    <ul>
-      <li>
-        Minimal termios support
-      </li>
-    </ul>
+  <li>
+    <p>
+      <b>Drivers</b>:
+      Add hooks USB device drivers to allocate I/O memory with and external allocated (need if required by DMA).
+      Driver for the Windbond SPI FLASH family (W25x16, W25x32, W25x64, and others).
+      ADS7843E driver extended for TSC2046 and XPT2046 and verified.
+    </p>
   </li>
-  <li><b>STM32</b>
-    <ul>
-      <li>
-        Support for STM32 F1 &quot;Value Line&quot; (contributed by Mike Smith).
-      </li>
-      <li>
-        Add support for STM32 F107 &quot;Connectivity Line&quot; (contributed by Max Holtzberg).
-      </li>
-      <li>
-        Clock restart logic needed for recovery from low power modes.
-      </li>
-    </ul>
+  <li>
+    <p>
+      <b>ARMv7-M</b>:
+      Added logic to reset the MCU using the NVIC.
+    </p>
   </li>
-  <li><b>STM32 Drivers</b>
-    <ul>
-      <li>
-        RTC alarm support. Usable for wakeup from sleep mode.
-      </li>
-      <li>
-        Minimal serial termios support.
-      </li>
-      <li>
-        USB OTG FS host driver (alpha).
-      </li>
-    </ul>
+  <li>
+    <p>
+      <b>STM32</b>:
+      Add support for STM32F103VET6.
+    </p>
   </li>
-  <li><b>STM32 Boards</b>
-    <ul>
-      <li>
-        Add power management hooks for the STM32F4Discovery
-      </li>
-      <li>
-        Add support for the Olimex STM32-P107 (contributed by Max Holtzberg)
-      </li>
-    </ul>
+  <li>
+    <p>
+      <b>STM32 Drivers</b>:
+      Add logic to re-initialize UARTs a second time to enable DMA (Mike Smith).
+      I2C driver error recovery (Mike Smith).
+    </p>
   </li>
-  <li><b>PIC32</b>
-    <ul>
-      <li>
-        Add support for the Pinguino MIPS toolchain
-      </li>
-    </ul>
+  <li>
+    <p>
+      <b>STM32 boards</b>:
+      Support for USB host added add to several configurations (or at least explained in README files).
+      Support for the Shenzhou STM32F107 board (see www.armjishu.com).
+      Support for M3 Wildfire STM32F103 board (v2 and v3).
+    </p>
   </li>
-  <li><b>PIC32 Drivers</b>
-    <ul>
-      <li>
-        GPIO driver now supports F1 analog regiaters (ANSEL)
-       </li>
-    </ul>
+  <li>
+    <p>
+      <b>Build System:</b>:
+      Kconfig string de-quoting logic.
+      Remove comments from <code>defconfig</code> files (Kate).
+      Add tool to create NuttX-style symbol tables.
+      Numerous changes to configuration logic as needed for the new <code>mconf</code>-based configuration (much of this from Richard Cochran).
+      Refactor common <code>Make.defs</code> logic into <code>tools/Config.mk</code> (Richard Cochran).
+    </p>
   </li>
-  <li><b>PIC32 Boards</b>
-    <ul>
-      <li>
-        Add support for the PGA117 on the Mirtoo module
-      </li>
-    </ul>
+  <li>
+    <p>
+      <b>Library</b>:
+      Configurable terse output from <code>strerror()</code>.
+      Added <code>perror()</code> (Kate).
+      Add <code>%n</code> format to <code>sscanf()</code> (Kate).
+    </p>
   </li>
-  <li><b>Calypso</b>
-    <ul>
-      <li>
-        Add support for the SSD1783 LCD on the Compal E99
-      </li>
-    </ul>
-  </li>
-
-  <li><b>Library</b>
-    <ul>
-      <li>
-        <code>cfsetispeed()</code>, <code>cfsetospeed()</code>, <code>tcflush()</code>, <code>memchr()</code>, and <code>memccpy()</code>.
-      </li>
-    </ul>
-  </li>
-  <li><b>Applications</b>
-    <ul>
-      <li>
-        Port of freemodbus-v1.5.0.
-      </li>
-      <li>
-        Add support for testing devices with multiple ADC, PWM, and QE devices.  
-      </li>
-      <li>
-        NSH <code>mount</code> command (with no arguments) will now show mounted volumes.
-      </li>
-      <li>
-        Added new NSH <code>df</code> command to show file system usage.
-      </li>
-      <li>
-        Extended NSH 'help' support.
-      </li>
-      <li>
-        NSH now catches the return value from spawned applications (provided by Mike Smith).
-      </li>
-    </ul>
-  </li>
-  <li><b>Build System</b>
-    <ul>
-      <li>
-        <code>mkconfig</code> will not define <code>CONFIG_DRAM_END</code>.
-      </li>
-      <li>
-        A lot of  progress has been made on the automated NuttX configuration logic (Thanks go to Richard Cochran).
-      </li>
-    </ul>
-  </li>
-  <li><b>Documentation</b>
-    <ul>
-      <li>
-       Document ways to customize the behavior of NSH
-      </li>
-    </ul>
-  </li>
-</ul>
-
-<p><b>Bugfixes</b> (see the change log for details):</p>
-<ul>
-  <li><b>Serial drivers (all)</b>
-    <ul>
-      <li>
-      Fix <code>ioctl()</code> return value.
-      </li>
-      <li>
-      Common &quot;upper half&quot; serial driver will now return with <code>EINTR</code> if a serial wait is interrupted by a signal.
-      </li>
-    </ul>
-  </li>
-  <li><b>FAT</b>
-    <ul>
-      <li>
-        Fix statfs() file name length
-      </li>
-    </ul>
-  </li>
-  <li><b>NXP LPC43xx</b>
-    <ul>
-      <li>
-        Clock configuration
-      </li>
-    </ul>
-  </li>
-  <li><b>STM32</b>
-    <ul>
-      <li>
-      Pinmap fixes
-      </li>
-      <li>
-      SPI driver re-initialization
-      </li>
-    </ul>
-  </li>
-  <li><b>STM32 Boards</b>
-    <ul>
-      <li>
-         Correct and lower SDIO frequency for F2 and f4 boards
-      </li>
-    </ul>
-  </li>
-  <li><b>AVR</b>
-    <ul>
-      <li>
-        C++ build issues
-      </li>
-    </ul>
-  </li>
-  <li><b>Power Management (PM)</b>
-    <ul>
-      <li>
-        Fix a place where interrupts were not be re-enabled
-      </li>
-    </ul>
-  </li>
-  <li><b>Applications</b>
-    <ul>
-      <li>
-        Fix NSH application start-up race condition
-      </li>
-    </ul>
-  </li>
-  <li><b>Library</b>
-    <ul>
-      <li>
-        Fieldwidth and justification for <code>%s</code> format.
-      </li>
-      <li>
-        Fixed several issues with presenting floating point numbers.
-      </li>
-      <li>
-        NULL definition for C++
-      </li>
-    </ul>
+  <li>
+    <p>
+      <b>Applications</b>:
+      Numerous changes and extensions to the old uIP web server (from Kate and Max Holtzberg, see the ChangeLog for specific extensions).
+      UDP network discovery utility (Max Holtzberg).
+      Embeddable Lightweight XML-RPC Server (http://www.drdobbs.com/web-development/an-embeddable-lightweight-xml-rpc-server/184405364, Max Holtzberg).
+    </p>
   </li>
 </ul>
 <p>
+  <b>Bugfixes</b> (see the change log for details)
+  Some of these are very important (marked <b><i>critical</i></b>):
+</p>
+<ul>
+  <li>
+    <p>
+      <b>RTOS</b>:
+      Fixes to priority inheritance logic (<b><i>critical</i></b>).
+      <code>waitpid()</code> critical section.
+      Assertion in <code>work_cancel()</code> (Mike Smith).
+      <code>mmap()</code> (Kate).
+    </p>
+  </li>
+  <li>
+    <p>
+      <b>FAT File System</b>:
+      Improper Boolean expression caused un-necessary writes and performance issues (<b><i>critical</i></b>, Ronen Vainish).
+    </p>
+  </li>
+  <li>
+    <p>
+      <b>Networking</b>:
+      Remove an un-necessary delay from <code>recvfrom()</code>.
+      This greatly improves network performance (<b><i>critical</i></b>, Max Holtzberg).
+    </p>
+  </li>
+  <li>
+    <p>
+      <b>Graphics</b>:
+      NX parameter checking errors.
+    </p>
+  </li>
+  <li>
+    <p>
+      <b>Drivers</b>:
+      Fix double release of memory in SDIO-based, MMC/SD driver (Ronen Vainish).
+    </p>
+  </li>
+  <li>
+    <p>
+      <b>LPC17xx</b>:
+      Ethernet driver fixes needed for certain PHYs (Kate).
+    </p>
+  </li>
+  <li>
+    <p>
+      <b>AVR</b>:
+      Fix build error (Richard Cochran).
+    </p>
+  </li>
+  <li>
+    <p>
+      <b>STM32</b>:
+      USB OTG FS host driver NAKing an retries.
+      Power management compilation errors (Diego Sanchez).
+      Missing SPI3 remap logic.
+    </p>
+  </li>
+  <li>
+    <p>
+      <b>STM32 Drivers</b>:
+      Fix for Ethernet errata for STM32F107 (<b><i>critical</i></b>).
+      Ethernet buffer alignment check.
+      Add &quot;kludge&quot; to Ethernet driver to handle DM9161 PHY which (at least on the Shenzhou board), sometimes does not come up correctly.
+    </p>
+  </li>
+  <li>
+    <p>
+      <b>Applications</b>:
+      THTTPD (Kate).
+      NSH <code>ping</code> when IP address is on a different network (Darcy Gong).
+    </p>
+  </li>
+  <li>
+    <p>
+      <b>Library</b>:
+      <code>fread()</code>, <code>fflush()</code>, <code>fdopen()</code>: Fix error handling logic (Ronen Vainish).
+      Fix some field-width handling issues in <code>sscanf()</code>
+    </p>
+  </li>
+</ul>
+<p>
+  As well as other, less critical bugs.
   See the <a href="#currentrelease">ChangeLog</a> for additional, detailed changes.
 </p>
 
@@ -1450,8 +1425,8 @@
         but only partially tested.  Additional features are needed: USB driver, MMC integration,
         to name two (the slot on the board appears to accept on MMC card dimensions; I have only
         SD cards).
-        An SPI-based ENC29J60 Ethernet driver for add-on hardware is under development and
-        should be available in the NuttX 5.5 release.
+        An SPI-based ENC28J60 Ethernet driver for add-on hardware is available and
+        but has not been fully verified on the Olimex board (due to issues powering the ENC28J60 add-on board).
       </p>
       <p>
         <b>Development Environments:</b>
@@ -3232,284 +3207,364 @@ Other memory:
 </table>
 
 <ul><pre>
-nuttx-6.21 2012-08-25 Gregory Nutt &lt;gnutt@nuttx.org&gt;
+nuttx-6.22 2012-09-29 Gregory Nutt &lt;gnutt@nuttx.org&gt;
 
-    * configs/lpc4330-xplorer/up_nsh.c:  Add support for a basic SPIFI block
-      driver for use by NSH.  Does not work!  Crashes on first SPIFI write.
-    * configs/lpc4330-xplorer/*/defconfig: Calibrate delay loops (this is
-      based on the current &quot;slow&quot; 72MHz M4 clock and will need to be
-      re-calibrated when this is increased).
-    * configs/stm3220g-eval/include/board.h and configs/stm3240g-eval/include/board.h:
-      The SDIOCLK frequency in the F2 and F4 derives for PLL48CLK and not HCLK
-      so that the SDIOCLK input frequency should always be 48MHz.
-    * sched/os_internal.h, sched_setupidlefiles.c, sched_setuptaskfiles.c, and
-      sched_setupidlefiles.c:  Detangle some conditional compilation.  Allow for
-      a perverse configuration that has socket descriptors and streams but no file
-      descriptors (sure, why not?).
-    * sched/: Stylistic clean-up of all files.  Some of these files are pretty old
-      and do not follow current NuttX coding standards in detail.
-    * fs/: More stylistic file clean-up.
-    * mm/: More stylistic file clean-up.
-    * drivers/ and drivers/serial/: More stylistic file clean-up.
-    * arch/arm/src/lpc43xx/lpc43_clockconfig.c:  Fix PLL1 bit manipulation logic.
-      Critical bugfix! This would often cause the LPC43xx to fail to boot.
-    * arch/arm/src/lpc43xx/lpc43_rgu.c:  The soft reset logic called from the
-      beginning of __start seems cause problems.  A magic delay seems to improve
-      the logic some.  But I suspect that real fix is to get rid of all of the
-      soft reset logic.  This would also be a critical bugfix if I believed
-      that it really fixed all of the issues.
-    * arch/arm/src/lpc43xx/chip/lpc43_cgu.h:  Fix a bit mask in the PLL1
-      control register.  Critical bugfix.
-    * arch/arm/src/lpc43xx/lpc43_clockconfig.c and configs/lpc4330-xplorer/include/board.h:
-      Implement PLL1 ramp-up logic; Now the LPC43xx is running at 204MHz.
-    * configs/lpc4330-xplorer/*/defconfig:  Re-calibrated delay loops using
-      the 204MHz clock.  The LPC43xx ripping rips!  This calibration was performed
-      with symbols enabled and all optimization disabled.  It will need to be
-      better recalibrated again down the road.
-    * arch/arm/src/stm32/stm32_exti.c:  Renamed to rch/arm/src/stm32/stm32_exti_gpio.c
-      to make a little room in the file name space.
-    * arch/arm/src/stm32/stm32_exti_alarm.c:  Add initial logic to attached the
-      RTC alarm EXTI interrupt.  This is work be performed mostly by Diego Sanchez.
-    * include/: More stylistic file clean-up.
-    * arch/arm/src/lpc43xx/lpc43_spifi.c, lpc43_spifi.h, and chip/lpc43_spifi.h:  Add
-      logic to configure and initialize the SPIFI device (does not yet work).
-    * configs/lpc4330-xplorer/include/board.h:  Reduce SPI SCLK value.
-    * arch/arm/src/lpc43xx/lpc43_spifi.c, lpc43_spifi.h, and chip/lpc43_spifi.h:
-      Logic completely redesigned.  It now creates an MTD driver to access SPIFI...
-      but the driver still does not work.
-    * arch/arm/src/stm32 and arch/arm/include/stm32: Make name of RTC ALARM interrupt
-      common on STM32 F1,2,4
-    * arch/arm/src/stm32 and arch/arm/include/stm32: Add support for the
-      STM32F100x &quot;Value Line&quot; devices. This includes changes to stm32F10xx_rcc.c that
-      add the ability to run the chip off the internal oscillator.  There is no open
-      board configuration for this part yet (the STM32VLDiscovery would be a candidate).
-      Contributed by Mike Smith.
-    * arch/arm/src/stm32: Fixed typos in conditional compilation in the CAN and DMA
-      and some pin configuration.  This would have caused problems for STM32 F107xx.
-      Typos noted by Mike Smith.
-    * arch/arm/src/lpc43xx/lpc43_serial.c:  Add support for certain RS-485 features
-    * lib/termios/lib_cfsetispeed.c, lib_cfsetospeed.c, lib_tcflush.c:  Add
-      simple implementations of cfsetispeed(), cfsetospeed(), and tcflush().
-    * include/sys/str_tty.h, lib/lib_setspeed.c, lib_getspeed.c, and lib_resetspeed.c:
-      Add APIs to support setting non-standard BAUD values not supported by POSIX
-      termios.  These are non-standard interfaces but have a precedence:  There are
-      similar interfaces in AIX.
-    * include/sys/str_tty.h, lib/lib_setspeed.c, lib_getspeed.c, and lib_resetspeed.c:
-      Sigh... removed.  We don't need any more almost standard interfaces!  (SVN
-      revision 4968 if you want the short-lived code).
-    * include/termios.h and lib/termios/*:  Open the existing, standard termios
-      interfaces to permit some non-standard baud settings.  The new termios definitions
-      still supports the POSIX standard except that it does not strictly enforce
-      baud rate settings, permitting some non-portable, but useful baud rate settings
-      (this is what the short-lived AIX-like interfaces would have accomplished as well).
-    * include/termios.h and lib/termios/*:  Redesigned yet again (this is getting
-      painful.  NuttX now supports the BOTHER baud setting just as Linux does.  termios
-      Bxxx definitions are again encoded; cf[set|get][o|i]speed now deal with only the
-      encoded values.  If the encoded baud is set to BOTHER, then the values in the (non-
-      standard) c_ispeed and c_ospeed baud values may be accessed directly.
-    * arch/arm/src/stm32/stm32_serial.c:  Add minimal termios support for the STM32
-      (BOTHER style baud settings only).  Contributed by Mike Smith.
-    * configs/lpc4343-xplorer/src:  Clean up SPIFI-library based build to that it
-      actually works.
-    * arch/arm/src/lpc43xx/lpc43_spifi.c:  Add support for verification to writes.
-      Add debug option to dump buffers.  Several bugfixes... almost works.
-    * include/termios.h, lib/termios/*, and arch/arm/src/stm32/stm32_serial.c: :
-      BOTHER is gone again.
-    * arch/arm/src/stm32/stm32_sdio.c and chip/stm32f20xx_pinmap.h:  STM32 F2 SDIO
-      fixes from Gary Teravskis and Scott Rondestvedt.
-    * include/termios.h and lib/termios/*:  Replace cfsetispeed and cfsetospeed with
-      cfsetspeed (with definitions for the input/outputs in termios.h).
-    * configs/stm32f4discovery/src and configs/stm32f4discovery/pm:  Add a power
-      management configuration for the STM32F4Discovery and supporting logic.  This
-      check-in also includes some fixes for the F4 RTC alarm logic.
-    * drivers/input/pga11x.c and include/nuttx/input/pga11x.h:  Add support for the
-      TI PGA112/3/6/7 amplifier/multiplexer parts.
-    * configs/mirtoo/README.txt, nsh/defconfig, and nxffs/defconfig:  Add support
-      for the PGA117 on the Mirtoo module.
-    * drivers/analog/pga11x.c and include/nuttx/analog/pga11x.h:  These belong in
-      the analog subdirectories, not input.
-    * configs/compal_e99/src/ssd1783.c and /ssd1783.h:  Drivers for the SSD1783
-      LCD found in the Motorola C155 telephone.  The driver is specific to the C155
-      because it uses the uwire transport.  Contributed by Denis Carilki and
-      Alan Carvalho de Assis.
-    * drivers/power/pm_changestate.c.  Correct a case where interrupts were not
-      being re-enabled.  Found by Diego Sanchez.
-    * configs/mirtoo/nxffs/defconfig:  This Mirtoo NXFFS configuration now uses the
-      open Pinguino toolchain by default.  This is necessary because the free C32
-      toolchain does not support any optimization and the unoptimized NXFFS image
-      hits the PIC32MX2 FLASH size (128K).  There is plenty of room to grow using
-      the Pinguino toolchain with -O2 optimization.
-    * configs/mirtoo/src/up_adc.c.  This is just a stub for now, but this is
-      where Mirtoo ADC logic will eventually need to go.
-    * arch/mips/src/pic32mx/pic32mx-gpio.c:  Now supports the PIC32MX1/2 ANSEL
-      IOPORT register.
-    * lib/string/lib_memchr.c:  Add support for memchr() (contributed by Mike Smith)
-    * lib/string/lib_memccpy.c:  Add support for memccpy()
-    * arch/arm/src/lpc17xx/lpc17_serial.c:  Now supports ioctl commands to change
-      the baud using tcsetattr() (contributed by Chris Taglia).
-    * arch/*/src/*_serial.c: Fix ioctl method return values.  These methods
-      should return a negated errno value; they should not set the errno
-      variable.
-    * sched/on_exit.c, sched/task_exithook.c, and include/nuttx/sched.c:  Add
-      support for multiple registered on_exit() functions if CONFIG_SCHED_ONEXIT_MAX
-      is defined.
-    * drivers/syslog/ramlog.c: Move the RAM SYSLOG device into drivers/syslog
-      so that it will be in the same directory as some new SYSLOGing devices
-      in the works.
-    * include/nuttx/syslog.h and drivers/syslog/ramlog.c:  The SYSLOG putc function
-      now has a common name that is independent of the device that provides the
-      SYSLOG.
-    * include/nuttx/syslog.h and drivers/syslog/syslog.c:  This is a new, generic
-      SYSLOG device that can redirect debug output to any character device or file.
-      So you can log debug output to a file or you can put the console on /dev/ttyS0
-      and the debug output on /dev/ttyS1.
-    * arch/arm/src/lpc43xxl/lpc43_spifi.c: Correct an addressing error in the LPC43
-      SPIFI MTD driver
-    * drivers/syslog/syslog.c and fs/fs_syslog.c:  Moved the generic syslog logic
-      from drivers/syslog to fs/ where is belongs.  Especially after realizing that
-      the syslog logic is going to have to some internal FS operations in order
-      to realize a totally thread-independent SYSLOG interface.
-    * arch/arm/src/stm32/stm32*_rcc.c and .h:  If CONFIG_PM is defined, add a
-      function called stm32_clockenable() that can be used by PM logic to re-start
-      the PLL after re-awakening from deep sleep modes.
-    * fs/fs_foreachinode.c and fs/fs_foreachmountpoint.c:  Add logic to traverse
-      inodes and mountpoints in the NuttX pseudo-file system.
-    * fs/fat/fs_fat32.c: Max. filename length reported by statfs() was wrong
-      if FAT long file names were enabled.
-    * lib/stdio/lib_libvsprintf.c:  Fieldwidth and justification were not
-      supported for the %s format.  As a result, %s, %12s, and %-12s all
-      produced the same output.
-    * lib/stdio/lib_libdtoa.c:  Fix several issues with presenting floating
-      point numbers (conversions are fine, but presentation was bad).  This
-      is a critical bug fix if you use printf or sprintf to deal with floating
-      point numbers.
-    * lib/stdio/lib_libdtoa.c and lib_libvsprintf.c:  Correct some floating
-      point options.
-    * arch/arm/lpc43xx/lpc32_usb0dev.c:  Add framework for development of
-      an USB0, device-side driver for the LPC43XX.  The initial check-in,
-      however, is simply for the LPC31xx driver with name changes.  The
-      LPC31xx has the same USB IP, but will require some additional initialization
-      (and lots of testing) before it can be used with the LPC43xx.
-    * nuttx/Documentation/NuttShell.html:  Added a section covering ways to
-      customize the behavior of NSH.
-    * arch/arm/src/stm32/chip/stm32f1*_pinmap.h: STM32 CAN TX/RX pins reversed;
-      inconsistent conditional compilation.  Reported by Max Holtzberg.
-    * arch/arm/*/stm32:  Add support for STM32 F107 &quot;Connectivity Line&quot; 
-      Ethernet (contributed by Max Holtzberg).
-    * configs/olimex-stm32-p107:  Add board support for the Olimiex STM32-P107
-       board (contributed by Max Holtzberg).
-    * arch/arm/src/stm32/stm32f2xx_dma.c, stm32f4xx_dma.c, stm32_serial.c, and
-      stm32_spic.c:  DMA priority was getting zeroed by STM32 F2/F4 DMA drivers
-      so that all DMAs ran at the lowest priority.
-    * configs/stm3240g-eval/include/board.h and configs/stm3220:  Drop SD card
-      frequency from 24 to 16 MHz.  Apparently 24 MHz is too fast for the board.
-      This (plus the change to the STM32 DMA (above) fixes SDIO DMA on the
-      STM3240G-EVAL (and probably STM3220G-EVAL -- untested).
-    * arch/arm/src/stm32/stm32f2xx_dma.c and stm32f4xx_dma.c: Backed out the
-      DMA priority change just above.  The reduced SD card frequency was
-      necessary and sufficient to resolve the problem.
-    * drivers/serial/serial.c:  open, read, write, and poll methods may now
-      abort return EINTR (or a short transfer size) if a signal is received
-      while waiting to receive or send serial data.  This behavior is required
-      by POSIX.
-    * include/sys/types.h:  Define NULL to be (0) if __cplusplus is defined.
-      (contributed by Mike Smith)
-    * include/ctype.h: Remove a stray semi-colon in a definitions (Thanks
-      Mike Smith).
-    * configs/.../Make.defs.  Fix C++ include path set-up in Make.defs file
-      for all 8-bit AVR platforms (Thanks Richard Cochran).
-    * lib/stdio/lib_*stream.c:  Revised to handle new error return values from
-      serial.c.
-    * arch/arm/src/stm32/stm32_spi.c:  SPI driver can now service re-
-      initialization (Mike Smith).
-    * tools/mkconfig.c:  If CONFIG_DRAM_END is not specified, this tool
-      will provide default definition of (CONFIG_DRAM_START + CONFIG_DRAM_SIZE)
-    * arch/arm/src/stm32/stm32_otgfshost.c:  Renamed from stm32_usbhost.c.
-      This is nearly code complete and, with any luck, will be available
-      in NuttX-6.21.
-    * configs/*/defconfig:  Update all defconfig files to remove syntax
-      that is incompatible with the mconf configuration tool.
-    * arch/arm/src/stm32/stm32_otgfshost.c:  This driver now appears to be
-      functional (although more testing is necesary).
+    * include/semaphore.h, sched/sem_holders.c, and lib/semaphore/sem_init.c:
+      Fix some strange (and probably wrong) list handling when
+      CONFIG_PRIORITY_INHERITANCE and CONFIG_SEM_PREALLOCHOLDERS are defined.
+      This list handling was probably causing errors reported by Mike Smith
+    * sched/sched_waitpid.c: Fix a possible issue with logic logic that
+      should be brought into a critical section (suggested by Mike Smith)
+    * sched/sched_setuptaskfiles.c: Should be 'struct socket' not
+      'struct sockets'.  How did this compile before? (found by Kate)
+    * syscall/syscall.csv:  Fix prototype for usleep() and prctl() (also
+      from Kate).
+    * arch/arm/src/lpc17xx/lpc17_ethernet.c:  Conditionally elide setting PHY
+      speed/duplex.  This does not work for certain PHYs.  Still some unresolved
+      issues (also from Kate).
+    * tools/Config.mk, Makefile, configs/*/Make.defs:  Add a new Makefile
+      fragment to de-quote certain strings from the Kconfig logic that
+      need to be used at path segments (Richard Cochran).
+    * arch/arm/src/stm32/stm32_usbotghost.c:  The STM32 USB host driver only
+      works with debug turned on.  The problem appears to be that with debug
+      OFF, there are more NAKs occuring in more places than before and this
+      reveals a variety of errors.  This check in improves NAK robustness
+      for control transfers but does not resolve all of the issues.
+    * configs/stm3220g-eval/*/defconfig:  Calibrated delay loop.  It had
+      never been calibrated was way off.
+    * sched/sem_holder.c: Add logic to handler some priority inheritance
+      cases when sem_post() is called from an interrupt handler.  The
+      logic is clearly wrong, but it is not known if this is the
+      cause of any known bugs.
+    * lib/stdio/lib_perror():  Add perror().  Contributed by Kate.
+    * lib/string/lib_strerror():  Add option CONFIG_LIBC_STRERROR that
+      is now required to enabled strerror().  Add an option
+      CONFIG_LIBC_STRERROR_SHORT that can be used to output shortened
+      strings by strerror().
+    * arch/arm/src/stm32/stm32_usbotghost.c:  Finally... the USB OTG FS
+      appears to handle NAKing correctly.
+    * configs/stm32f4discovery/*:  Added and verifed support for USB OTG FS
+      host on the STM32F4Discovery board.
+    * configs/*/defconfig: Remove configuration documentation from config
+      files.  It is redundant, error-prone, and difficult to maintain.
+      Configuration documentation is available in configs/README.txt for
+      common configurations and in configs/*/README.txt for board and MCU-
+      specific configurations.
+    * configs/stm3240g-eval: Add USB host support.
+    * sched/os_bring.c, configs/*/defconfig, tools/mkconfig.c, and others:  Added
+      configuration variable CONFIG_USER_ENTRYPOINT that may be used to change
+      the default entry from user_start to some other symbol.  Contributed by
+      Kate. NOTE: This change does introduce a minor backward incompatibility.
+      For example, if your application uses NSH as its start-up program, then your
+      build will now fail because it will be unable to find &quot;user_start&quot;.  The fix
+      for this link failure is to add the following to your configuration file:
+      CONFIG_USER_ENTRYPOINT=&quot;nsh_main&quot;.
+    * libs/stdio/lib_libfread.c and lib_*flush*.c:  Correct a couple of
+      error cases where the lib semaphore was not be released on error
+      exits (thanks Ronen Vainish).  Also, improved some error reporting:
+      the generic ERROR was being used instead of the specific errno
+      value; the errno variable was not always set correctly.
+    * tools/mkfsdata.pl: The uIP web server CGI image making perl script was
+      moved from apps/netutils/webserver/makefsdata to nuttx/tools/mkfsdata.pl
+      (Part of a larger change submitted by Max Holtzberg).
+    * configs/stm3240g-eval/script/ld.script:  All of the identical ld.script
+      files for the STM3240G-EVAL were replaced by one version in this directory.
+    * configs/stm3240g-eval/webserver:  Configuration submitted by Max Holtzberg
+      for testing the changes to the uIP web server (see apps/ChangeLog.txt).
+    * lib/stdio/lib_perror.c:  Remove CONFIG_LIBC_PERROR_DEVNAME.  What was I
+      thinking?  Arbitrary streams cannot be shared by different tasks.
+    * tools/mksyscall.c, csvparser.c, and csvparser.h: Separate CSV parsing
+      logic from mksyscall.c into files where it can be shared.
+    * tools/mksymtab.c:  Add a tool that can be used to convert a CSV file
+      into a NuttX-style symbol table.
+    * sched/work_cancel.c:  Fix a bad assertion (reported by Mike Smith)
+    * configs/stm3210e-eval/src/up_idle.c:  Correct some power management
+      compilation errors (reported by Diego Sanchez).
+    * include/nuttx/wqueue.h, sched/work*, and others:  Added logic to support
+      a second, lower priority work queue (CONFIG_SCHED_LPWORK).
+    * arch/arm/src/stm32/stm32_dma.c, chip/stm32*_memorymap.h:  FSMC SRAM is
+      only 16-bits wide and the SDIO DMA must be set up differently.
+    * arch/arm/src/stm32/stm32_dma.c:  Back out the 16-bit DMA change. It
+      is incorrect.
+    * configs/:  Make use of UART4/5 vs USART4/5 consistent in all places.
+    * Kconfig: Serial 2STOP setting must be integer 0/1, not a boolean.
+    * lib/misc/sendfile.c and include/sys/sendfile.h:  Add a Linux style
+      sendfile() (non-standard!)
+    * Kconfig: Refactor serial settings (moved from chip to drivers/serial).
+      AVR &quot;teensy&quot; now builds with Kconfig (contributed by Richard Cochran).
+    * Kconfig: Add configuration settings for the LPC17xx
+    * Kconfig: Add configuration settings for the LM3S (from Richard Cochran).
+    * Kconfig: Verify configuration settings for the STM32.  This includes
+      changes in the way that the external SRAM is configured:  Define
+      CONFIG_HEAP2_SIZE (decimal) instead of CONFIG_HEAP2_END (hex).
+    * tools/configure.sh:  Don't append the apps directory path setting
+      if the correct setting is already in defined in the defconfig file.
+    * fs/fat/fs_utils.c:  Improperly constructed bool expression.  This
+      would cause many unnecessary writes to FLASH (Thanks Ronen Vainish).
+    * Kconfig: Verify configuration settings for the LPC43xx.  This includes
+      some corrections to configuration variable names and defconfig settings.
+    * Kconfig: Add and verify configuration settings for the LPC31xx.
+    * arch/arm/src/stm32/stm32_uart.h and stm32_serial.c:  Add logic to
+      re-initialize the console UART as needed to enable DMA on the
+      console UART (contributed by Mike Smith).
+    * net/recvfrom.c, net/Kconfig, include/nuttx/net/uipopt.h: Remove delay
+      after receiving data.  That has historical reasons to be there (it
+      was needed before read-ahead buffering was added), but kills performance.
+      (Noted by Max Holtzberg).
+    * configs/shenzhou:  Add beginnings of a board configuration for the
+      Shenzhou STM32107 board (see www.armjishu.com).  Very little is in
+      place as of this initial check-in.
+    * QEMU: Fixes from Richard Cochran to build QEMU with Kconfig files.
+    * arch/*/src/Makefile:  Remove some old logic that was kicked off
+      when CONFIG_BOOT_RUNFROMFLASH=y.  The old logic used to use
+      objcopy to move sections.  Newer logic changes the load position
+      of sections in the the linker script.  As far as I can tell, there
+      is nothing in the source tree now that depends on the old way of
+      doing things (if I am wrong, they will need a change to the linker
+      script).
+    * configs/fire-stm32v2:  Configuration for the M3 Wildfire board.  I
+      don't know very much about this board other than is has an
+      STM32F103VET6 chip, LCD, touchscreen, and ENC28J60 network.  Very
+      little is in place on the initial check-in.
+    * configs/shenzhou: Coding for the Shenzhou board port is complete,
+      but tested has been deferred until I get the right tools.
+    * arch/arc/include/stm32/chip.h and arch/arm/src/stm32/chip.h:
+      Add support for the STM32F103VET6.
+    * fs/fs_fdopen.c: Bad check for failure to allocate memory.  (Noted
+      by Ronen Vainish).
+    * drivers/mmcsd/mmcsd_sdio.c: If the MMC/SD driver were ever
+      uninitialized then there would be a double release of memory
+      (Noted by Ronen Vainish).
+    * fs/mmap/fs_rammap.c:  Fix logic error and errno check (contributed
+      by Kate).
+    * arch/avr/src: Fixes from AVR32 build errors that have crept in
+      over the time; incorporated Kconfig for AVR3 (Richard Cochran).
+    * fs/fat and include/nuttx/fs/fat.h: The FAT file system allocates
+      memory for sector I/O buffers used to exchange data with the
+      configured block driver.  In some contexts, the block driver may
+      require DMA-capable memory.  If CONFIG_FAT_DMAMEMORY is defined,
+      then the FAT FS will use platform-provided DMA memory allocators
+      to allocate the block driver I/O buffers.
+    * CONFIG_NET_ENC28J60 renamed CONFIG_ENC28J60 to be consistent
+      in all places.
+    * drivers/enc28j60.c, include/nuttx/net/enc28j60.h, and 
+      olimex-strp711/src/up_enc28j60.c:  No longer passes IRQ number
+      as a parameter.  Instead now passes a call table to manage
+      ENC28J60 GPIO interrupts.  That is because GPIO interrupts are
+      handled in different ways by different MCUs and some do not
+      support IRQ numbers for GPIO interrupts.
+    * mm/mm_gran* and include/nuttx/gran.h:  Add a simple granule-
+      based allocator.  The intent of this allocator is to support
+      simple allocation of DMA I/O buffers.  The initial check-in
+      is code complete but untested (not event built into the
+      mm/Makefile yet.
+    * confgs/fire-stm32v2: The board port is basically functional.
+      Not all features have been verified.  The ENC28J60 network
+      is not yet functional.
+    * configs/stm3240g-eval/discover:  A configuration for testing
+      the UDP discovery utility.  Contributed by Max Holtzberg.
+    * mm/README.txt:  Add a new README file.
+    * include/nuttx/usb/usb.h, arch/*/src/*usb.c, and arch/*/src/*otg*.c:
+      Add hooks to to use common, external DMA buffer allocation
+      implementation.
+    * net/recvfrom.c: Don't block in recvfrom if (1) read-ahead buffering
+      is enabled and (2) some data was obtained from read-ahead buffers.
+      Blocking is a bad idea in that case because there is no timeout!
+      (submitted by Max Holtzberg).
+    * configs/stm3240g-eval/xmlrpc: An example configuration for the
+      Embeddable Lightweight XML-RPC Server at apps/examples/xmlrpc.
+      See http://www.drdobbs.com/web-development/\
+      an-embeddable-lightweight-xml-rpc-server/184405364 for more info.
+      Contributed by Max Holtzberg.
+    * configs/*/nxwm/defconfig and sched/task_exithook.c: Fixes for
+      bugs that crept in during recent changes.  (Submitted by Max
+      Holtzberg).
+    * arch/arm/include/armv7-m/irq.h:  Fix a critical bug in irqsave().
+      It looks like sometimes the compile will re-order some instructions
+      inapproapriately.  This end result is that interrupts will get
+      stuck off.
+    * drivers/mtd/w25.c:  Beginning of a driver for the Windbond SPI
+      FLASH family (W25x16, W25x32, and W25x64).  The initial check-in
+      is basically just the SST25 driver with some name changes.
+    * arch/arm/include/armv7-m/irq.h and arch/arm/src/stm32/stm32_spi.c:
+      Back out the last change in irq.h.  It is (most likely) fine the
+      way it was.  The really interrupt related problem was in stm32_spi.c:
+      When SPI3 is not enabled, then the irqrestore() falls in the
+      else clause.
+    * include/nuttx/compiler.h and other files:  Moved always_inline
+      and noinline __attributes__ here.  Also replaced all occurrences
+      of explicit __atributes__ in other files with definitions from
+      this header file.
+    * drivers/mtd/w25.c:  The Windbond SPI FLASH W25 FLASH driver is
+      code complete (but still untested).
+    * arch/arm/src/stm32/stm32_i2c.c:  I2C improvements from Mike Smith.
+      Unified configuration logic; dynamic timeout calculations;
+      I2C reset logic to recover from locked devices on the bus.
+    * configs/*/*/Make.defs, tools/Config.mk, Makefile:  Refactor all
+      common make definitions from the various Make.defs files into
+      the common tools/Config.mk.  Add support for a verbosity options:
+      Specify V=1 on the make command line in order to see the exact
+      commands used in the build (Contributed by Richard Cochran).
+    * drivers/net/enc28j60.c:  The ENC28J60 Ethernet driver is
+      now functional.
+    * configs/fire-stm32v2:  Add support or the fire-stm32v3 board as
+      well (untested because I do not have a v3 board).
+    * lib/stdio/lib_sscanf.c:  Add %n psuedo-format (from Kate).
+    * lib/stdio/lib_sscanf.c:  There is an issue of handling input
+      when (1) no fieldwidth is provided and (2) there is no space
+      seperating the input values.  No solutions is in place for this
+      case now (either space or a fieldwidth must be provided).  But
+      at least some of the bad logic that attempted to handle this
+      case has been removed (noted by Kate).
+    * arch/arm/src/stm32/stm32_eth.c:  DMA buffer sizes must be an
+      even multiple of 4, 8, or 16 bytes.
+    * arch/arm/src/stm32/stm32_idle.c:  Fixes STM32F107 DMA issues:
+      We cannot go into sleep mode while Ethernet is actively DMAing.
+    * configs/shenzhou/src/up_ssd1289.c:  Add infrastructure to support
+      SSD1289 LCD.  Initial checkin is just a clone of the
+      STM32F4Discovery's FSMC-based LCD interface.  The Shenzhou
+      will need a completely need bit-banging interface; this
+      initial check-in is only for the framework.
+    * configs/shenzhou/src/up_ssd1289.c:  Bit-banging driver is
+      code complete.
+    * configs/shenzhou/src/up_lcd.c:  Oops. Shenzhou LCD does not
+      have an SSD1289 controller.  Its an ILI93xx.  Ported the
+      STM3240G-EVAL ILI93xx driver to work on the Shenzhou board.
+    * configs/shenzhou/nxwm:  Added an NxWM configuration for the
+      Shenzhou board.  This is untested on initial check-in.  It will
+      be used to verify the Shenzhou LCD driver (and eventually the
+      touchscreen driver).
+    * configs/shenzhou/src/up_touchscreen.c:  Add ADS7843E touchscreen
+      support for the Shenzhou board.  The initial check-in is untested
+      and basically a clone of the the touchscreen support for the SAM-3U.
+    * tools/cfgparser.c: There are some NxWidget configuration
+      settings that must be de-quoted.
+    * arch/arm/src/stm32/Kconfig: There is no SPI4.  Some platforms
+      support SPI3 and some do not (still not clear).
+    * nuttx/configs/shenzhou: Various fixes to build new NxWM
+      configuration.
+    * configs/shenzhou:  Oops.  The Shenzhou LCD is and SSD1289,
+      not an ILI93xx.
+    * configs/shenzhou/src/up_ssd1289.c: The LCD is basically functional
+      on the Shenzhou board.
+    * graphics/nxmu:  Correct some bad parameter checking that caused
+      failures when DEBUG was enabled.
+    * arch/arm/src/armv7-m/nvic.h:  Add bit definitions for the AIRCR
+      register.
+    * drivers/input/ads7843.c:  Need semaphore protection in logic
+      that samples the position.
+    * drivers/lcd/ssd1289.c:  On some platforms we are unable to
+      read the device ID -- reason unknown; workaround in place.
+    * drivers/input/ads7843.c:  Add thresholding options and an
+      option to swap X and Y positions.  Fix some logic errors in
+      the SPI locking/selecting logic.
+    * arch/arm/src/armv7-m/up_systemreset.c:  Add logic to reset
+      the Cortex-Mx using the AIRCR register.  Contributed by Darcy
+      Gong.
+    * arch/arm/src/stm32/up_eth.c:  Add logic specifically for the
+      DM9161 PHY.  If the DM9161 failed to initialize, then use the
+      up_sysemreset() logic to reset the MCU.  Contributed by Darcy
+      Gong.
+    * arch/arm/src/stm32/stm32_gpio.c:  Add missing logic to set bit
+      for SPI3 remap.  This fixes the XPT2046 touchscreen driver using
+      drivers/input/ads7843.c
+    * configs/shenzhou/src/up_ssd1289.c:  Fix naming error in
+      conditional compilation.
+    * configs/shenzhou/nxwm/defconfig:  Disable reading from the LCD.
+      This does not work.  The hardware and the driver support the
+      capability, but there is some bug that causes memory corruption.
+      The work around for now:  Just disable reading from the LCD.
+    * drivers/lcd/ssd1289.c:  Add some logic to reduce the amount of
+      output when CONFIG_DEBUG_LCD is enabled.
+    * configs/shenzhou/nxwm/defconfig:  Bug found and fixed... The
+      original configuration had too much stuff turned on.  Reducing
+      stack sizes, some features, and buffer sizes made the
+      configuration reliable (Reading from the LCD is still disabled).
+    * net/uip/uip_icmpping.c:  Fix problem that prevented ping from
+      going outside of local network.  Submitted by Darcy Gong
 
-apps-6.21 2012-08-25 Gregory Nutt &lt;gnutt@nuttx.org&gt;
+apps-6.22 2012-09-29 Gregory Nutt &lt;gnutt@nuttx.org&gt;
 
-    * apps/include/: Stylistic clean-up of all header files.
-    * apps/modbus and apps/include/modbus:  A port of freemodbus-v1.5.0
-      has been added to the NuttX apps/ source tree.
-    * apps/examples/modbus:  A port of the freemodbus-v1.5.0 &quot;demo&quot;
-      program that will be used to verify the FreeModBus port
-    * apps/modbus:  Don't use strerror().  It is just too big.
-    * apps/modbus:  Add CONFIG_MB_TERMIOS.  If the driver doesn't support
-      termios ioctls, then don't bother trying to configure the baud, parity
-      etc.
-    * apps/nshlib:  If waitpid() is supported, then NSH now catches the
-      return value from spawned applications (provided by Mike Smith)
-    * apps/nshlib:  Lock the scheduler while starting built-in applications
-      in order to eliminate race conditions (also from Mike Smith).
-    * apps/examples/adc, pwm, and qencoder:  Add support for testing
-      devices with multiple ADC, PWM, and QE devices.
-    * apps/nshlib/nsh_mntcmds.c:  Separated mount-related commands out of
-      nsh_fscmds.c.  Extended to the mount command so that if no arguments
-      are provided, then the current mountpoints are enumerated.
-    * apps/nshlib/nsh_mntcmds.c:  Add an NSH df command to list the
-      properties of mounted file systems.
-    * apps/nshlib/nsh_parse.c:  Extend help command options.  'help' with
-      no arguments outputs a short list of commands.  With -v lists all
-      command line details.  A command name can be added to just get
-      help on one command.
-    * system/readline.c:  If character input/output is interrupted by a
-      signal, then readline() will try the read/write again.
-    * apps/*/Make.defs:  Numerous fixes needed to use the automated
-      configuration (from Richard Cochran).
+    * apps/netutils/thttpd/thttpd_cgi.c:  Missing NULL in argv[]
+      list (contributed by Kate).
+    * apps/nshlib/nsh_parse.c: CONFIG_NSH_DISABLE_WGET not CONFIG_NSH_DISABLE_GET
+      in one location (found by Kate).
+    * apps/examples/ostest/prioinherit.c:  Limit the number of test
+      threads to no more than 3 of each priority.  Bad things happen
+      when the existing logic tried to created several hundred test
+      treads!
+    * apps/nshlib/nsh.h:  Both CONFIG_LIBC_STRERROR and CONFIG_NSH_STRERROR
+      must be defined to use strerror() with NSH.
+    * apps/examples/*/*_main.c, system/i2c/i2c_main.c, and others:  Added
+      configuration variable CONFIG_USER_ENTRYPOINT that may be used to change
+      the default entry from user_start to some other symbol.  Contributed by
+      Kate.
+    * apps/netutils/webserver/httpd/c:  Fix a typo that as introduced in
+      version r4402:  'lese' instead of 'else' (Noted by Max Holtzberg).
+    * tools/mkfsdata.pl: The uIP web server CGI image making perl script was
+      moved from apps/netutils/webserver/makefsdata to nuttx/tools/mkfsdata.pl
+      (Part of a larger change submitted by Max Holtzberg).
+    * apps/netutils/webserver, apps/examples/uip, and apps/include/netutils/httpd.h:
+      The &quot;canned&quot; version of the uIP web servers content that was at 
+      netutils/webserver/httpd_fsdata.c has been replaced with a dynamically
+      built configuration located at apps/examples/uip (Contributed by
+      Max Holtzberg).
+    * apps/netutils/webserver:  Several inenhancements from Kate including the
+      ability to elide scripting and SERVER headers and the ability to map
+      files into memory before transferring them.
+    * apps/netutils/webserver:  Add ability to map a URL to CGI function.
+      Contributed by Kate.
+    * apps/nshlib/nsh_mntcmds.c: The changes of 6.21 introduced holes in the
+      error handling:  Now the number of arguments to mount can be 0 or 4.
+      Additional parameter checking is required to prevent mysterious errors
+      (submiteed by Kate).
+    * apps/netutils/webserver/httpd_mmap.c:  Fix errors when the mmap()
+      length is zero (submitted by Kate).
+    * apps/netutils/webserver/httpd_sendfile.c:  Add and option,
+      CONFIG_NETUTILS_HTTPD_SENDFILE to transfer files using the NuttX
+      sendfile() interface.
+    * apps/netutils/discover:  A UDP network discovery utility contributed
+      by Max Holtzberg.
+    * apps/examples/discover:  A test example for the UDP network discovery
+      utility (also contribed by Max Holtzberg).
+    * apps/examples/*/main.c:  Too many files called main.c.  Each renamed
+      to something unique so that they will not collide in the archive.
+    * apps/netutils/xmlrpc: The Embeddable Lightweight XML-RPC Server
+      discussed at http://www.drdobbs.com/web-development/\
+      an-embeddable-lightweight-xml-rpc-server/184405364.  Contributed by
+      Max Holtzberg.
+    * apps/netutils/uip_listenon.c:  Logic in uip_server.c that creates
+      the listening socket was moved to this new file to support re-use.
+      Contributed by Kate.
+    * apps/netutils/webserver/httpd.c:  The option CONFIG_NETUTILS_HTTPD_SINGLECONNECT
+      can now be used to limit the server to a single thread.  Option
+      CONFIG_NETUTILS_HTTPD_TIMEOUT can be used to generate HTTP 408 errors.
+      Both from Kate.
+    * apps/netutils/webserver/httpd.c:  Improvements to HTTP parser from
+      Kate.
+    * apps/netutils/webserver/httpd.c:  Add support for Keep-alive connections
+      (from Kate).
+    * apps/NxWidget/Kconfig:  This is a kludge.  I created this NxWidgets
+      directory that ONLY contains Kconfig.  NxWidgets does not live in
+      either the nuttx/ or the apps/ source trees.  This kludge makes it
+      possible to configure NxWidgets/NxWM without too much trouble (with
+      the tradeoff being a kind ugly structure and some maintenance issues).
+    * apps/examples/Make.defs: Missing support for apps/examples/watchdog.
+    * apps/NxWidgets/Kconfig:  Add option to turn on the memory monitor
+      feature of the NxWidgets/NxWM unit tests.
 
-NxWidgets-1.2 2012-06-15 Gregory Nutt &lt;gnutt@nuttx.org&gt;
+NxWidgets-1.3 2012-09-29 Gregory Nutt &lt;gnutt@nuttx.org&gt;
 
-    * NXWidgets::CCallback: callback arguement is now type CCallback and not
-      CWidgetControl;  Added a method to redirect keyboard contacts to either
-      the widgets in the window (via CWidgetControl) or to an NxConsole (via
-      nxcon_kbdin()).
-    * NXWidgets::INxWindow, CBgWindow, CNxTkWindow, CNxToolbar, CNxWindow:
-      Now pass the CCallback intances as the callback argument instead of
-      the CWidgetControl instance.  New method redirectNxConsole() will
-      support redirection of any window keyboard input to the NxConsole
-      (via CCallback).
-    * NxWM:CNxConsole:  Configures the NxConsole window to redirection keyboard
-      input to the NxConsole; redirects standard input to the NxConsole
-      device driver.
-    * NxWM:CKeyboard:  Add a new class that implements a keyboard listener
-      thread.  This thread reads from /dev/console and injects the keyboard
-      input into NX.  NX will determine which window is at the top of the
-      heirarchy and re-direct the keyboard input to only that top window.
-      This solves an important problem with, for example, running multiple
-      copies of the NxConsole:  On the copy of the NxConsole at the top of
-      the heirarchy should get the keyboard input.
-    * UnitTests/nxwm/main.cxx: Now starts the keyboard thread if
-      CONFIG_NXWM_KEYBOARD is defined.
-    * NxWM::CTaskbar:  After drawing the task bar, need to raise the
-      application window otherwise the taskbar will be on the top and
-      keyboard input will not be received by the top application.
-    * NxWM::CTaskbar:  Bugfix... previous window should not be minimized
-      when a new window is started.  It should stay in a maximized state
-      so that it will re-appear with the window above it is closed or
-      minimized.
-    * NxWM::CHexCalculator:  Add a hexadecimal/decimal calculator
-      example.
-    * NXWidgets::CNxTkWindow:  Back out height adjustment in the getSize()
-      method.  The code was correct as it was before.
-    * NXWidgets::CButtonArray and NXWidgets::CGraphicsPort:  There is
-      a kludge in there to handle the case where we cannot read the
-      background data because the LCD does not support read operations.
-      In that case, we just use the default background color.  However,
-      that doesn't work either for the case where the background color
-      changes when the widget is selected.  Then the background color
-      in the font is wrong.  Fixed in CButtonArrary, but the problem
-      probably exists in other places as well.
-    * NxWM:  Increase default spacing of icons on the Start Window.
-    * NxWM::CHexCalculator:  Fix some non-standard calculator behavior
-      after = is pressed.  Use upper case hex.  Increase font size.
-    * nxwm/Makefile:  Fix error that creapt in during some other
-      recent check-ins.
+    * UnitTests/*/main.cxx:  Change entry point name to be consistent
+      with with entry point naming conventions introduced in NuttX
+      6.22.
+    * Kconfig:  Added a mconfig configuration file.  Eventually, NxWidgets
+      needs to get hooked into the NuttX mconf configuration.  Still not
+      exactly sure how to do that.
+    * libnxwidgets/Makefile and NxWidgets/nxwm/Makefile:  Need updates
+      for consistency with recent changes to NuttX build system (&gt;= 6.22)
+    * Kconfig:  Add option to turn on the memory monitor feature of the
+      NxWidgets/NxWM unit tests.
 
 pascal-3.0 2011-05-15 Gregory Nutt &lt;gnutt@nuttx.org&gt;
 
diff --git a/nuttx/ReleaseNotes b/nuttx/ReleaseNotes
index 4d72116694..80362f5ddc 100644
--- a/nuttx/ReleaseNotes
+++ b/nuttx/ReleaseNotes
@@ -3063,3 +3063,107 @@ Bugfixes (see the change log for details) :
       for C++
 
 As well as other, less critical bugs (see the ChangeLog for details)
+
+NuttX-6.22
+^^^^^^^^^^
+
+The 89th release of NuttX, Version 6.22, was made on September 29, 2012,
+and is available for download from the SourceForge website.  Note
+that release consists of two tarballs:  nuttx-6.22.tar.gz and
+apps-6.22.tar.gz.  Both may be needed (see the top-level nuttx/README.txt
+file for build information).
+
+This release corresponds with SVN release number: r5206
+
+Note that all SVN information has been stripped from the tarballs.  If you
+need the SVN configuration, you should check out directly from SVN.  Revision
+r5206 should equivalent to release 6.22 of NuttX 6.22:
+
+    svn checkout -r5206 svn://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
+
+Or
+
+    svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
+
+Additional new features and extended functionality:
+
+    * RTOS: Application entry point is no longer user_start, but can be
+      configured using CONFIG_USER_ENTRYPOINT.  NuttX now supports two work
+      queues:  A lower priority work queue (for extended processing) and a
+      higher priority work queue (for quick, high priority operations).
+
+    * Memory Management: Added a new granule-based allocated that can be
+      used to manage, aligned and quantized DMA memory.
+
+    * File System: Add hooks to allocate I/O memory with and external
+      allocated (need if required by DMA).
+
+    * Networking: ENC28J60 driver is (finally) verified.
+
+    * Drivers: Add hooks USB device drivers to allocate I/O memory with and
+      external allocated (need if required by DMA).  Driver for the Windbond
+      SPI FLASH family (W25x16, W25x32, W25x64, and others).  ADS7843E driver
+      extended for TSC2046 and XPT2046 and verified.
+
+    * ARMv7-M: Added logic to reset the MCU using the NVIC.
+
+    * STM32: Add support for STM32F103VET6.
+
+    * STM32 Drivers: Add logic to re-initialize UARTs a second time to
+      enable DMA (Mike Smith).  I2C driver error recovery (Mike Smith).
+
+    * STM32 boards: Support for USB host added add to several configurations
+      (or at least explained in README files).  Support for the Shenzhou
+      STM32F107 board (see www.armjishu.com).  Support for M3 Wildfire
+      STM32F103 board (v2 and v3).
+
+    * Build System:  Kconfig string de-quoting logic.  Remove comments from
+      defconfig files (Kate).  Add tool to create NuttX-style symbol tables.
+      Numerous changes to configuration logic as needed for the new mconf-based
+      configuration (much of this from Richard Cochran).  Refactor common
+      Make.defs logic into tools/Config.mk (Richard Cochran).
+
+    * Library: Configurable terse output from strerror(). Added perror() (Kate).
+      Add %n format to sscanf() (Kate).
+
+    * Applications: Numerous changes and extensions to the old uIP web server
+      (from Kate and Max Holtzberg, see the ChangeLog for specific extensions).
+      UDP network discovery utility (Max Holtzberg).  Embeddable Lightweight
+      XML-RPC Server (http://www.drdobbs.com/web-development/an-embeddable-lightweight-xml-rpc-server/184405364, Max Holtzberg).
+
+Bugfixes (see the change log for details).  Some of these are very important
+(marked *critical*):
+
+    * RTOS: Fixes to priority inheritance logic (*critical*).  waitpid()
+      critical section.  Assertion in work_cancel() (Mike Smith).  mmap() (Kate).
+
+    * FAT File System: Improper Boolean expression caused un-necessary writes
+      and performance issues (*critical*, Ronen Vainish).
+
+    * Networking: Remove an un-necessary delay from recvfrom().  This greatly
+      improves network performance (*critical*, Max Holtzberg).
+
+    * Graphics: NX parameter checking errors.
+
+    * Drivers: Fix double release of memory in SDIO-based, MMC/SD driver
+      (Ronen Vainish).
+
+    * LPC17xx:  Ethernet driver fixes needed for certain PHYs (Kate).
+
+    * AVR: Fix build error (Richard Cochran).
+
+    * STM32: USB OTG FS host driver NAKing an retries.  Power management
+      compilation errors (Diego Sanchez).  Missing SPI3 remap logic.
+
+    * STM32 Drivers: Fix for Ethernet errata for STM32F107 (*critical*).
+      Ethernet buffer alignment check.  Add "kludge" to Ethernet driver to
+      handle DM9161 PHY which (at least on the Shenzhou board), sometimes
+      does not come up correctly.
+
+    * Applications: THTTPD (Kate).  NSH ping when IP address is on a different
+      network (Darcy Gong).
+
+    * Library: fread(), fflush(), fdopen(): Fix error handling logic (Ronen
+      Vainish). Fix some field-width handling issues in sscanf()
+
+As well as other, less critical bugs (see the ChangeLog for details)

From 96a334a758bbdc466ba8ae0cb20f2f79958623ec Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sat, 29 Sep 2012 20:34:25 +0000
Subject: [PATCH 10/43] Implementation of /dev/random using the STM32 Random
 Number Generator (RNG)

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5207 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/ChangeLog                           |   4 +
 nuttx/arch/arm/src/common/up_initialize.c |   6 +
 nuttx/arch/arm/src/common/up_internal.h   |   6 +
 nuttx/arch/arm/src/stm32/Kconfig          |   1 +
 nuttx/arch/arm/src/stm32/Make.defs        |   6 +-
 nuttx/arch/arm/src/stm32/chip/stm32_rng.h |  77 +++++++
 nuttx/arch/arm/src/stm32/stm32_rng.c      | 264 ++++++++++++++++++++++
 nuttx/configs/stm3240g-eval/README.txt    |  11 +-
 nuttx/configs/stm3240g-eval/nsh/defconfig |   4 +-
 nuttx/configs/stm3240g-eval/src/Makefile  |   4 +-
 nuttx/drivers/Kconfig                     |   8 +
 11 files changed, 385 insertions(+), 6 deletions(-)
 create mode 100644 nuttx/arch/arm/src/stm32/chip/stm32_rng.h
 create mode 100644 nuttx/arch/arm/src/stm32/stm32_rng.c

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index ef9e771325..55a06aeecd 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3454,3 +3454,7 @@
 	  going outside of local network.  Submitted by Darcy Gong
 
 6.23 2012-09-29 Gregory Nutt <gnutt@nuttx.org>
+
+	* arch/arm/src/stm32/stm32_rng.c, chip/stm32_rng.h, and other files:
+	  Implementation of /dev/random using the STM32 Random Number
+	  Generator (RNG).
diff --git a/nuttx/arch/arm/src/common/up_initialize.c b/nuttx/arch/arm/src/common/up_initialize.c
index 094835c293..80f9b1193b 100644
--- a/nuttx/arch/arm/src/common/up_initialize.c
+++ b/nuttx/arch/arm/src/common/up_initialize.c
@@ -171,6 +171,12 @@ void up_initialize(void)
   ramlog_consoleinit();
 #endif
 
+  /* Initialize the Random Number Generator (RNG)  */
+
+#ifdef CONFIG_DEV_RANDOM
+  up_rnginitialize();
+#endif
+
   /* Initialize the system logging device */
 
 #ifdef CONFIG_SYSLOG_CHAR
diff --git a/nuttx/arch/arm/src/common/up_internal.h b/nuttx/arch/arm/src/common/up_internal.h
index 42142c5e86..0d3c5b1f2f 100644
--- a/nuttx/arch/arm/src/common/up_internal.h
+++ b/nuttx/arch/arm/src/common/up_internal.h
@@ -373,6 +373,12 @@ extern void up_usbuninitialize(void);
 # define up_usbuninitialize()
 #endif
 
+/* Random Number Generator (RNG) ********************************************/
+
+#ifdef CONFIG_DEV_RANDOM
+extern void up_rnginitialize(void);
+#endif
+
 /****************************************************************************
  * Name: up_check_stack
  *
diff --git a/nuttx/arch/arm/src/stm32/Kconfig b/nuttx/arch/arm/src/stm32/Kconfig
index fe89119a48..2f91002360 100644
--- a/nuttx/arch/arm/src/stm32/Kconfig
+++ b/nuttx/arch/arm/src/stm32/Kconfig
@@ -320,6 +320,7 @@ config STM32_RNG
 	bool "RNG"
 	default n
 	depends on STM32_STM32F20XX || STM32_STM32F40XX
+	select ARCH_HAVE_RNG
 
 config STM32_SDIO
 	bool "SDIO"
diff --git a/nuttx/arch/arm/src/stm32/Make.defs b/nuttx/arch/arm/src/stm32/Make.defs
index e529629775..ef14b48c14 100644
--- a/nuttx/arch/arm/src/stm32/Make.defs
+++ b/nuttx/arch/arm/src/stm32/Make.defs
@@ -78,7 +78,7 @@ endif
 
 ifeq ($(CONFIG_USBHOST),y)
 ifeq ($(CONFIG_STM32_OTGFS),y)
-CMN_CSRCS       += stm32_otgfshost.c
+CMN_CSRCS	+= stm32_otgfshost.c
 endif
 endif
 
@@ -119,6 +119,10 @@ ifeq ($(CONFIG_DAC),y)
 CHIP_CSRCS	+= stm32_dac.c
 endif
 
+ifeq ($(CONFIG_DEV_RANDOM),y)
+CHIP_CSRCS	+= stm32_rng.c
+endif
+
 ifeq ($(CONFIG_PWM),y)
 CHIP_CSRCS	+= stm32_pwm.c
 endif
diff --git a/nuttx/arch/arm/src/stm32/chip/stm32_rng.h b/nuttx/arch/arm/src/stm32/chip/stm32_rng.h
new file mode 100644
index 0000000000..5e31d58174
--- /dev/null
+++ b/nuttx/arch/arm/src/stm32/chip/stm32_rng.h
@@ -0,0 +1,77 @@
+/************************************************************************************
+ * arch/arm/src/stm32/chip/stm32_rng.h
+ *
+ *   Copyright (C) 2012 Max Holtzberg. All rights reserved.
+ *   Author: Max Holtzberg <mh@uvc.de>
+ *
+ * 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.
+ *
+ ************************************************************************************/
+
+#ifndef __ARCH_ARM_STC_STM32_CHIP_STM32_RNG_H
+#define __ARCH_ARM_STC_STM32_CHIP_STM32_RNG_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+#include "chip.h"
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/* Register Offsets *****************************************************************/
+
+#define STM32_RNG_CR_OFFSET       0x0000  /* RNG Control Register */
+#define STM32_RNG_SR_OFFSET       0x0004  /* RNG Status Register */
+#define STM32_RNG_DR_OFFSET       0x0008  /* RNG Data Register */
+
+/* Register Addresses ***************************************************************/
+
+#define STM32_RNG_CR              (STM32_RNG_BASE+STM32_RNG_CR_OFFSET)
+#define STM32_RNG_SR              (STM32_RNG_BASE+STM32_RNG_SR_OFFSET)
+#define STM32_RNG_DR              (STM32_RNG_BASE+STM32_RNG_DR_OFFSET)
+
+/* Register Bitfield Definitions ****************************************************/
+
+/* RNG Control Register */
+
+#define RNG_CR_RNGEN              (1 << 2)  /* Bit 2: RNG enable */
+#define RNG_CR_IE                 (1 << 3)  /* Bit 3: Interrupt enable */
+
+/* RNG Status Register */
+
+#define RNG_SR_DRDY               (1 << 0) /* Bit 0: Data ready */
+#define RNG_SR_CECS               (1 << 1) /* Bit 1: Clock error current status */
+#define RNG_SR_SECS               (1 << 2) /* Bit 2: Seed error current status */
+#define RNG_SR_CEIS               (1 << 5) /* Bit 5: Clock error interrupt status */
+#define RNG_SR_SEIS               (1 << 6) /* Bit 6: Seed error interrupt status */
+
+#endif	/* __ARCH_ARM_STC_STM32_CHIP_STM32_RNG_H */
diff --git a/nuttx/arch/arm/src/stm32/stm32_rng.c b/nuttx/arch/arm/src/stm32/stm32_rng.c
new file mode 100644
index 0000000000..38e8108fee
--- /dev/null
+++ b/nuttx/arch/arm/src/stm32/stm32_rng.c
@@ -0,0 +1,264 @@
+/****************************************************************************
+ * arch/arm/src/stm32/stm32_rng.c
+ *
+ *   Copyright (C) 2012 Max Holtzberg. All rights reserved.
+ *   Author: Max Holtzberg <mh@uvc.de>
+ *
+ * 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 <stdint.h>
+#include <stdio.h>
+#include <stdbool.h>
+#include <debug.h>
+#include <errno.h>
+
+#include <nuttx/irq.h>
+#include <nuttx/arch.h>
+
+#include "up_arch.h"
+#include "chip/stm32_rng.h"
+#include "up_internal.h"
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static int stm32_rnginitialize(void);
+static int stm32_interrupt(int irq, void *context);
+static void stm32_enable(void);
+static void stm32_disable(void);
+static ssize_t stm32_read(struct file *filep, char *buffer, size_t);
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct rng_dev_s
+{
+  sem_t rd_devsem;      /* Threads can only exclusively access the RNG */
+  sem_t rd_readsem;     /* To block until the buffer is filled  */
+  char *rd_buf;
+  size_t rd_buflen;
+  uint32_t rd_lastval;
+  bool rd_first;
+};
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static struct rng_dev_s g_rngdev;
+
+static const struct file_operations g_rngops =
+{
+  0,               /* open */
+  0,               /* close */
+  stm32_read,      /* read */
+  0,               /* write */
+  0,               /* seek */
+  0                /* ioctl */
+#ifndef CONFIG_DISABLE_POLL
+  ,0               /* poll */
+#endif
+};
+
+/****************************************************************************
+ * Private functions
+ ****************************************************************************/
+
+static int stm32_rnginitialize()
+{
+  uint32_t regval;
+
+  vdbg("Initializing RNG\n");
+
+  memset(&g_rngdev, 0, sizeof(struct rng_dev_s));
+
+  sem_init(&g_rngdev.rd_devsem, 0, 1);
+
+  if (irq_attach(STM32_IRQ_RNG, stm32_interrupt))
+    {
+      /* We could not attach the ISR to the interrupt */
+
+      vdbg("Could not attach IRQ.\n");
+
+      return -EAGAIN;
+    }
+
+  /* Enable interrupts */
+
+  regval = getreg32(STM32_RNG_CR);
+  regval |=  RNG_CR_IE;
+  putreg32(regval, STM32_RNG_CR);
+
+  up_enable_irq(STM32_IRQ_RNG);
+
+  return OK;
+}
+
+static void stm32_enable()
+{
+  uint32_t regval;
+
+  g_rngdev.rd_first = true;
+
+  regval = getreg32(STM32_RNG_CR);
+  regval |= RNG_CR_RNGEN;
+  putreg32(regval, STM32_RNG_CR);
+}
+
+static void stm32_disable()
+{
+  uint32_t regval;
+  regval = getreg32(STM32_RNG_CR);
+  regval &= ~RNG_CR_RNGEN;
+  putreg32(regval, STM32_RNG_CR);
+}
+
+static int stm32_interrupt(int irq, void *context)
+{
+  uint32_t rngsr;
+  uint32_t data;
+
+  rngsr = getreg32(STM32_RNG_SR);
+
+  if ((rngsr & (RNG_SR_SEIS | RNG_SR_CEIS)) /* Check for error bits */
+      || !(rngsr & RNG_SR_DRDY)) /* Data ready must be set */
+    {
+      /* This random value is not valid, we will try again. */
+
+      return OK;
+    }
+
+  data = getreg32(STM32_RNG_DR);
+
+  /* As required by the FIPS PUB (Federal Information Processing Standard
+   * Publication) 140-2, the first random number generated after setting the
+   * RNGEN bit should not be used, but saved for comparison with the next
+   * generated random number. Each subsequent generated random number has to be
+   * compared with the previously generated number. The test fails if any two
+   * compared numbers are equal (continuous random number generator test).
+   */
+
+  if (g_rngdev.rd_first)
+    {
+      g_rngdev.rd_first = false;
+      g_rngdev.rd_lastval = data;
+      return OK;
+    }
+
+  if (g_rngdev.rd_lastval == data)
+    {
+      /* Two subsequent same numbers, we will try again. */
+
+      return OK;
+    }
+
+  /* If we get here, the random number is valid. */
+
+  g_rngdev.rd_lastval = data;
+
+  if (g_rngdev.rd_buflen >= 4)
+    {
+      g_rngdev.rd_buflen -= 4;
+      *(uint32_t*)&g_rngdev.rd_buf[g_rngdev.rd_buflen] = data;
+    }
+  else
+    {
+      while (g_rngdev.rd_buflen > 0)
+        {
+          g_rngdev.rd_buf[--g_rngdev.rd_buflen] = (char)data;
+          data >>= 8;
+        }
+    }
+
+  if (g_rngdev.rd_buflen == 0)
+    {
+      /* Buffer filled, stop further interrupts. */
+
+      stm32_disable();
+      sem_post(&g_rngdev.rd_readsem);
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_read
+ ****************************************************************************/
+
+static ssize_t stm32_read(struct file *filep, char *buffer, size_t buflen)
+{
+  if (sem_wait(&g_rngdev.rd_devsem) != OK)
+    {
+      return -errno;
+    }
+  else
+    {
+      /* We've got the semaphore. */
+
+      /* Initialize semaphore with 0 for blocking until the buffer is filled from
+       * interrupts.
+       */
+
+      sem_init(&g_rngdev.rd_readsem, 0, 1);
+
+      g_rngdev.rd_buflen = buflen;
+      g_rngdev.rd_buf = buffer;
+
+      /* Enable RNG with interrupts */
+
+      stm32_enable();
+
+      /* Wait until the buffer is filled */
+
+      sem_wait(&g_rngdev.rd_readsem);
+
+      /* Free RNG for next use */
+
+      sem_post(&g_rngdev.rd_devsem);
+
+      return buflen;
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void up_rnginitialize()
+{
+  stm32_rnginitialize();
+  register_driver("/dev/random", &g_rngops, 0444, NULL);
+}
diff --git a/nuttx/configs/stm3240g-eval/README.txt b/nuttx/configs/stm3240g-eval/README.txt
index df98f087d5..b536097a88 100644
--- a/nuttx/configs/stm3240g-eval/README.txt
+++ b/nuttx/configs/stm3240g-eval/README.txt
@@ -1110,7 +1110,16 @@ Where <subdir> is one of the following:
 
        nsh> umount /mnt/stuff
 
-    11. This configuration requires that jumper JP22 be set to enable RS-232
+    11. By default, this configuration supports /dev/random using the STM32's
+        RNG hardware.  This can be disabled as follows:
+
+        -CONFIG_STM32_RNG=y
+        +CONFIG_STM32_RNG=n
+ 
+        -CONFIG_DEV_RANDOM=y
+        +CONFIG_DEV_RANDOM=n
+
+    12. This configuration requires that jumper JP22 be set to enable RS-232
        operation.
 
   nsh2:
diff --git a/nuttx/configs/stm3240g-eval/nsh/defconfig b/nuttx/configs/stm3240g-eval/nsh/defconfig
index 80f5ec167c..653538b45a 100644
--- a/nuttx/configs/stm3240g-eval/nsh/defconfig
+++ b/nuttx/configs/stm3240g-eval/nsh/defconfig
@@ -69,7 +69,6 @@ CONFIG_STM32_BUILDROOT=n
 #
 # JTAG Enable settings (by default JTAG-DP and SW-DP are disabled):
 #
-CONFIG_STM32_DFU=y
 CONFIG_STM32_JTAG_FULL_ENABLE=y
 CONFIG_STM32_JTAG_NOJNTRST_ENABLE=n
 CONFIG_STM32_JTAG_SW_ENABLE=n
@@ -100,7 +99,7 @@ CONFIG_STM32_OTGHS=n
 CONFIG_STM32_DCMI=n
 CONFIG_STM32_CRYP=n
 CONFIG_STM32_HASH=n
-CONFIG_STM32_RNG=n
+CONFIG_STM32_RNG=y
 CONFIG_STM32_OTGFS=n
 # AHB3:
 CONFIG_STM32_FSMC=n
@@ -306,6 +305,7 @@ CONFIG_SCHED_WORKSTACKSIZE=2048
 CONFIG_SIG_SIGWORK=4
 CONFIG_SCHED_WAITPID=y
 CONFIG_SCHED_ATEXIT=n
+CONFIG_DEV_RANDOM=y
 
 #
 # System Logging
diff --git a/nuttx/configs/stm3240g-eval/src/Makefile b/nuttx/configs/stm3240g-eval/src/Makefile
index 80225ea1fb..ffcf719aba 100644
--- a/nuttx/configs/stm3240g-eval/src/Makefile
+++ b/nuttx/configs/stm3240g-eval/src/Makefile
@@ -100,8 +100,8 @@ OBJS		= $(AOBJS) $(COBJS)
 ARCH_SRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
 ifeq ($(WINTOOL),y)
   CFLAGS	+= -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-  		   -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-  		   -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
+			   -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
+			   -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
 else
   CFLAGS	+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
 endif
diff --git a/nuttx/drivers/Kconfig b/nuttx/drivers/Kconfig
index ea218a5925..1d263ec145 100644
--- a/nuttx/drivers/Kconfig
+++ b/nuttx/drivers/Kconfig
@@ -11,6 +11,14 @@ config DEV_ZERO
 	bool "Enable /dev/zero"
 	default n
 
+config ARCH_HAVE_RNG
+	bool
+
+config DEV_RANDOM 
+	bool "Enable /dev/random"
+	default n
+	depends on ARCH_HAVE_RNG
+
 config LOOP
 	bool "Enable loop device"
 	default n

From 14b3f41aa6613f94616d7d6bcba5454c7f8caf8a Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Wed, 3 Oct 2012 23:36:54 +0000
Subject: [PATCH 11/43] Delete the apps/vsn directory (moved commands to
 apps/system)

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5208 42af7a65-404d-4744-a932-0658087f49c3
---
 apps/ChangeLog.txt                       |   3 +
 apps/Kconfig                             |   4 -
 apps/Makefile                            |   3 +-
 apps/README.txt                          |   2 +-
 apps/system/Kconfig                      |  20 +-
 apps/system/Make.defs                    |  17 +
 apps/system/Makefile                     |   2 +-
 apps/system/free/free.c                  |  82 +--
 apps/system/install/install.c            | 626 +++++++++++++----------
 apps/system/poweroff/Kconfig             |  16 +
 apps/{vsn => system}/poweroff/Makefile   |   2 +-
 apps/{vsn => system}/poweroff/README.txt |   0
 apps/{vsn => system}/poweroff/poweroff.c |  39 +-
 apps/{vsn => system}/ramtron/Kconfig     |   8 +-
 apps/{vsn => system}/ramtron/Makefile    |   2 +-
 apps/{vsn => system}/ramtron/README.txt  |   0
 apps/{vsn => system}/ramtron/ramtron.c   |  19 +-
 apps/{vsn => system}/sdcard/Kconfig      |   4 +-
 apps/{vsn => system}/sdcard/Makefile     |   2 +-
 apps/{vsn => system}/sdcard/README.txt   |   0
 apps/{vsn => system}/sdcard/sdcard.c     |  93 ++--
 apps/{vsn => system}/sysinfo/Kconfig     |   5 +-
 apps/{vsn => system}/sysinfo/Makefile    |   2 +-
 apps/{vsn => system}/sysinfo/README.txt  |   0
 apps/{vsn => system}/sysinfo/sysinfo.c   |  38 +-
 apps/vsn/Kconfig                         |  11 -
 apps/vsn/Make.defs                       |  51 --
 apps/vsn/Makefile                        |  71 ---
 apps/vsn/poweroff/Kconfig                |  14 -
 nuttx/Documentation/NuttX.html           |   2 +-
 30 files changed, 572 insertions(+), 566 deletions(-)
 create mode 100644 apps/system/poweroff/Kconfig
 rename apps/{vsn => system}/poweroff/Makefile (99%)
 rename apps/{vsn => system}/poweroff/README.txt (100%)
 rename apps/{vsn => system}/poweroff/poweroff.c (64%)
 rename apps/{vsn => system}/ramtron/Kconfig (55%)
 rename apps/{vsn => system}/ramtron/Makefile (99%)
 rename apps/{vsn => system}/ramtron/README.txt (100%)
 rename apps/{vsn => system}/ramtron/ramtron.c (92%)
 rename apps/{vsn => system}/sdcard/Kconfig (84%)
 rename apps/{vsn => system}/sdcard/Makefile (99%)
 rename apps/{vsn => system}/sdcard/README.txt (100%)
 rename apps/{vsn => system}/sdcard/sdcard.c (65%)
 rename apps/{vsn => system}/sysinfo/Kconfig (84%)
 rename apps/{vsn => system}/sysinfo/Makefile (99%)
 rename apps/{vsn => system}/sysinfo/README.txt (100%)
 rename apps/{vsn => system}/sysinfo/sysinfo.c (75%)
 delete mode 100644 apps/vsn/Kconfig
 delete mode 100644 apps/vsn/Make.defs
 delete mode 100644 apps/vsn/Makefile
 delete mode 100644 apps/vsn/poweroff/Kconfig

diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index 75f02754b5..2d7b2eb9f5 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -350,3 +350,6 @@
 	  feature of the NxWidgets/NxWM unit tests.
 
 6.23 2012-xx-xx Gregory Nutt <gnutt@nuttx.org>
+
+	* vsn: Moved all NSH commands from vsn/ to system/.  Deleted the vsn/
+	  directory.
diff --git a/apps/Kconfig b/apps/Kconfig
index 5543ba72dd..ea9bd2d314 100644
--- a/apps/Kconfig
+++ b/apps/Kconfig
@@ -34,7 +34,3 @@ endmenu
 menu "System NSH Add-Ons"
 source "$APPSDIR/system/Kconfig"
 endmenu
-
-menu "VSN board Add-Ons"
-source "$APPSDIR/vsn/Kconfig"
-endmenu
diff --git a/apps/Makefile b/apps/Makefile
index 3a59fd6b44..d2b0ecdab5 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -49,7 +49,7 @@ APPDIR = ${shell pwd}
 #   list can be extended by the .config file as well
 
 CONFIGURED_APPS =
-SUBDIRS = examples graphics interpreters modbus namedapp nshlib netutils system vsn
+SUBDIRS = examples graphics interpreters modbus namedapp nshlib netutils system
 
 # There are two different mechanisms for obtaining the list of configured
 # directories:
@@ -78,7 +78,6 @@ include namedapp/Make.defs
 include netutils/Make.defs
 include nshlib/Make.defs
 include system/Make.defs
-include vsn/Make.defs
 
 # INSTALLED_APPS is the list of currently available application directories.  It
 # is the same as CONFIGURED_APPS, but filtered to exclude any non-existent
diff --git a/apps/README.txt b/apps/README.txt
index f9c9ececd7..7a379254e7 100644
--- a/apps/README.txt
+++ b/apps/README.txt
@@ -107,7 +107,7 @@ NuttX is configured.  .config is included in the toplevel apps/Makefile.
 As a minimum, this configuration file must define files to add to the
 CONFIGURED_APPS list like:
 
-  CONFIGURED_APPS  += examples/hello vsn/poweroff
+  CONFIGURED_APPS  += examples/hello system/poweroff
 
 Named Start-Up main() function
 ------------------------------
diff --git a/apps/system/Kconfig b/apps/system/Kconfig
index 44bf5a2e64..d4d4346652 100644
--- a/apps/system/Kconfig
+++ b/apps/system/Kconfig
@@ -3,7 +3,7 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-menu "Custom free memory command"
+menu "Custom Free Memory Command"
 source "$APPSDIR/system/free/Kconfig"
 endmenu
 
@@ -15,6 +15,22 @@ menu "FLASH Program Installation"
 source "$APPSDIR/system/install/Kconfig"
 endmenu
 
-menu "readline() support"
+menu "readline()"
 source "$APPSDIR/system/readline/Kconfig"
 endmenu
+
+menu "Power Off"
+source "$APPSDIR/system/poweroff/Kconfig"
+endmenu
+
+menu "RAMTRON"
+source "$APPSDIR/system/ramtron/Kconfig"
+endmenu
+
+menu "SD Card"
+source "$APPSDIR/system/sdcard/Kconfig"
+endmenu
+
+menu "Sysinfo"
+source "$APPSDIR/system/sysinfo/Kconfig"
+endmenu
diff --git a/apps/system/Make.defs b/apps/system/Make.defs
index a4aea2d318..3d10f84e55 100644
--- a/apps/system/Make.defs
+++ b/apps/system/Make.defs
@@ -49,3 +49,20 @@ endif
 ifeq ($(CONFIG_SYSTEM_READLINE),y)
 CONFIGURED_APPS += system/readline
 endif
+
+ifeq ($(CONFIG_SYSTEM_POWEROFF),y)
+CONFIGURED_APPS += system/poweroff
+endif
+
+ifeq ($(CONFIG_SYSTEM_RAMTRON),y)
+CONFIGURED_APPS += system/ramtron
+endif
+
+ifeq ($(CONFIG_SYSTEM_SDCARD),y)
+CONFIGURED_APPS += system/sdcard
+endif
+
+ifeq ($(CONFIG_SYSTEM_SYSINFO),y)
+CONFIGURED_APPS += system/sysinfo
+endif
+
diff --git a/apps/system/Makefile b/apps/system/Makefile
index 73eb60d152..d64bb54c6e 100644
--- a/apps/system/Makefile
+++ b/apps/system/Makefile
@@ -37,7 +37,7 @@
 
 # Sub-directories containing system task
 
-SUBDIRS = free i2c install readline
+SUBDIRS = free i2c install readline poweroff ramtron sdcard sysinfo
 
 # Create the list of installed runtime modules (INSTALLED_DIRS)
 
diff --git a/apps/system/free/free.c b/apps/system/free/free.c
index 3d9698ecbe..c44cd5e225 100644
--- a/apps/system/free/free.c
+++ b/apps/system/free/free.c
@@ -33,57 +33,65 @@
  *
  ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include <nuttx/config.h>
 #include <nuttx/progmem.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
- 
-/* \todo Max block size only works on uniform prog mem */
- 
-void free_getprogmeminfo(struct mallinfo * mem)
-{
-    uint16_t page = 0, stpage = 0xFFFF;
-    uint16_t pagesize = 0;
-    int status;
-    
-    mem->arena    = 0;
-    mem->fordblks = 0;
-    mem->uordblks = 0;
-    mem->mxordblk = 0;
-    
-    for (status=0, page=0; status >= 0; page++) {
-    
-        status = up_progmem_ispageerased(page);
-        pagesize = up_progmem_pagesize(page);
-        
-        mem->arena += pagesize;
-        
-        /* Is this beginning of new free space section */
-        if (status == 0) {
-            if (stpage == 0xFFFF) stpage = page;
-            mem->fordblks += pagesize;
-        }
-        else if (status != 0) {
-            mem->uordblks += pagesize;
 
-            if (stpage != 0xFFFF && up_progmem_isuniform()) {
-                stpage = page - stpage;
-                if (stpage > mem->mxordblk) 
-                    mem->mxordblk = stpage;
-                stpage = 0xFFFF;
+/* TODO Max block size only works on uniform prog mem */
+
+static void free_getprogmeminfo(struct mallinfo * mem)
+{
+  uint16_t page = 0, stpage = 0xFFFF;
+  uint16_t pagesize = 0;
+  int status;
+
+  mem->arena    = 0;
+  mem->fordblks = 0;
+  mem->uordblks = 0;
+  mem->mxordblk = 0;
+
+  for (status=0, page=0; status >= 0; page++)
+    {
+      status = up_progmem_ispageerased(page);
+      pagesize = up_progmem_pagesize(page);
+
+      mem->arena += pagesize;
+
+      /* Is this beginning of new free space section */
+
+      if (status == 0)
+        {
+          if (stpage == 0xFFFF) stpage = page;
+          mem->fordblks += pagesize;
+        }
+      else if (status != 0)
+        {
+          mem->uordblks += pagesize;
+
+          if (stpage != 0xFFFF && up_progmem_isuniform())
+            {
+              stpage = page - stpage;
+              if (stpage > mem->mxordblk)
+                {
+                  mem->mxordblk = stpage;
+                }
+              stpage = 0xFFFF;
             }
         }
     }
-    
-    mem->mxordblk *= pagesize;
-}
 
+  mem->mxordblk *= pagesize;
+}
 
 /****************************************************************************
  * Public Functions
diff --git a/apps/system/install/install.c b/apps/system/install/install.c
index 2f11c64340..fd14b7a6f2 100644
--- a/apps/system/install/install.c
+++ b/apps/system/install/install.c
@@ -33,6 +33,10 @@
  *
  ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include <nuttx/config.h>
 #include <nuttx/progmem.h>
 #include <sys/stat.h>
@@ -43,9 +47,8 @@
 #include <string.h>
 #include <errno.h>
 
-
 /****************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 #define ACTION_INSTALL              0x01
@@ -55,12 +58,11 @@
 
 #define INSTALL_PROGRAMBLOCKSIZE    1024
 
-
 /****************************************************************************
  * Private data
  ****************************************************************************/
 
-const char *install_help = 
+static const char *install_help =
     "Installs XIP program into flash and creates a start-up script in the\n"
     "destination directory.\n\n"
     "Usage:\t%s [options] source-file.xip destination-directory\n\n"
@@ -72,341 +74,397 @@ const char *install_help =
     "\t--force\t\t\tReplaces existing installation\n"
     "\t--start <page>\t\tInstalls application at or after <page>\n"
     "\t--margin <pages>\tLeave some free space after the kernel (default 16)\n";
-    
-const char *install_script_text = 
+
+static const char *install_script_text =
     "# XIP stacksize=%x priority=%x size=%x\n";
-    
-const char *install_script_exec = 
+
+static const char *install_script_exec =
     "exec 0x%x\n";
-    
-    
+
 /****************************************************************************
  * Private functions
  ****************************************************************************/
 
-int install_getstartpage(int startpage, int pagemargin, int desiredsize)
+static int install_getstartpage(int startpage, int pagemargin, int desiredsize)
 {
-    uint16_t page = 0, stpage = 0xFFFF;
-    uint16_t pagesize = 0;
-    int      maxlen = -1;
-    int      maxlen_start = 0xFFFF;
-    int      status;
-    
-    for (status=0, page=0; status >= 0; page++) {
-    
-        status   = up_progmem_ispageerased(page);
-        pagesize = up_progmem_pagesize(page);
-        
-        /* Is this beginning of new free space section */
-        if (status == 0) {
-            if (stpage == 0xFFFF) stpage = page;
+  uint16_t page = 0, stpage = 0xffff;
+  uint16_t pagesize = 0;
+  int      maxlen = -1;
+  int      maxlen_start = 0xffff;
+  int      status;
+
+  for (status=0, page=0; status >= 0; page++)
+    {
+      status   = up_progmem_ispageerased(page);
+      pagesize = up_progmem_pagesize(page);
+
+      /* Is this beginning of new free space section */
+
+      if (status == 0)
+        {
+          if (stpage == 0xffff) stpage = page;
         }
-        else if (status != 0) {
+      else if (status != 0)
+        {
+          if (stpage != 0xffff)
+            {
+              if ((page - stpage) > maxlen)
+                {
+                  if (maxlen==-1)
+                    {
+                      /* First time found sth? */
 
-            if (stpage != 0xFFFF) {
-                
-                if ( (page - stpage) > maxlen) {
+                      stpage += pagemargin;
+                      maxlen = 0;
+                    }
 
-                    if (maxlen==-1) { /* First time found sth? */
-                        stpage += pagemargin;
-                        maxlen = 0;
+                  if(stpage < startpage)
+                    {
+                      stpage = startpage;
                     }
-                    
-                    if(stpage < startpage)
-                        stpage = startpage;
-                    
-                    if (page > stpage) {
-                        maxlen = page - stpage;
-                        maxlen_start = stpage;
+
+                  if (page > stpage)
+                    {
+                      maxlen = page - stpage;
+                      maxlen_start = stpage;
                     }
-                    
-                    if (maxlen*pagesize >= desiredsize) {
-                        /* printf("Found page at %d ... %d\n", stpage, page); */
-                        return maxlen_start*pagesize;
+
+                  if (maxlen*pagesize >= desiredsize)
+                    {
+                      /* printf("Found page at %d ... %d\n", stpage, page); */
+                      return maxlen_start*pagesize;
                     }
                 }
-                
-                stpage = 0xFFFF;
+
+              stpage = 0xffff;
             }
         }
     }
-    
-    /* Requested space is not available */
-    
-    return -1;
+
+  /* Requested space is not available */
+
+  return -1;
 }
 
-
-int install_programflash(int startaddr, const char *source)
+static int install_programflash(int startaddr, const char *source)
 {
-    int  status;
-    int  count;
-    int  totalsize = 0;
-    char *buf;
-    FILE *fp;
-    
-    if ( (buf = malloc(INSTALL_PROGRAMBLOCKSIZE)) == NULL )
-        return -errno;
-    
-    if ( (fp=fopen(source, "r")) ) {
-        do {
-            count = fread(buf, 1, INSTALL_PROGRAMBLOCKSIZE, fp);
-    
-            if ( (status = up_progmem_write(startaddr, buf, count)) < 0) {
-                totalsize = status;
-                break;
-            }
-                
-            startaddr += count;
-            totalsize += count;
-        }
-        while(count);
+  int  status;
+  int  count;
+  int  totalsize = 0;
+  char *buf;
+  FILE *fp;
+
+  if ((buf = malloc(INSTALL_PROGRAMBLOCKSIZE)) == NULL)
+    {
+      return -ENOMEM;
     }
-    else totalsize = -errno;
-            
-    fclose(fp);
-    free(buf);
-    
-    return totalsize;
+
+  if ((fp = fopen(source, "r")))
+    {
+      do
+        {
+          count = fread(buf, 1, INSTALL_PROGRAMBLOCKSIZE, fp);
+
+          if ((status = up_progmem_write(startaddr, buf, count)) < 0)
+            {
+              totalsize = status;
+              break;
+            }
+
+          startaddr += count;
+          totalsize += count;
+        }
+      while(count);
+    }
+  else
+    {
+      totalsize = -errno;
+    }
+
+  fclose(fp);
+  free(buf);
+
+  return totalsize;
 }
 
-
-void install_getscriptname(char *scriptname, const char *progname, const char *destdir)
+static void install_getscriptname(char *scriptname, const char *progname, const char *destdir)
 {
-    const char * progonly;
+  const char * progonly;
 
-    /* I.e. as /usr/bin */
-    strcpy(scriptname, destdir);
-    
-    /* extract from i.e. /sdcard/demo -> /demo, together with / */
-    progonly = strrchr(progname, '/');
-    strcat(scriptname, progonly);
+  /* I.e. as /usr/bin */
+
+  strcpy(scriptname, destdir);
+
+  /* extract from i.e. /sdcard/demo -> /demo, together with / */
+
+  progonly = strrchr(progname, '/');
+  strcat(scriptname, progonly);
 }
 
-
-int install_getprogsize(const char *progname)
+static int install_getprogsize(const char *progname)
 {
-    struct stat fileinfo;
-    
-    if ( stat(progname, &fileinfo) < 0 ) 
-        return -1;
-        
-    return fileinfo.st_size;
+  struct stat fileinfo;
+
+  if (stat(progname, &fileinfo) < 0)
+    {
+      return -1;
+    }
+
+  return fileinfo.st_size;
 }
 
-
-int install_alreadyexists(const char *scriptname)
+static int install_alreadyexists(const char *scriptname)
 {
-    FILE *fp;
-    
-    if ( (fp=fopen(scriptname, "r"))==NULL )
-        return 0;
-        
-    fclose(fp);
+  FILE *fp;
+
+  if ((fp = fopen(scriptname, "r")) == NULL)
+    {
+      return 0;
+    }
+
+  fclose(fp);
     return 1;
 }
 
-
-int install_createscript(int addr, int stacksize, int progsize, 
-        int priority, const char *scriptname)
+static int install_createscript(int addr, int stacksize, int progsize,
+                                int priority, const char *scriptname)
 {
-    FILE *fp;
-    
-    if ( (fp=fopen(scriptname, "w+"))==NULL )
-        return -errno;
-        
-    fprintf(fp, install_script_text, stacksize, priority, progsize);
-    fprintf(fp, install_script_exec, addr);
-    
-    fflush(fp);
-    fclose(fp);
+  FILE *fp;
 
-    return 0;
+  if ((fp = fopen(scriptname, "w+")) == NULL)
+    {
+      return -errno;
+    }
+
+  fprintf(fp, install_script_text, stacksize, priority, progsize);
+  fprintf(fp, install_script_exec, addr);
+
+  fflush(fp);
+  fclose(fp);
+
+  return 0;
 }
 
-
-int install_getlasthexvalue(FILE *fp, char delimiter)
+static int install_getlasthexvalue(FILE *fp, char delimiter)
 {
-    char buf[128];
-    char *p;
-    
-    if (fgets(buf, 127, fp)) {
-        if ( (p = strrchr(buf, delimiter)) ) {
-            return strtol(p+1, NULL, 16);
+  char buf[128];
+  char *p;
+
+  if (fgets(buf, 127, fp))
+    {
+      if ((p = strrchr(buf, delimiter)))
+        {
+          return strtol(p+1, NULL, 16);
         }
     }
-    return -1;
+
+  return -1;
 }
 
-
-int install_remove(const char *scriptname)
+static int install_remove(const char *scriptname)
 {
-    FILE    *fp;
-    int      progsize, addr, freedsize;
-    uint16_t page;
-    int      status = 0;
-    
-    /* Parse script */
-    
-    if ( (fp=fopen(scriptname, "r")) ) {
-        progsize  = install_getlasthexvalue(fp,'=');
-        addr      = install_getlasthexvalue(fp,' ');
-        freedsize = progsize;
+  FILE    *fp;
+  int      progsize, addr, freedsize;
+  uint16_t page;
+  int      status = 0;
+
+  /* Parse script */
+
+  if ((fp = fopen(scriptname, "r")))
+    {
+      progsize  = install_getlasthexvalue(fp,'=');
+      addr      = install_getlasthexvalue(fp,' ');
+      freedsize = progsize;
     }
-    else return -errno;
-            
-    fclose(fp);
-    
-    /* Remove pages */
-    
-    if (progsize <= 0 || addr <= 0)
-        return -EIO;
-        
-    do {
-        if ((page = up_progmem_getpage(addr)) < 0) {
-            status = -page;
-            break;
+  else
+    {
+      return -errno;
+    }
+
+  fclose(fp);
+
+  /* Remove pages */
+
+  if (progsize <= 0 || addr <= 0)
+    {
+      return -EIO;
+    }
+
+  do
+    {
+      if ((page = up_progmem_getpage(addr)) < 0)
+        {
+          status = -page;
+          break;
         }
-        
-        if ( up_progmem_erasepage(page) < 0) {
-            status = -page;
-            break;
+
+      if (up_progmem_erasepage(page) < 0)
+        {
+          status = -page;
+          break;
         }
-        
-        addr += up_progmem_pagesize(page);
-        progsize -= up_progmem_pagesize(page);
-        
-    } while(progsize > 0);
-    
-    if (status < 0) return status;
-    
-    /* Remove script file */
-    
-    if (unlink(scriptname) < 0) return -errno;
-    
-    return freedsize;
+
+      addr += up_progmem_pagesize(page);
+      progsize -= up_progmem_pagesize(page);
+
+    }
+  while(progsize > 0);
+
+  if (status < 0)
+    {
+      return status;
+    }
+
+  /* Remove script file */
+
+  if (unlink(scriptname) < 0)
+    {
+      return -errno;
+    }
+
+  return freedsize;
 }
 
 
 /****************************************************************************
- * Start
+ * Public Functions
  ****************************************************************************/
 
 int install_main(int argc, char *argv[])
 {
-    int i;
-    int progsize;
-    int scrsta;
-    int stacksize       = 4096;
-    int priority        = SCHED_PRIORITY_DEFAULT;
-    int pagemargin      = 16;
-    int startpage       = 0;
-    int startaddr       = 0;
-    int action          = ACTION_INSTALL;
-    char scriptname[128];
-    
-    /* Supported? */
-    
-    if ( !up_progmem_isuniform() ) {
-        fprintf(stderr, "Error: install supports uniform organization only.\n");
-        return -1;
-    }
-    
-    /* Parse arguments */
-    
-    for (i=1; i<argc; i++) {
-        if (argv[i][0]=='-' && argv[i][1]=='-' && i<=argc) {
-        
-            if (strcmp(argv[i]+2, "stack")==0) {
-                stacksize = atoi(argv[++i]);
-            }
-            else if (strcmp(argv[i]+2, "priority")==0) {
-                priority = atoi(argv[++i]);
-            }
-            else if (strcmp(argv[i]+2, "start")==0) {
-                startpage = atoi(argv[++i]);
-            }
-            else if (strcmp(argv[i]+2, "margin")==0) {
-                pagemargin = atoi(argv[++i]);
-            }
-            else if (strcmp(argv[i]+2, "remove")==0) {
-                action = ACTION_REMOVE;
-            }
-            else if (strcmp(argv[i]+2, "force")==0) {
-                action = ACTION_REINSTALL;
-            }
-            else fprintf(stderr, "Unknown option: %s\n", argv[i]);
-        }
-        else break;
-    }
-    
-    /* Do the job */
-    
-    switch(action & 1) {
-            
-        case ACTION_REMOVE:
-            if (i > argc-1) {
-                action = ACTION_INSUFPARAM;
-                break;  /* are there sufficient parameters */
-            }
-            if ( (scrsta=install_remove(argv[i])) < 0) {
-                fprintf(stderr, "Could not remove program: %s\n", strerror(-scrsta) );
-                return -1;
-            }
-            printf("Removed %s and freed %d bytes\n", argv[i], scrsta);
-            return 0;
-            
-    
-        case ACTION_INSTALL:
-            if (i > argc-2) {
-                action = ACTION_INSUFPARAM;
-                break;  /* are there sufficient parameters */
-            }
-            
-            install_getscriptname(scriptname, argv[i], argv[i+1]);
-            
-            // script-exists?
-            if (install_alreadyexists(scriptname)==1) {
-                
-                if (action != ACTION_REINSTALL) {
-                    fprintf(stderr, "Program with that name already exists.\n");
-                    return -EEXIST;
-                }
-                
-                if ( (scrsta=install_remove(scriptname)) < 0) {
-                    fprintf(stderr, "Could not remove program: %s\n", strerror(-scrsta) );
-                    return -1;
-                }
-                
-                printf("Replacing %s\n", scriptname);
-            }
-            
-            startaddr = install_getstartpage(startpage, pagemargin, install_getprogsize(argv[i]) );
-            if (startpage < 0) {
-                fprintf(stderr, "Not enough memory\n");
-                return -ENOMEM;
-            }
-                            
-            if ( (progsize = install_programflash(startaddr, argv[i])) <= 0) {
-                fprintf(stderr, "Error writing program memory: %s\n"
-                    "Note: Flash pages are not released, so you may try again and program will be\n"
-                    "      written in other pages.\n", strerror(-progsize) );
-                
-                return -EIO;
-            }
-            if ( (scrsta = install_createscript(startaddr, stacksize, progsize, 
-                                           priority, scriptname)) < 0) {
-                fprintf(stderr, "Error writing program script at %s: %s\n", 
-                    argv[i+1], strerror(-scrsta) );
-                return -EIO;
-            }
-            
-            printf("Installed application of size %d bytes to program memory [%xh - %xh].\n",
-                progsize, startaddr, startaddr + progsize);
+  int i;
+  int progsize;
+  int scrsta;
+  int stacksize       = 4096;
+  int priority        = SCHED_PRIORITY_DEFAULT;
+  int pagemargin      = 16;
+  int startpage       = 0;
+  int startaddr       = 0;
+  int action          = ACTION_INSTALL;
+  char scriptname[128];
 
-            return 0;
+  /* Supported? */
+
+  if (!up_progmem_isuniform())
+    {
+      fprintf(stderr, "Error: install supports uniform organization only.\n");
+      return -1;
     }
-    
-    fprintf(stderr, install_help, argv[0], argv[0]);
-    return -1;
+
+  /* Parse arguments */
+
+  for (i=1; i<argc; i++)
+    {
+      if (argv[i][0]=='-' && argv[i][1]=='-' && i<=argc)
+        {
+          if (strcmp(argv[i]+2, "stack")==0)
+            {
+              stacksize = atoi(argv[++i]);
+            }
+          else if (strcmp(argv[i]+2, "priority")==0)
+            {
+              priority = atoi(argv[++i]);
+            }
+          else if (strcmp(argv[i]+2, "start")==0)
+            {
+              startpage = atoi(argv[++i]);
+            }
+          else if (strcmp(argv[i]+2, "margin")==0)
+            {
+              pagemargin = atoi(argv[++i]);
+            }
+          else if (strcmp(argv[i]+2, "remove")==0)
+            {
+              action = ACTION_REMOVE;
+            }
+          else if (strcmp(argv[i]+2, "force")==0)
+            {
+              action = ACTION_REINSTALL;
+            }
+          else fprintf(stderr, "Unknown option: %s\n", argv[i]);
+        }
+      else
+        {
+          break;
+        }
+    }
+
+  /* Do the job */
+
+  switch(action & 1)
+    {
+      case ACTION_REMOVE:
+        if (i > argc-1)
+          {
+            action = ACTION_INSUFPARAM;
+            break;  /* are there sufficient parameters */
+          }
+
+        if ((scrsta=install_remove(argv[i])) < 0)
+          {
+            fprintf(stderr, "Could not remove program: %s\n", strerror(-scrsta));
+            return -1;
+          }
+
+        printf("Removed %s and freed %d bytes\n", argv[i], scrsta);
+          return 0;
+
+      case ACTION_INSTALL:
+        if (i > argc-2)
+          {
+            action = ACTION_INSUFPARAM;
+            break;  /* are there sufficient parameters */
+          }
+
+        install_getscriptname(scriptname, argv[i], argv[i+1]);
+
+        /* script-exists? */
+
+        if (install_alreadyexists(scriptname) == 1)
+          {
+            if (action != ACTION_REINSTALL)
+              {
+                fprintf(stderr, "Program with that name already exists.\n");
+                return -EEXIST;
+              }
+
+            if ((scrsta = install_remove(scriptname)) < 0)
+              {
+                fprintf(stderr, "Could not remove program: %s\n", strerror(-scrsta));
+                return -1;
+              }
+
+            printf("Replacing %s\n", scriptname);
+          }
+
+        startaddr = install_getstartpage(startpage, pagemargin, install_getprogsize(argv[i]));
+        if (startpage < 0)
+          {
+            fprintf(stderr, "Not enough memory\n");
+            return -ENOMEM;
+          }
+
+        if ((progsize = install_programflash(startaddr, argv[i])) <= 0)
+          {
+            fprintf(stderr, "Error writing program memory: %s\n"
+                    "Note: Flash pages are not released, so you may try again and program will be\n"
+                    "      written in other pages.\n", strerror(-progsize));
+            return -EIO;
+          }
+
+        if ((scrsta = install_createscript(startaddr, stacksize, progsize,
+                                             priority, scriptname)) < 0)
+          {
+            fprintf(stderr, "Error writing program script at %s: %s\n",
+                    argv[i+1], strerror(-scrsta));
+            return -EIO;
+          }
+
+        printf("Installed application of size %d bytes to program memory [%xh - %xh].\n",
+                progsize, startaddr, startaddr + progsize);
+        return 0;
+    }
+
+  fprintf(stderr, install_help, argv[0], argv[0]);
+  return -1;
 }
diff --git a/apps/system/poweroff/Kconfig b/apps/system/poweroff/Kconfig
new file mode 100644
index 0000000000..ae8eac450f
--- /dev/null
+++ b/apps/system/poweroff/Kconfig
@@ -0,0 +1,16 @@
+#
+# For a description of the syntax of this configuration file,
+# see misc/tools/kconfig-language.txt.
+#
+
+config SYSTEM_POWEROFF
+	bool "Power-Off command"
+	default n
+	---help---
+		Enable support for the NSH poweroff command.  NOTE: This option
+		provides the NSH power-off command only.  It requires board-specific
+		support to actually implement the power-off.
+
+if SYSTEM_POWEROFF
+endif
+
diff --git a/apps/vsn/poweroff/Makefile b/apps/system/poweroff/Makefile
similarity index 99%
rename from apps/vsn/poweroff/Makefile
rename to apps/system/poweroff/Makefile
index e58ecfa860..40465e957d 100644
--- a/apps/vsn/poweroff/Makefile
+++ b/apps/system/poweroff/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# Makefile
+# apps/system/poweroff/Makefile
 #
 #   Copyright (C) 2011 Uros Platise. All rights reserved.
 #   Author: Uros Platise <uros.platise@isotel.eu>
diff --git a/apps/vsn/poweroff/README.txt b/apps/system/poweroff/README.txt
similarity index 100%
rename from apps/vsn/poweroff/README.txt
rename to apps/system/poweroff/README.txt
diff --git a/apps/vsn/poweroff/poweroff.c b/apps/system/poweroff/poweroff.c
similarity index 64%
rename from apps/vsn/poweroff/poweroff.c
rename to apps/system/poweroff/poweroff.c
index ca3f056e80..dd08b177a1 100644
--- a/apps/vsn/poweroff/poweroff.c
+++ b/apps/system/poweroff/poweroff.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * poweroff/poweroff.c
+ * apps/system/poweroff/poweroff.c
  *
  *   Copyright (C) 2011 Uros Platise. All rights reserved.
  *   Author: Uros Platise <uros.platise@isotel.eu>
@@ -33,22 +33,31 @@
  *
  ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include <arch/board/power.h>
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
 int poweroff_main(int argc, char *argv[])
 {
-/* TODO:
- *  - replace this by sending general system signal to shutdown, where i.e. nsh
- *    must issue down script (it may check whether nsh is running before spawning
- *    a new process with nsh poweroff)
- *  - wait for some time (~0.5 second for VSN), that SDcard is flashed and synced
- *  - call poweroff
- * 
- * TODO on boot:
- *  - if external key is pressed, do not start the nsh! but wait until it is released
- *    (to get rid of bad mounts of the sdcard etc.) this could be handled in the 
- *    button driver immediately on system boot
- */
-	board_power_off();
-	return 0;
+  /* TODO:
+   *  - replace this by sending general system signal to shutdown, where i.e. nsh
+   *    must issue down script (it may check whether nsh is running before spawning
+   *    a new process with nsh poweroff)
+   *  - wait for some time (~0.5 second for VSN), that SDcard is flashed and synced
+   *  - call poweroff
+   * 
+   * TODO on boot:
+   *  - if external key is pressed, do not start the nsh! but wait until it is released
+   *    (to get rid of bad mounts of the sdcard etc.) this could be handled in the 
+   *    button driver immediately on system boot
+   */
+
+  board_power_off();
+  return 0;
 }
diff --git a/apps/vsn/ramtron/Kconfig b/apps/system/ramtron/Kconfig
similarity index 55%
rename from apps/vsn/ramtron/Kconfig
rename to apps/system/ramtron/Kconfig
index 14f358921c..53d547e5f1 100644
--- a/apps/vsn/ramtron/Kconfig
+++ b/apps/system/ramtron/Kconfig
@@ -3,12 +3,12 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-config VSN_RAMTRON
-	bool "NSH ramtron command"
+config SYSTEM_RAMTRON
+	bool "RAMTRON command"
 	default n
 	---help---
-		Enable support for the NSH ramtron command.
+		Enable support for the NSH RAMTRON command.
 
-if VSN_RAMTRON
+if SYSTEM_RAMTRON
 endif
 
diff --git a/apps/vsn/ramtron/Makefile b/apps/system/ramtron/Makefile
similarity index 99%
rename from apps/vsn/ramtron/Makefile
rename to apps/system/ramtron/Makefile
index d930aa92cf..030ef6d5c4 100644
--- a/apps/vsn/ramtron/Makefile
+++ b/apps/system/ramtron/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# Makefile
+# apps/system/ramtron/Makefile
 #
 #   Copyright (C) 2011 Uros Platise. All rights reserved.
 #   Author: Uros Platise <uros.platise@isotel.eu>
diff --git a/apps/vsn/ramtron/README.txt b/apps/system/ramtron/README.txt
similarity index 100%
rename from apps/vsn/ramtron/README.txt
rename to apps/system/ramtron/README.txt
diff --git a/apps/vsn/ramtron/ramtron.c b/apps/system/ramtron/ramtron.c
similarity index 92%
rename from apps/vsn/ramtron/ramtron.c
rename to apps/system/ramtron/ramtron.c
index f1e8db100c..cd4012787a 100644
--- a/apps/vsn/ramtron/ramtron.c
+++ b/apps/system/ramtron/ramtron.c
@@ -63,6 +63,7 @@ int ramtron_start(int spino)
       printf("RAMTRON: Failed to initialize SPI%d\n", spino);
       return -ENODEV;
     }
+
   printf("RAMTRON: Initialized SPI%d\n", spino);
 
   mtd = (struct mtd_dev_s *)ramtron_initialize(spi);
@@ -71,7 +72,8 @@ int ramtron_start(int spino)
       printf("RAMTRON: Device not found\n");
       return -ENODEV;
     }
-  printf("RAMTRON: FM25V10 of size 128 kB\n");
+
+    printf("RAMTRON: FM25V10 of size 128 kB\n");
   //printf("RAMTRON: %s of size %d B\n", ramtron_getpart(mtd), ramtron_getsize(mtd) );
 
   retval = ftl_initialize(0, mtd);
@@ -85,15 +87,18 @@ int ramtron_main(int argc, char *argv[])
 {
   int spino;
   
-  if (argc == 3) {
-    spino = atoi(argv[2]);
+  if (argc == 3)
+    {
+      spino = atoi(argv[2]);
     
-    if (!strcmp(argv[1], "start")) {
-      return ramtron_start(spino);
+      if (!strcmp(argv[1], "start"))
+        {
+        return ramtron_start(spino);
+        }
     }
-  }
   
-  // todo: write protect  
+  /* todo: write protect */
+
   printf("%s: <start> <spino>\n", argv[0]);
   return -1;
 }
diff --git a/apps/vsn/sdcard/Kconfig b/apps/system/sdcard/Kconfig
similarity index 84%
rename from apps/vsn/sdcard/Kconfig
rename to apps/system/sdcard/Kconfig
index 8e6c13264e..a1a8a1f324 100644
--- a/apps/vsn/sdcard/Kconfig
+++ b/apps/system/sdcard/Kconfig
@@ -3,12 +3,12 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-config VSN_SDCARD
+config SYSTEM_SDCARD
 	bool "NSH sdcard command"
 	default n
 	---help---
 		Enable support for the NSH sdcard command.
 
-if VSN_SDCARD
+if SYSTEM_SDCARD
 endif
 
diff --git a/apps/vsn/sdcard/Makefile b/apps/system/sdcard/Makefile
similarity index 99%
rename from apps/vsn/sdcard/Makefile
rename to apps/system/sdcard/Makefile
index 213021b257..fef049a59b 100644
--- a/apps/vsn/sdcard/Makefile
+++ b/apps/system/sdcard/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# Makefile
+# apps/system/sdcard/Makefile
 #
 #   Copyright (C) 2011 Uros Platise. All rights reserved.
 #   Author: Uros Platise <uros.platise@isotel.eu>
diff --git a/apps/vsn/sdcard/README.txt b/apps/system/sdcard/README.txt
similarity index 100%
rename from apps/vsn/sdcard/README.txt
rename to apps/system/sdcard/README.txt
diff --git a/apps/vsn/sdcard/sdcard.c b/apps/system/sdcard/sdcard.c
similarity index 65%
rename from apps/vsn/sdcard/sdcard.c
rename to apps/system/sdcard/sdcard.c
index a81e8432af..56ab74f445 100644
--- a/apps/vsn/sdcard/sdcard.c
+++ b/apps/system/sdcard/sdcard.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sdcard/sdcard.c
+ * apps/system/sdcard/sdcard.c
  *
  *   Copyright (C) 2011 Uros Platise. All rights reserved.
  *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
@@ -36,6 +36,10 @@
  *
  ****************************************************************************/
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
 #include <nuttx/config.h>
 
 #include <stdlib.h>
@@ -48,15 +52,23 @@
 #  include <nuttx/mmcsd.h>
 #endif
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
 FAR struct sdio_dev_s *sdio_initialize(int slotno);
 void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot);
 
 // TODO get the structure out from the slot number
 static FAR struct sdio_dev_s *sdio = NULL;
 
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
 /* Create device device for the SDIO-based MMC/SD block driver */
 
-int sdcard_start(int slotno)
+static int sdcard_start(int slotno)
 {
   int ret;
 
@@ -68,6 +80,7 @@ int sdcard_start(int slotno)
       printf("SDIO: Failed to initialize slot %d\n", slotno);
       return -ENODEV;
     }
+
   printf("SDIO: Initialized slot %d\n", slotno);
 
   /* Now bind the SPI interface to the MMC/SD driver */
@@ -78,57 +91,71 @@ int sdcard_start(int slotno)
       printf("SDIO: Failed to bind to the MMC/SD driver: %d\n", ret);
       return ret;
     }
+
   printf("SDIO: Successfully bound to the MMC/SD driver\n");
-  
+
   /* Then let's guess and say that there is a card in the slot.  I need to check to
    * see if the VSN board supports a GPIO to detect if there is a card in
    * the slot.
    */
   sdio_mediachange(sdio, true);
-  
+
   return OK;
 }
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
 int sdcard_main(int argc, char *argv[])
 {
-    int slotno = 0;
-  
-    if (argc >= 2) {
-    
-        /* The 3rd argument is expected to be a slot number, if given */
-        if (argc==3)
-            slotno = atoi(argv[2]);
-    
-        /* Commands */
-    
-        if (!strcmp(argv[1], "start")) {
-            return sdcard_start(slotno);
+  int slotno = 0;
+
+  if (argc >= 2) {
+
+      /* The 3rd argument is expected to be a slot number, if given */
+
+      if (argc==3)
+        {
+          slotno = atoi(argv[2]);
         }
-        else if (!strcmp(argv[1], "stop")) {
-            fprintf(stderr, "Not implemented yet\n");
+
+      /* Commands */
+
+      if (!strcmp(argv[1], "start"))
+        {
+          return sdcard_start(slotno);
         }
-        else if (!strcmp(argv[1], "insert")) {
-            if (sdio) {
-                sdio_mediachange(sdio, true);
-                return OK;
+      else if (!strcmp(argv[1], "stop"))
+        {
+          fprintf(stderr, "Not implemented yet\n");
+        }
+      else if (!strcmp(argv[1], "insert"))
+        {
+          if (sdio)
+            {
+              sdio_mediachange(sdio, true);
+              return OK;
             }
         }
-        else if (!strcmp(argv[1], "eject")) {
-            if (sdio) {
-                sdio_mediachange(sdio, false);
-                return OK;
+      else if (!strcmp(argv[1], "eject"))
+        {
+          if (sdio)
+            {
+              sdio_mediachange(sdio, false);
+              return OK;
             }
         }
-        else if (!strcmp(argv[1], "status")) {
-            printf("SDcard #%d Status:\n", slotno);
+      else if (!strcmp(argv[1], "status"))
+        {
+          printf("SDcard #%d Status:\n", slotno);
 #ifndef CONFIG_MMCSD_HAVECARDDETECT
-            printf("\t - Without SDcard detect capability\n");
+          printf("\t - Without SDcard detect capability\n");
 #endif
-            return 0;
+          return 0;
         }
     }
-  
-    printf("%s: <start|stop|insert|eject|status> {slotno}\n", argv[0]);
-    return -1;
+
+  printf("%s: <start|stop|insert|eject|status> {slotno}\n", argv[0]);
+  return -1;
 }
diff --git a/apps/vsn/sysinfo/Kconfig b/apps/system/sysinfo/Kconfig
similarity index 84%
rename from apps/vsn/sysinfo/Kconfig
rename to apps/system/sysinfo/Kconfig
index 38e0f16bec..1f106dc8a9 100644
--- a/apps/vsn/sysinfo/Kconfig
+++ b/apps/system/sysinfo/Kconfig
@@ -3,12 +3,11 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-config VSN_SYSINFO
+config SYSTEM_SYSINFO
 	bool "NSH sysinfo command"
 	default n
 	---help---
 		Enable support for the NSH sysinfo command.
 
-if VSN_SYSINFO
+if SYSTEM_SYSINFO
 endif
-
diff --git a/apps/vsn/sysinfo/Makefile b/apps/system/sysinfo/Makefile
similarity index 99%
rename from apps/vsn/sysinfo/Makefile
rename to apps/system/sysinfo/Makefile
index b4afc8a97f..ead9742779 100644
--- a/apps/vsn/sysinfo/Makefile
+++ b/apps/system/sysinfo/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# Makefile
+# apps/system/sysinfo/Makefile
 #
 #   Copyright (C) 2011 Uros Platise. All rights reserved.
 #   Author: Uros Platise <uros.platise@isotel.eu>
diff --git a/apps/vsn/sysinfo/README.txt b/apps/system/sysinfo/README.txt
similarity index 100%
rename from apps/vsn/sysinfo/README.txt
rename to apps/system/sysinfo/README.txt
diff --git a/apps/vsn/sysinfo/sysinfo.c b/apps/system/sysinfo/sysinfo.c
similarity index 75%
rename from apps/vsn/sysinfo/sysinfo.c
rename to apps/system/sysinfo/sysinfo.c
index 8625f9db71..019e910dba 100644
--- a/apps/vsn/sysinfo/sysinfo.c
+++ b/apps/system/sysinfo/sysinfo.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sysinfo/sysinfo.c
+ * apps/system/sysinfo/sysinfo.c
  *
  *   Copyright (C) 2011 Uros Platise. All rights reserved.
  *   Author: Uros Platise <uros.platise@isotel.eu>
@@ -32,18 +32,17 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  ****************************************************************************/
- 
-/** \file
- *  \brief System Information
- *  \author Uros Platise
- * 
- * Collects and reports system information.
- * 
- * \todo Gather information also from low-level devices, kernel/sched, clock,
- *   and further reporting as: sysinfo rtc, or sysinfo sched, ... with 
- *   sysinfo help to report all of the options.
+
+/* Collects and reports system information.
  *
- **/
+ * TODO: Gather information also from low-level devices, kernel/sched, clock,
+ *   and further reporting as: sysinfo rtc, or sysinfo sched, ... with
+ *   sysinfo help to report all of the options.
+ */
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <nuttx/config.h>
 #include <nuttx/version.h>
@@ -52,18 +51,19 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
 int sysinfo_main(int argc, char *argv[])
 {
-	printf("System Information:\n");
-    
-    printf("\tNuttX Version:\t" CONFIG_VERSION_STRING " Build: %d\n", CONFIG_VERSION_BUILD);
-    
-    printf("\tSystem Time:\t%d [s] UTC "
+  printf("System Information:\n");
+  printf("\tNuttX Version:\t" CONFIG_VERSION_STRING
+         " Build: %d\n", CONFIG_VERSION_BUILD);
+  printf("\tSystem Time:\t%d [s] UTC "
 #ifdef CONFIG_RTC
         "Hardware RTC Support"
 #endif
         "\n", time(NULL) );
-
-	return 0;
+  return 0;
 }
diff --git a/apps/vsn/Kconfig b/apps/vsn/Kconfig
deleted file mode 100644
index 1f0c25f167..0000000000
--- a/apps/vsn/Kconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see misc/tools/kconfig-language.txt.
-#
-
-comment "VSN board add-ons"
-
-source "$APPSDIR/vsn/poweroff/Kconfig"
-source "$APPSDIR/vsn/ramtron/Kconfig"
-source "$APPSDIR/vsn/sdcard/Kconfig"
-source "$APPSDIR/vsn/sysinfo/Kconfig"
diff --git a/apps/vsn/Make.defs b/apps/vsn/Make.defs
deleted file mode 100644
index 6d59ab8384..0000000000
--- a/apps/vsn/Make.defs
+++ /dev/null
@@ -1,51 +0,0 @@
-############################################################################
-# apps/vsn/Make.defs
-# Adds selected applications to apps/ build
-#
-#   Copyright (C) 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.
-#
-############################################################################
-
-ifeq ($(CONFIG_VSN_POWEROFF),y)
-CONFIGURED_APPS += vsn/poweroff
-endif
-
-ifeq ($(CONFIG_VSN_RAMTRON),y)
-CONFIGURED_APPS += vsn/ramtron
-endif
-
-ifeq ($(CONFIG_VSN_SDCARD),y)
-CONFIGURED_APPS += vsn/sdcard
-endif
-
-ifeq ($(CONFIG_VSN_SYSINFO),y)
-CONFIGURED_APPS += vsn/sysinfo
-endif
diff --git a/apps/vsn/Makefile b/apps/vsn/Makefile
deleted file mode 100644
index 21901d96de..0000000000
--- a/apps/vsn/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-############################################################################
-# apps/vsn/Makefile
-#
-#   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	# Current configuration
-
-# Sub-directories
-
-SUBDIRS = poweroff ramtron sdcard sysinfo
-
-all: nothing
-.PHONY: nothing context depend clean distclean
-
-nothing:
-
-.context:
-	@for dir in $(SUBDIRS) ; do \
-		$(MAKE) -C $$dir context TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"; \
-	done
-	@touch $@
-
-context: .context
-
-depend:
-	@for dir in $(SUBDIRS) ; do \
-		$(MAKE) -C $$dir depend TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"; \
-	done
-
-clean:
-	@for dir in $(SUBDIRS) ; do \
-		$(MAKE) -C $$dir clean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"; \
-	done
-
-distclean: clean
-	@for dir in $(SUBDIRS) ; do \
-		$(MAKE) -C $$dir distclean TOPDIR="$(TOPDIR)" APPDIR=$(APPDIR); \
-	done
-
--include Make.dep
-
diff --git a/apps/vsn/poweroff/Kconfig b/apps/vsn/poweroff/Kconfig
deleted file mode 100644
index d0059a0d38..0000000000
--- a/apps/vsn/poweroff/Kconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see misc/tools/kconfig-language.txt.
-#
-
-config VSN_POWEROFF
-	bool "NSH poweroff command"
-	default n
-	---help---
-		Enable support for the NSH poweroff command.
-
-if VSN_POWEROFF
-endif
-
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html
index 0370a708df..ec6a8be24d 100644
--- a/nuttx/Documentation/NuttX.html
+++ b/nuttx/Documentation/NuttX.html
@@ -497,7 +497,7 @@
   <td>
     <p>
       <li>
-        RAMDISK, pipes, FIFO, <code>/dev/null</code>, <code>/dev/zero</code>, and loop drivers.
+        RAMDISK, pipes, FIFO, <code>/dev/null</code>, <code>/dev/zero</code>, <code>/dev/random</code>, and loop drivers.
       </li>
     </p>
   </td>

From e6656c077c35341384d5474f0d7b65067b7997ec Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Thu, 4 Oct 2012 00:11:05 +0000
Subject: [PATCH 12/43] Delete the apps/vsn directory (moved commands to
 apps/system)

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5209 42af7a65-404d-4744-a932-0658087f49c3
---
 apps/system/i2c/Makefile                      |  2 +-
 apps/system/ramtron/ramtron.c                 |  2 +-
 apps/system/readline/readline.c               |  2 +-
 nuttx/Documentation/README.html               | 19 +++--
 nuttx/README.txt                              |  5 +-
 .../configs/compal_e88/nsh_highram/appconfig  |  2 +-
 .../compal_e99/nsh_compalram/appconfig        |  2 +-
 .../configs/compal_e99/nsh_highram/appconfig  |  2 +-
 nuttx/configs/fire-stm32v2/nsh/defconfig      | 39 +++++----
 nuttx/configs/shenzhou/nsh/defconfig          | 35 +++++---
 nuttx/configs/shenzhou/nxwm/defconfig         | 24 ++++--
 .../configs/stm3240g-eval/discover/defconfig  | 79 +++++++++++++++----
 nuttx/configs/stm3240g-eval/xmlrpc/defconfig  | 69 ++++++++++++----
 nuttx/configs/vsn/nsh/appconfig               | 10 +--
 14 files changed, 209 insertions(+), 83 deletions(-)

diff --git a/apps/system/i2c/Makefile b/apps/system/i2c/Makefile
index 845c149f6c..00db91bb70 100644
--- a/apps/system/i2c/Makefile
+++ b/apps/system/i2c/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/system/i2c
+# apps/system/i2c/Makefile
 #
 #   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/apps/system/ramtron/ramtron.c b/apps/system/ramtron/ramtron.c
index cd4012787a..78773649cc 100644
--- a/apps/system/ramtron/ramtron.c
+++ b/apps/system/ramtron/ramtron.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * ramtron/ramtron.c
+ * apps/system/ramtron/ramtron.c
  *
  *   Copyright (C) 2011 Uros Platise. All rights reserved.
  *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
diff --git a/apps/system/readline/readline.c b/apps/system/readline/readline.c
index ec2dc1c0a6..f64049ed73 100644
--- a/apps/system/readline/readline.c
+++ b/apps/system/readline/readline.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * lib/stdio/lib_fgets.c
+ * apps/system/readline/readline.c
  *
  *   Copyright (C) 2007-2008, 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/Documentation/README.html b/nuttx/Documentation/README.html
index 95102a004f..4d87f55a67 100644
--- a/nuttx/Documentation/README.html
+++ b/nuttx/Documentation/README.html
@@ -265,16 +265,15 @@
      |   `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/nshlib/README.txt"><b><i>README.txt</i></b></a>
      |- NxWidgets/
      |   `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/NxWidgets/README.txt"><b><i>README.txt</i></b></a>
-     |- system/
-     |       |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/i2c/README.txt"><b><i>i2c/README.txt</i></b></a>
-     |       |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/free/README.txt">free/README.txt</a>
-     |       `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/install/README.txt">install/README.txt</a>
-     `- vsn/
-         |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/vsn/poweroff/README.txt">poweroff/README.txt</a>
-         |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/vsn/ramtron/README.txt">ramtron/README.txt</a>
-         |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/vsn/sdcard/README.txt">sdcard/README.txt</a>
-         |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/vsn/sysinfo/README.txt">sysinfo/README.txt</a>
-         `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/vsn/sdcard/README.txt"><b><i>README.txt</i></b></a>
+     `- system/
+         |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/i2c/README.txt"><b><i>i2c/README.txt</i></b></a>
+         |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/free/README.txt">free/README.txt</a>
+         |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/install/README.txt">install/README.txt</a>
+         |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/poweroff/README.txt">poweroff/README.txt</a>
+         |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/ramtron/README.txt">ramtron/README.txt</a>
+         |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/sdcard/README.txt">sdcard/README.txt</a>
+         |- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/sysinfo/README.txt">sysinfo/README.txt</a>
+         `- <a href="http://svn.code.sf.net/p/nuttx/code/trunk/apps/system/sdcard/README.txt"><b><i>README.txt</i></b></a>
 </pre></ul>
 </body>
 </html>
diff --git a/nuttx/README.txt b/nuttx/README.txt
index 7477e0a245..d60da2d889 100644
--- a/nuttx/README.txt
+++ b/nuttx/README.txt
@@ -853,9 +853,8 @@ apps
  |- system/
  |   |- i2c/README.txt
  |   |- free/README.txt
- |   `- install
- |      `- README.txt
- |- vsn/
+ |   |- install
+ |   |  `- README.txt
  |   |- poweroff
  |   |  `- README.txt
  |   |- ramtron
diff --git a/nuttx/configs/compal_e88/nsh_highram/appconfig b/nuttx/configs/compal_e88/nsh_highram/appconfig
index 00921c3614..4d12335c71 100644
--- a/nuttx/configs/compal_e88/nsh_highram/appconfig
+++ b/nuttx/configs/compal_e88/nsh_highram/appconfig
@@ -40,4 +40,4 @@ CONFIGURED_APPS += nshlib
 
 # Path to example in apps/examples
 CONFIGURED_APPS += examples/hello
-CONFIGURED_APPS += vsn/poweroff
+CONFIGURED_APPS += system/poweroff
diff --git a/nuttx/configs/compal_e99/nsh_compalram/appconfig b/nuttx/configs/compal_e99/nsh_compalram/appconfig
index 8df90adb0a..e351d33666 100644
--- a/nuttx/configs/compal_e99/nsh_compalram/appconfig
+++ b/nuttx/configs/compal_e99/nsh_compalram/appconfig
@@ -40,4 +40,4 @@ CONFIGURED_APPS += examples/nsh
 
 # Path to example in apps/examples
 CONFIGURED_APPS += examples/hello
-CONFIGURED_APPS += vsn/poweroff
+CONFIGURED_APPS += system/poweroff
diff --git a/nuttx/configs/compal_e99/nsh_highram/appconfig b/nuttx/configs/compal_e99/nsh_highram/appconfig
index 241253f8cd..db5e61236d 100644
--- a/nuttx/configs/compal_e99/nsh_highram/appconfig
+++ b/nuttx/configs/compal_e99/nsh_highram/appconfig
@@ -41,7 +41,7 @@ CONFIGURED_APPS += nshlib
 
 # Path to example in apps/examples
 #CONFIGURED_APPS += examples/hello #fails not finding hello_main despite of good config
-CONFIGURED_APPS += vsn/poweroff
+CONFIGURED_APPS += system/poweroff
 CONFIGURED_APPS += examples/ostest
 CONFIGURED_APPS += examples/nxtext
 CONFIGURED_APPS += examples/nxhello
diff --git a/nuttx/configs/fire-stm32v2/nsh/defconfig b/nuttx/configs/fire-stm32v2/nsh/defconfig
index d6aaae05a2..25e782dfed 100644
--- a/nuttx/configs/fire-stm32v2/nsh/defconfig
+++ b/nuttx/configs/fire-stm32v2/nsh/defconfig
@@ -133,7 +133,6 @@ CONFIG_STM32_PWR=y
 CONFIG_STM32_SDIO=y
 CONFIG_STM32_SPI1=y
 # CONFIG_STM32_SPI2 is not set
-# CONFIG_STM32_SPI4 is not set
 # CONFIG_STM32_TIM1 is not set
 # CONFIG_STM32_TIM2 is not set
 # CONFIG_STM32_TIM3 is not set
@@ -189,11 +188,6 @@ CONFIG_SDIO_PRI=128
 CONFIG_SDIO_DMAPRIO=0x00001000
 # CONFIG_SDIO_WIDTH_D1_ONLY is not set
 
-#
-# Ethernet MAC configuration
-#
-CONFIG_STM32_PHYADDR=1
-
 #
 # USB Host Configuration
 #
@@ -496,6 +490,11 @@ CONFIG_FAT_MAXFNAME=32
 #
 # CONFIG_SYSLOG is not set
 
+#
+# Graphics Support
+#
+# CONFIG_NX is not set
+
 #
 # Memory Management
 #
@@ -974,12 +973,16 @@ CONFIG_NSH_DRIPADDR=0x0a000001
 CONFIG_NSH_NETMASK=0xffffff00
 CONFIG_NSH_NOMAC=y
 
+#
+# NxWidgets/NxWM
+#
+
 #
 # System NSH Add-Ons
 #
 
 #
-# Custom free memory command
+# Custom Free Memory Command
 #
 # CONFIG_SYSTEM_FREE is not set
 
@@ -1001,19 +1004,27 @@ CONFIG_I2CTOOL_DEFFREQ=100000
 # CONFIG_SYSTEM_INSTALL is not set
 
 #
-# readline() support
+# readline()
 #
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
 
 #
-# VSN board Add-Ons
+# Power Off
 #
+# CONFIG_SYSTEM_POWEROFF is not set
 
 #
-# VSN board add-ons
+# RAMTRON
 #
-# CONFIG_VSN_POWEROFF is not set
-# CONFIG_VSN_RAMTRON is not set
-# CONFIG_VSN_SDCARD is not set
-# CONFIG_VSN_SYSINFO is not set
+# CONFIG_SYSTEM_RAMTRON is not set
+
+#
+# SD Card
+#
+# CONFIG_SYSTEM_SDCARD is not set
+
+#
+# Sysinfo
+#
+# CONFIG_SYSTEM_SYSINFO is not set
diff --git a/nuttx/configs/shenzhou/nsh/defconfig b/nuttx/configs/shenzhou/nsh/defconfig
index 706881cc03..21b7fcf906 100644
--- a/nuttx/configs/shenzhou/nsh/defconfig
+++ b/nuttx/configs/shenzhou/nsh/defconfig
@@ -132,7 +132,7 @@ CONFIG_STM32_ETHMAC=y
 CONFIG_STM32_PWR=y
 CONFIG_STM32_SPI1=y
 # CONFIG_STM32_SPI2 is not set
-# CONFIG_STM32_SPI4 is not set
+# CONFIG_STM32_SPI3 is not set
 # CONFIG_STM32_TIM1 is not set
 # CONFIG_STM32_TIM2 is not set
 # CONFIG_STM32_TIM3 is not set
@@ -433,6 +433,11 @@ CONFIG_FAT_MAXFNAME=32
 #
 # CONFIG_SYSLOG is not set
 
+#
+# Graphics Support
+#
+# CONFIG_NX is not set
+
 #
 # Memory Management
 #
@@ -895,12 +900,16 @@ CONFIG_NSH_DRIPADDR=0x0a000001
 CONFIG_NSH_NETMASK=0xffffff00
 CONFIG_NSH_NOMAC=y
 
+#
+# NxWidgets/NxWM
+#
+
 #
 # System NSH Add-Ons
 #
 
 #
-# Custom free memory command
+# Custom Free Memory Command
 #
 # CONFIG_SYSTEM_FREE is not set
 
@@ -914,19 +923,27 @@ CONFIG_NSH_NOMAC=y
 # CONFIG_SYSTEM_INSTALL is not set
 
 #
-# readline() support
+# readline()
 #
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
 
 #
-# VSN board Add-Ons
+# Power Off
 #
+# CONFIG_SYSTEM_POWEROFF is not set
 
 #
-# VSN board add-ons
+# RAMTRON
 #
-# CONFIG_VSN_POWEROFF is not set
-# CONFIG_VSN_RAMTRON is not set
-# CONFIG_VSN_SDCARD is not set
-# CONFIG_VSN_SYSINFO is not set
+# CONFIG_SYSTEM_RAMTRON is not set
+
+#
+# SD Card
+#
+# CONFIG_SYSTEM_SDCARD is not set
+
+#
+# Sysinfo
+#
+# CONFIG_SYSTEM_SYSINFO is not set
diff --git a/nuttx/configs/shenzhou/nxwm/defconfig b/nuttx/configs/shenzhou/nxwm/defconfig
index 1b21fbd1ba..0bdc9f45c9 100644
--- a/nuttx/configs/shenzhou/nxwm/defconfig
+++ b/nuttx/configs/shenzhou/nxwm/defconfig
@@ -1159,7 +1159,7 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5
 #
 
 #
-# Custom free memory command
+# Custom Free Memory Command
 #
 # CONFIG_SYSTEM_FREE is not set
 
@@ -1173,19 +1173,27 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5
 # CONFIG_SYSTEM_INSTALL is not set
 
 #
-# readline() support
+# readline()
 #
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
 
 #
-# VSN board Add-Ons
+# Power Off
 #
+# CONFIG_SYSTEM_POWEROFF is not set
 
 #
-# VSN board add-ons
+# RAMTRON
 #
-# CONFIG_VSN_POWEROFF is not set
-# CONFIG_VSN_RAMTRON is not set
-# CONFIG_VSN_SDCARD is not set
-# CONFIG_VSN_SYSINFO is not set
+# CONFIG_SYSTEM_RAMTRON is not set
+
+#
+# SD Card
+#
+# CONFIG_SYSTEM_SDCARD is not set
+
+#
+# Sysinfo
+#
+# CONFIG_SYSTEM_SYSINFO is not set
diff --git a/nuttx/configs/stm3240g-eval/discover/defconfig b/nuttx/configs/stm3240g-eval/discover/defconfig
index 71dce1028b..12075b8915 100644
--- a/nuttx/configs/stm3240g-eval/discover/defconfig
+++ b/nuttx/configs/stm3240g-eval/discover/defconfig
@@ -36,17 +36,22 @@ CONFIG_RAW_BINARY=y
 CONFIG_DEBUG=y
 # CONFIG_DEBUG_VERBOSE is not set
 # CONFIG_DEBUG_ENABLE is not set
+
+#
+# Subsystem Debug Options
+#
 # CONFIG_DEBUG_SCHED is not set
 # CONFIG_DEBUG_MM is not set
 CONFIG_DEBUG_NET=y
-# CONFIG_DEBUG_USB is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_DEBUG_LIB is not set
 # CONFIG_DEBUG_BINFMT is not set
 # CONFIG_DEBUG_GRAPHICS is not set
+
+#
+# Driver Debug Options
+#
 # CONFIG_DEBUG_I2C is not set
-# CONFIG_DEBUG_SPI is not set
-# CONFIG_DEBUG_WATCHDOG is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 
 #
@@ -179,6 +184,7 @@ CONFIG_STM32_USART3=y
 # CONFIG_STM32_UART5 is not set
 # CONFIG_STM32_USART6 is not set
 # CONFIG_STM32_WWDG is not set
+CONFIG_STM32_I2C=y
 
 #
 # Alternate Pin Mapping
@@ -191,6 +197,15 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
 
+#
+# I2C Configuration
+#
+# CONFIG_STM32_I2C_DYNTIMEO is not set
+CONFIG_STM32_I2CTIMEOSEC=0
+CONFIG_STM32_I2CTIMEOMS=500
+CONFIG_STM32_I2CTIMEOTICKS=500
+# CONFIG_STM32_I2C_DUTY16_9 is not set
+
 #
 # Ethernet MAC configuration
 #
@@ -198,13 +213,16 @@ CONFIG_STM32_PHYADDR=1
 CONFIG_STM32_MII=y
 CONFIG_STM32_MII_MCO1=y
 # CONFIG_STM32_MII_MCO2 is not set
+# CONFIG_STM32_MII_EXTCLK is not set
 CONFIG_STM32_AUTONEG=y
 CONFIG_STM32_PHYSR=16
+# CONFIG_STM32_PHYSR_ALTCONFIG is not set
 CONFIG_STM32_PHYSR_SPEED=0x0002
 CONFIG_STM32_PHYSR_100MBPS=0x0000
 CONFIG_STM32_PHYSR_MODE=0x0004
 CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004
 # CONFIG_STM32_ETH_PTP is not set
+# CONFIG_STM32_ETHMAC_REGDEBUG is not set
 
 #
 # USB Host Configuration
@@ -223,7 +241,7 @@ CONFIG_ARCH_STACKDUMP=y
 CONFIG_DRAM_START=0x20000000
 CONFIG_DRAM_SIZE=196608
 CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
-# CONFIG_ARCH_INTERRUPTSTACK is not set
+CONFIG_ARCH_INTERRUPTSTACK=0
 
 #
 # Boot options
@@ -326,6 +344,8 @@ CONFIG_I2C_TRANSFER=y
 # CONFIG_I2C_WRITEREAD is not set
 CONFIG_I2C_POLLED=y
 # CONFIG_I2C_TRACE is not set
+CONFIG_ARCH_HAVE_I2CRESET=y
+# CONFIG_I2C_RESET is not set
 # CONFIG_SPI is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
@@ -377,6 +397,11 @@ CONFIG_USART3_2STOP=0
 # Networking Support
 #
 CONFIG_NET=y
+CONFIG_ARCH_HAVE_PHY=y
+# CONFIG_PHY_KS8721 is not set
+CONFIG_PHY_DP83848C=y
+# CONFIG_PHY_LAN8720 is not set
+# CONFIG_PHY_DM9161 is not set
 # CONFIG_NET_NOINTS is not set
 CONFIG_NET_MULTIBUFFER=y
 # CONFIG_NET_IPv6 is not set
@@ -388,7 +413,7 @@ CONFIG_NET_BUFSIZE=650
 CONFIG_NET_TCP=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_MAX_LISTENPORTS=40
-# CONFIG_NET_TCP_READAHEAD_BUFSIZE=562
+# CONFIG_NET_TCP_READAHEAD_BUFSIZE=650
 CONFIG_NET_NTCP_READAHEAD_BUFFERS=16
 CONFIG_NET_TCP_RECVDELAY=0
 CONFIG_NET_TCPBACKLOG=y
@@ -401,7 +426,7 @@ CONFIG_NET_ICMP_PING=y
 # CONFIG_NET_PINGADDRCONF is not set
 # CONFIG_NET_IGMP is not set
 CONFIG_NET_STATISTICS=y
-# CONFIG_NET_RECEIVE_WINDOW=562
+# CONFIG_NET_RECEIVE_WINDOW=650
 CONFIG_NET_ARPTAB_SIZE=16
 CONFIG_NET_ARP_IPIN=y
 
@@ -428,6 +453,11 @@ CONFIG_FAT_MAXFNAME=32
 #
 # CONFIG_SYSLOG is not set
 
+#
+# Graphics Support
+#
+# CONFIG_NX is not set
+
 #
 # Memory Management
 #
@@ -725,6 +755,10 @@ CONFIG_EXAMPLE_DISCOVER_NETMASK=0xffffff00
 #
 # CONFIG_EXAMPLES_WLAN is not set
 
+#
+# XML RPC Example
+#
+
 #
 # Interpreters
 #
@@ -815,6 +849,11 @@ CONFIG_DISCOVER_INTERFACE="eth0"
 CONFIG_DISCOVER_DEVICE_CLASS=0xff
 CONFIG_CONFIG_DISCOVER_DESCR="STM3240G-EVAL"
 
+#
+# XML-RPC library
+#
+# CONFIG_NETUTILS_XMLRPC is not set
+
 #
 # ModBus
 #
@@ -829,12 +868,16 @@ CONFIG_CONFIG_DISCOVER_DESCR="STM3240G-EVAL"
 #
 # CONFIG_NSH_LIBRARY is not set
 
+#
+# NxWidgets/NxWM
+#
+
 #
 # System NSH Add-Ons
 #
 
 #
-# Custom free memory command
+# Custom Free Memory Command
 #
 # CONFIG_SYSTEM_FREE is not set
 
@@ -849,18 +892,26 @@ CONFIG_CONFIG_DISCOVER_DESCR="STM3240G-EVAL"
 # CONFIG_SYSTEM_INSTALL is not set
 
 #
-# readline() support
+# readline()
 #
 # CONFIG_SYSTEM_READLINE is not set
 
 #
-# VSN board Add-Ons
+# Power Off
 #
+# CONFIG_SYSTEM_POWEROFF is not set
 
 #
-# VSN board add-ons
+# RAMTRON
 #
-# CONFIG_VSN_POWEROFF is not set
-# CONFIG_VSN_RAMTRON is not set
-# CONFIG_VSN_SDCARD is not set
-# CONFIG_VSN_SYSINFO is not set
+# CONFIG_SYSTEM_RAMTRON is not set
+
+#
+# SD Card
+#
+# CONFIG_SYSTEM_SDCARD is not set
+
+#
+# Sysinfo
+#
+# CONFIG_SYSTEM_SYSINFO is not set
diff --git a/nuttx/configs/stm3240g-eval/xmlrpc/defconfig b/nuttx/configs/stm3240g-eval/xmlrpc/defconfig
index cd80ea618d..c2ba860fa4 100644
--- a/nuttx/configs/stm3240g-eval/xmlrpc/defconfig
+++ b/nuttx/configs/stm3240g-eval/xmlrpc/defconfig
@@ -36,17 +36,22 @@ CONFIG_RAW_BINARY=y
 CONFIG_DEBUG=y
 # CONFIG_DEBUG_VERBOSE is not set
 # CONFIG_DEBUG_ENABLE is not set
+
+#
+# Subsystem Debug Options
+#
 # CONFIG_DEBUG_SCHED is not set
 # CONFIG_DEBUG_MM is not set
 CONFIG_DEBUG_NET=y
-# CONFIG_DEBUG_USB is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_DEBUG_LIB is not set
 # CONFIG_DEBUG_BINFMT is not set
 # CONFIG_DEBUG_GRAPHICS is not set
+
+#
+# Driver Debug Options
+#
 # CONFIG_DEBUG_I2C is not set
-# CONFIG_DEBUG_SPI is not set
-# CONFIG_DEBUG_WATCHDOG is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 
 #
@@ -179,6 +184,7 @@ CONFIG_STM32_USART3=y
 # CONFIG_STM32_UART5 is not set
 # CONFIG_STM32_USART6 is not set
 # CONFIG_STM32_WWDG is not set
+CONFIG_STM32_I2C=y
 
 #
 # Alternate Pin Mapping
@@ -191,6 +197,15 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
 
+#
+# I2C Configuration
+#
+# CONFIG_STM32_I2C_DYNTIMEO is not set
+CONFIG_STM32_I2CTIMEOSEC=0
+CONFIG_STM32_I2CTIMEOMS=500
+CONFIG_STM32_I2CTIMEOTICKS=500
+# CONFIG_STM32_I2C_DUTY16_9 is not set
+
 #
 # Ethernet MAC configuration
 #
@@ -201,11 +216,13 @@ CONFIG_STM32_MII_MCO1=y
 # CONFIG_STM32_MII_EXTCLK is not set
 CONFIG_STM32_AUTONEG=y
 CONFIG_STM32_PHYSR=16
+# CONFIG_STM32_PHYSR_ALTCONFIG is not set
 CONFIG_STM32_PHYSR_SPEED=0x0002
 CONFIG_STM32_PHYSR_100MBPS=0x0000
 CONFIG_STM32_PHYSR_MODE=0x0004
 CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004
 # CONFIG_STM32_ETH_PTP is not set
+# CONFIG_STM32_ETHMAC_REGDEBUG is not set
 
 #
 # USB Host Configuration
@@ -224,7 +241,7 @@ CONFIG_ARCH_STACKDUMP=y
 CONFIG_DRAM_START=0x20000000
 CONFIG_DRAM_SIZE=196608
 CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
-# CONFIG_ARCH_INTERRUPTSTACK is not set
+CONFIG_ARCH_INTERRUPTSTACK=0
 
 #
 # Boot options
@@ -319,6 +336,8 @@ CONFIG_I2C_TRANSFER=y
 # CONFIG_I2C_WRITEREAD is not set
 CONFIG_I2C_POLLED=y
 # CONFIG_I2C_TRACE is not set
+CONFIG_ARCH_HAVE_I2CRESET=y
+# CONFIG_I2C_RESET is not set
 # CONFIG_SPI is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
@@ -371,6 +390,11 @@ CONFIG_USART3_2STOP=0
 # Networking Support
 #
 CONFIG_NET=y
+CONFIG_ARCH_HAVE_PHY=y
+# CONFIG_PHY_KS8721 is not set
+CONFIG_PHY_DP83848C=y
+# CONFIG_PHY_LAN8720 is not set
+# CONFIG_PHY_DM9161 is not set
 # CONFIG_NET_NOINTS is not set
 CONFIG_NET_MULTIBUFFER=y
 # CONFIG_NET_IPv6 is not set
@@ -382,7 +406,7 @@ CONFIG_NET_BUFSIZE=650
 CONFIG_NET_TCP=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_MAX_LISTENPORTS=40
-# CONFIG_NET_TCP_READAHEAD_BUFSIZE=562
+# CONFIG_NET_TCP_READAHEAD_BUFSIZE=650
 CONFIG_NET_NTCP_READAHEAD_BUFFERS=16
 CONFIG_NET_TCP_RECVDELAY=0
 CONFIG_NET_TCPBACKLOG=y
@@ -395,7 +419,7 @@ CONFIG_NET_ICMP_PING=y
 # CONFIG_NET_PINGADDRCONF is not set
 # CONFIG_NET_IGMP is not set
 CONFIG_NET_STATISTICS=y
-# CONFIG_NET_RECEIVE_WINDOW=562
+# CONFIG_NET_RECEIVE_WINDOW=650
 CONFIG_NET_ARPTAB_SIZE=16
 CONFIG_NET_ARP_IPIN=y
 
@@ -422,6 +446,11 @@ CONFIG_FAT_MAXFNAME=32
 #
 # CONFIG_SYSLOG is not set
 
+#
+# Graphics Support
+#
+# CONFIG_NX is not set
+
 #
 # Memory Management
 #
@@ -829,12 +858,16 @@ CONFIG_XMLRPC_STRINGSIZE=64
 #
 # CONFIG_NSH_LIBRARY is not set
 
+#
+# NxWidgets/NxWM
+#
+
 #
 # System NSH Add-Ons
 #
 
 #
-# Custom free memory command
+# Custom Free Memory Command
 #
 # CONFIG_SYSTEM_FREE is not set
 
@@ -849,18 +882,26 @@ CONFIG_XMLRPC_STRINGSIZE=64
 # CONFIG_SYSTEM_INSTALL is not set
 
 #
-# readline() support
+# readline()
 #
 # CONFIG_SYSTEM_READLINE is not set
 
 #
-# VSN board Add-Ons
+# Power Off
 #
+# CONFIG_SYSTEM_POWEROFF is not set
 
 #
-# VSN board add-ons
+# RAMTRON
 #
-# CONFIG_VSN_POWEROFF is not set
-# CONFIG_VSN_RAMTRON is not set
-# CONFIG_VSN_SDCARD is not set
-# CONFIG_VSN_SYSINFO is not set
+# CONFIG_SYSTEM_RAMTRON is not set
+
+#
+# SD Card
+#
+# CONFIG_SYSTEM_SDCARD is not set
+
+#
+# Sysinfo
+#
+# CONFIG_SYSTEM_SYSINFO is not set
diff --git a/nuttx/configs/vsn/nsh/appconfig b/nuttx/configs/vsn/nsh/appconfig
index a070590790..9b1e72bd44 100755
--- a/nuttx/configs/vsn/nsh/appconfig
+++ b/nuttx/configs/vsn/nsh/appconfig
@@ -53,19 +53,19 @@ CONFIGURED_APPS += nshlib
 # Individual selection of built-in applications:
 
 # Provide poweroff command to switch off the board
-CONFIGURED_APPS += vsn/poweroff
+CONFIGURED_APPS += system/poweroff
 
 # Provide SDcard tool
-CONFIGURED_APPS += vsn/sdcard
+CONFIGURED_APPS += system/sdcard
 
 # Provide RAMTRON tool
-CONFIGURED_APPS += vsn/ramtron
+CONFIGURED_APPS += system/ramtron
 
 # Provide System Information Utilityu
-CONFIGURED_APPS += vsn/sysinfo
+CONFIGURED_APPS += system/sysinfo
 
 # Provide JAVA Virtual Machine (the Darjeeling JVM)
-#CONFIGURED_APPS += vsn/jvm
+#CONFIGURED_APPS += system/jvm
 
 # Provide UNIX style free
 CONFIGURED_APPS += system/free

From b0eb4f3ccee248a2f70fab8ab1972ad4907a9e22 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Thu, 4 Oct 2012 15:07:06 +0000
Subject: [PATCH 13/43] Change order of includes in apps/Makefile; add clock
 frequencies to shenzhou, fire, and olimex-stm32 board.h files

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5210 42af7a65-404d-4744-a932-0658087f49c3
---
 apps/ChangeLog.txt                              |  5 +++++
 apps/Makefile                                   |  6 ++++--
 nuttx/ChangeLog                                 |  3 +++
 nuttx/arch/arm/src/stm32/stm32_eth.c            |  2 +-
 nuttx/configs/fire-stm32v2/include/board.h      | 11 ++++++++++-
 nuttx/configs/olimex-stm32-p107/include/board.h | 11 ++++++++++-
 nuttx/configs/shenzhou/include/board.h          | 11 ++++++++++-
 7 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index 2d7b2eb9f5..0e63d183eb 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -353,3 +353,8 @@
 
 	* vsn: Moved all NSH commands from vsn/ to system/.  Deleted the vsn/
 	  directory.
+	* Makefile:  Change order of includes when CONFIG_NEWCONFIG=y.  In
+	  that case, namedapp must be included first so that the namedapp
+	  context is established first.  If the namedapp context is established
+	  later, it will overwrite any existing namedapp_list.h and nameapp_proto.h
+	  files.
diff --git a/apps/Makefile b/apps/Makefile
index d2b0ecdab5..e407e2de87 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -46,7 +46,7 @@ APPDIR = ${shell pwd}
 #   appears in this directory as .config)
 # SUBDIRS is the list of all directories containing Makefiles.  It is used
 #   only for cleaning. namedapp must always be the first in the list.  This
-#   list can be extended by the .config file as well
+#   list can be extended by the .config file as well.
 
 CONFIGURED_APPS =
 SUBDIRS = examples graphics interpreters modbus namedapp nshlib netutils system
@@ -70,11 +70,13 @@ SUBDIRS = examples graphics interpreters modbus namedapp nshlib netutils system
 
 ifeq ($(CONFIG_NUTTX_NEWCONFIG),y)
 
+# namedapp/Make.defs must be included first
+
+include namedapp/Make.defs
 include examples/Make.defs
 include graphics/Make.defs
 include interpreters/Make.defs
 include modbus/Make.defs
-include namedapp/Make.defs
 include netutils/Make.defs
 include nshlib/Make.defs
 include system/Make.defs
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 55a06aeecd..4ea03f34f8 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3458,3 +3458,6 @@
 	* arch/arm/src/stm32/stm32_rng.c, chip/stm32_rng.h, and other files:
 	  Implementation of /dev/random using the STM32 Random Number
 	  Generator (RNG).
+	* board.h file for shenzhou, fire-stm32v2, and olimex-stm32-p107:
+	  Add frequencies for HSE, HSI, LSE, and LSI.  These are needed
+	  by the STM32 watchdog driver.
diff --git a/nuttx/arch/arm/src/stm32/stm32_eth.c b/nuttx/arch/arm/src/stm32/stm32_eth.c
index 81345fabf2..13f02679fd 100644
--- a/nuttx/arch/arm/src/stm32/stm32_eth.c
+++ b/nuttx/arch/arm/src/stm32/stm32_eth.c
@@ -1956,7 +1956,7 @@ static void stm32_polltimer(int argc, uint32_t arg, ...)
   /* Check if the next TX descriptor is owned by the Ethernet DMA or CPU.  We
    * cannot perform the timer poll if we are unable to accept another packet
    * for transmission.  Hmmm.. might be bug here.  Does this mean if there is
-   * a transmit in progress, we will missing TCP time state updates?
+   * a transmit in progress, we will miss TCP time state updates?
    *
    * In a race condition, ETH_TDES0_OWN may be cleared BUT still not available
    * because stm32_freeframe() has not yet run.  If stm32_freeframe() has run,
diff --git a/nuttx/configs/fire-stm32v2/include/board.h b/nuttx/configs/fire-stm32v2/include/board.h
index 9a5d309ab6..acd70933a2 100644
--- a/nuttx/configs/fire-stm32v2/include/board.h
+++ b/nuttx/configs/fire-stm32v2/include/board.h
@@ -55,10 +55,19 @@
 
 /* Clocking *************************************************************************/
 
-/* On-board crystal frequency is 8MHz (HSE) */
+/* HSI - 8 MHz RC factory-trimmed
+ * LSI - 40 KHz RC (30-60KHz, uncalibrated)
+ * HSE - On-board crystal frequency is 8MHz
+ * LSE - 32.768 kHz crytal
+ */
 
 #define STM32_BOARD_XTAL        8000000ul
 
+#define STM32_HSI_FREQUENCY     8000000ul
+#define STM32_LSI_FREQUENCY     40000
+#define STM32_HSE_FREQUENCY     STM32_BOARD_XTAL
+#define STM32_LSE_FREQUENCY     32768
+
 /* PLL source is HSE/1, PLL multipler is 9: PLL frequency is 8MHz (XTAL) x 9 = 72MHz */
 
 #define STM32_CFGR_PLLSRC       RCC_CFGR_PLLSRC
diff --git a/nuttx/configs/olimex-stm32-p107/include/board.h b/nuttx/configs/olimex-stm32-p107/include/board.h
index ce0c82472f..96051e25c2 100644
--- a/nuttx/configs/olimex-stm32-p107/include/board.h
+++ b/nuttx/configs/olimex-stm32-p107/include/board.h
@@ -55,10 +55,19 @@
 
 /* Clocking *************************************************************************/
 
-/* On-board crystal frequency is 25MHz (HSE) */
+/* HSI - 8 MHz RC factory-trimmed
+ * LSI - 40 KHz RC (30-60KHz, uncalibrated)
+ * HSE - On-board crystal frequency is 25MHz
+ * LSE - 32.768 kHz
+ */
 
 #define STM32_BOARD_XTAL        25000000ul
 
+#define STM32_HSI_FREQUENCY     8000000ul
+#define STM32_LSI_FREQUENCY     40000
+#define STM32_HSE_FREQUENCY     STM32_BOARD_XTAL
+#define STM32_LSE_FREQUENCY     32768
+
 /* PLL ouput is 72MHz */
 
 #define STM32_PLL_PREDIV2       RCC_CFGR2_PREDIV2d5   /* 25MHz / 5 => 5MHz */
diff --git a/nuttx/configs/shenzhou/include/board.h b/nuttx/configs/shenzhou/include/board.h
index c105d4ab5e..2897ac2198 100644
--- a/nuttx/configs/shenzhou/include/board.h
+++ b/nuttx/configs/shenzhou/include/board.h
@@ -55,10 +55,19 @@
 
 /* Clocking *************************************************************************/
 
-/* On-board crystal frequency is 25MHz (HSE) */
+/* HSI - 8 MHz RC factory-trimmed
+ * LSI - 40 KHz RC (30-60KHz, uncalibrated)
+ * HSE - On-board crystal frequency is 25MHz
+ * LSE - 32.768 kHz
+ */
 
 #define STM32_BOARD_XTAL        25000000ul
 
+#define STM32_HSI_FREQUENCY     8000000ul
+#define STM32_LSI_FREQUENCY     40000
+#define STM32_HSE_FREQUENCY     STM32_BOARD_XTAL
+#define STM32_LSE_FREQUENCY     32768
+
 /* PLL ouput is 72MHz */
 
 #define STM32_PLL_PREDIV2       RCC_CFGR2_PREDIV2d5   /* 25MHz / 5 => 5MHz */

From 44a18f5361f2cd78d5f71584869cd087ab3dabf7 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Thu, 4 Oct 2012 17:36:07 +0000
Subject: [PATCH 14/43] Change all occurrences of CONFIG_EXAMPLE_ to
 CONFIG_EXAMPLES_ for consistency; fleshed out a few more Kconfig files

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5211 42af7a65-404d-4744-a932-0658087f49c3
---
 apps/ChangeLog.txt                            |   4 +
 apps/examples/Make.defs                       |   2 +-
 apps/examples/README.txt                      | 110 +++++++++---------
 apps/examples/adc/Kconfig                     |  24 ++++
 apps/examples/adc/adc_main.c                  |  14 ++-
 apps/examples/buttons/buttons_main.c          |  88 +++++++-------
 apps/examples/dhcpd/target.c                  |  22 ++--
 apps/examples/discover/Kconfig                |  22 ++--
 apps/examples/discover/discover_main.c        |  22 ++--
 apps/examples/ftpd/ftpd.h                     |  26 ++---
 apps/examples/ftpd/ftpd_main.c                |  10 +-
 apps/examples/igmp/igmp.c                     |  16 +--
 apps/examples/nettest/Makefile                |  16 +--
 apps/examples/nettest/host.c                  |   2 +-
 apps/examples/nettest/nettest.c               |  12 +-
 apps/examples/nettest/nettest.h               |   4 +-
 apps/examples/nettest/nettest_client.c        |  14 +--
 apps/examples/nettest/nettest_server.c        |   4 +-
 apps/examples/poll/net_listener.c             |  10 +-
 apps/examples/poll/net_reader.c               |  10 +-
 apps/examples/sendmail/target.c               |  46 ++++----
 apps/examples/telnetd/shell.c                 |  10 +-
 apps/examples/telnetd/shell.h                 |  20 ++--
 apps/examples/thttpd/thttpd_main.c            |  10 +-
 apps/examples/udp/Makefile                    |  12 +-
 apps/examples/udp/host.c                      |   2 +-
 apps/examples/udp/target.c                    |   8 +-
 apps/examples/udp/udp-client.c                |   2 +-
 apps/examples/udp/udp-internal.h              |   4 +-
 apps/examples/uip/uip_main.c                  |  20 ++--
 apps/examples/wget/Kconfig                    |  24 ++++
 apps/examples/wget/target.c                   |  24 ++--
 apps/examples/wlan/wlan_main.c                |  18 +--
 nuttx/ChangeLog                               |   2 +
 nuttx/Documentation/NuttXRelated.html         |   1 +
 nuttx/arch/sim/src/up_tapdev.c                |   2 +-
 nuttx/arch/sim/src/up_wpcap.c                 |   2 +-
 nuttx/configs/amber/hello/defconfig           |  22 ++--
 nuttx/configs/avr32dev1/nsh/defconfig         |  22 ++--
 nuttx/configs/avr32dev1/ostest/defconfig      |  22 ++--
 nuttx/configs/c5471evm/httpd/defconfig        |  34 +++---
 nuttx/configs/c5471evm/nettest/defconfig      |  34 +++---
 nuttx/configs/c5471evm/nsh/defconfig          |  34 +++---
 nuttx/configs/c5471evm/ostest/defconfig       |  34 +++---
 .../configs/compal_e88/nsh_highram/defconfig  |  34 +++---
 .../compal_e99/nsh_compalram/defconfig        |  34 +++---
 .../configs/compal_e99/nsh_highram/defconfig  |  34 +++---
 nuttx/configs/demo9s12ne64/ostest/defconfig   |  22 ++--
 nuttx/configs/ea3131/nsh/defconfig            |  22 ++--
 nuttx/configs/ea3131/ostest/defconfig         |  22 ++--
 nuttx/configs/ea3131/pgnsh/defconfig          |  22 ++--
 nuttx/configs/ea3131/usbserial/defconfig      |  22 ++--
 nuttx/configs/ea3131/usbstorage/defconfig     |  22 ++--
 nuttx/configs/ea3152/ostest/defconfig         |  22 ++--
 nuttx/configs/eagle100/httpd/defconfig        |  30 ++---
 nuttx/configs/eagle100/nettest/defconfig      |  22 ++--
 nuttx/configs/eagle100/nsh/defconfig          |  22 ++--
 nuttx/configs/eagle100/nxflat/defconfig       |  22 ++--
 nuttx/configs/eagle100/ostest/defconfig       |  22 ++--
 nuttx/configs/eagle100/thttpd/defconfig       |  28 ++---
 nuttx/configs/ekk-lm3s9b96/nsh/defconfig      |  22 ++--
 nuttx/configs/ekk-lm3s9b96/ostest/defconfig   |  22 ++--
 .../configs/ez80f910200kitg/ostest/defconfig  |  32 ++---
 nuttx/configs/ez80f910200zco/dhcpd/defconfig  |  48 ++++----
 nuttx/configs/ez80f910200zco/httpd/defconfig  |  48 ++++----
 .../configs/ez80f910200zco/nettest/defconfig  |  40 +++----
 nuttx/configs/ez80f910200zco/nsh/defconfig    |  40 +++----
 nuttx/configs/ez80f910200zco/ostest/defconfig |  40 +++----
 nuttx/configs/ez80f910200zco/poll/defconfig   |  40 +++----
 nuttx/configs/fire-stm32v2/nsh/defconfig      |   2 +-
 nuttx/configs/hymini-stm32v/buttons/defconfig |  46 ++++----
 nuttx/configs/hymini-stm32v/nsh/defconfig     |  22 ++--
 nuttx/configs/hymini-stm32v/nx/defconfig      |  22 ++--
 .../configs/hymini-stm32v/usbserial/defconfig |  22 ++--
 .../hymini-stm32v/usbstorage/defconfig        |  22 ++--
 nuttx/configs/kwikstik-k40/ostest/defconfig   |  22 ++--
 nuttx/configs/lincoln60/nsh/defconfig         |  22 ++--
 nuttx/configs/lincoln60/ostest/defconfig      |  46 ++++----
 nuttx/configs/lm3s6432-s2e/nsh/defconfig      |  22 ++--
 nuttx/configs/lm3s6432-s2e/ostest/defconfig   |  22 ++--
 nuttx/configs/lm3s6965-ek/nsh/defconfig       |  22 ++--
 nuttx/configs/lm3s6965-ek/nx/defconfig        |  22 ++--
 nuttx/configs/lm3s6965-ek/ostest/defconfig    |  22 ++--
 nuttx/configs/lm3s8962-ek/nsh/defconfig       |  22 ++--
 nuttx/configs/lm3s8962-ek/nx/defconfig        |  22 ++--
 nuttx/configs/lm3s8962-ek/ostest/defconfig    |  22 ++--
 nuttx/configs/lpc4330-xplorer/nsh/defconfig   |  32 ++---
 .../configs/lpc4330-xplorer/ostest/defconfig  |  32 ++---
 .../lpcxpresso-lpc1768/dhcpd/defconfig        |  30 ++---
 .../configs/lpcxpresso-lpc1768/nsh/defconfig  |  22 ++--
 nuttx/configs/lpcxpresso-lpc1768/nx/defconfig |  22 ++--
 .../lpcxpresso-lpc1768/ostest/defconfig       |  22 ++--
 .../lpcxpresso-lpc1768/thttpd/defconfig       |  28 ++---
 .../lpcxpresso-lpc1768/usbstorage/defconfig   |  22 ++--
 nuttx/configs/mbed/hidkbd/defconfig           |  22 ++--
 nuttx/configs/mbed/nsh/defconfig              |  22 ++--
 nuttx/configs/micropendous3/hello/defconfig   |  22 ++--
 nuttx/configs/mirtoo/nsh/defconfig            |  22 ++--
 nuttx/configs/mirtoo/nxffs/defconfig          |  22 ++--
 nuttx/configs/mirtoo/ostest/defconfig         |  22 ++--
 nuttx/configs/mx1ads/ostest/defconfig         |  22 ++--
 nuttx/configs/ne64badge/ostest/defconfig      |  22 ++--
 nuttx/configs/ntosd-dm320/nettest/defconfig   |  22 ++--
 nuttx/configs/ntosd-dm320/nsh/defconfig       |  22 ++--
 nuttx/configs/ntosd-dm320/ostest/defconfig    |  22 ++--
 nuttx/configs/ntosd-dm320/poll/defconfig      |  30 ++---
 nuttx/configs/ntosd-dm320/thttpd/defconfig    |  28 ++---
 nuttx/configs/ntosd-dm320/udp/defconfig       |  32 ++---
 nuttx/configs/ntosd-dm320/uip/defconfig       |  22 ++--
 nuttx/configs/nucleus2g/nsh/defconfig         |  22 ++--
 nuttx/configs/nucleus2g/ostest/defconfig      |  22 ++--
 nuttx/configs/nucleus2g/usbserial/defconfig   |  22 ++--
 nuttx/configs/nucleus2g/usbstorage/defconfig  |  22 ++--
 .../configs/olimex-lpc1766stk/ftpc/defconfig  |  52 ++++-----
 .../olimex-lpc1766stk/hidkbd/defconfig        |  46 ++++----
 .../olimex-lpc1766stk/nettest/defconfig       |  46 ++++----
 nuttx/configs/olimex-lpc1766stk/nsh/defconfig |  46 ++++----
 nuttx/configs/olimex-lpc1766stk/nx/defconfig  |  46 ++++----
 .../olimex-lpc1766stk/ostest/defconfig        |  46 ++++----
 .../olimex-lpc1766stk/slip-httpd/defconfig    |  52 ++++-----
 .../olimex-lpc1766stk/thttpd/defconfig        |  52 ++++-----
 .../olimex-lpc1766stk/usbserial/defconfig     |  46 ++++----
 .../olimex-lpc1766stk/usbstorage/defconfig    |  46 ++++----
 .../configs/olimex-lpc1766stk/wlan/defconfig  |  32 ++---
 nuttx/configs/olimex-stm32-p107/nsh/defconfig |  22 ++--
 .../olimex-stm32-p107/ostest/defconfig        |  22 ++--
 .../configs/olimex-strp711/nettest/defconfig  |  14 +--
 nuttx/configs/pcblogic-pic32mx/nsh/defconfig  |  22 ++--
 .../configs/pcblogic-pic32mx/ostest/defconfig |  22 ++--
 nuttx/configs/pic32-starterkit/nsh/defconfig  |  22 ++--
 nuttx/configs/pic32-starterkit/nsh2/defconfig |  22 ++--
 .../configs/pic32-starterkit/ostest/defconfig |  22 ++--
 nuttx/configs/pic32mx7mmb/nsh/defconfig       |  22 ++--
 nuttx/configs/pic32mx7mmb/ostest/defconfig    |  22 ++--
 nuttx/configs/qemu-i486/nsh/defconfig         |  22 ++--
 nuttx/configs/qemu-i486/ostest/defconfig      |  22 ++--
 nuttx/configs/rgmp/arm/default/defconfig      |  22 ++--
 nuttx/configs/rgmp/arm/nsh/defconfig          |  22 ++--
 nuttx/configs/rgmp/x86/default/defconfig      |  22 ++--
 nuttx/configs/rgmp/x86/nsh/defconfig          |  22 ++--
 nuttx/configs/sam3u-ek/knsh/defconfig         |  22 ++--
 nuttx/configs/sam3u-ek/nsh/defconfig          |  22 ++--
 nuttx/configs/sam3u-ek/nx/defconfig           |  22 ++--
 nuttx/configs/sam3u-ek/ostest/defconfig       |  22 ++--
 nuttx/configs/sam3u-ek/touchscreen/defconfig  |  22 ++--
 nuttx/configs/shenzhou/nsh/defconfig          |   2 +-
 nuttx/configs/shenzhou/nxwm/defconfig         |   2 +-
 nuttx/configs/sim/README.txt                  |   2 +-
 nuttx/configs/sim/mount/defconfig             |  22 ++--
 nuttx/configs/sim/nettest/defconfig           |  22 ++--
 nuttx/configs/sim/nsh/defconfig               |  22 ++--
 nuttx/configs/sim/nsh2/defconfig              |  22 ++--
 nuttx/configs/sim/nx/defconfig                |  22 ++--
 nuttx/configs/sim/nx11/defconfig              |  22 ++--
 nuttx/configs/sim/nxffs/defconfig             |  22 ++--
 nuttx/configs/sim/nxwm/defconfig              |  22 ++--
 nuttx/configs/sim/ostest/defconfig            |  22 ++--
 nuttx/configs/sim/pashello/defconfig          |  22 ++--
 nuttx/configs/sim/touchscreen/defconfig       |  22 ++--
 nuttx/configs/skp16c26/ostest/defconfig       |  22 ++--
 nuttx/configs/stm3210e-eval/RIDE/defconfig    |  22 ++--
 nuttx/configs/stm3210e-eval/buttons/defconfig |  46 ++++----
 .../configs/stm3210e-eval/composite/defconfig |  22 ++--
 nuttx/configs/stm3210e-eval/nsh/defconfig     |  22 ++--
 nuttx/configs/stm3210e-eval/nsh2/defconfig    |  22 ++--
 nuttx/configs/stm3210e-eval/nx/defconfig      |  22 ++--
 .../configs/stm3210e-eval/nxconsole/defconfig |  22 ++--
 nuttx/configs/stm3210e-eval/nxlines/defconfig |  22 ++--
 nuttx/configs/stm3210e-eval/nxtext/defconfig  |  22 ++--
 nuttx/configs/stm3210e-eval/ostest/defconfig  |  22 ++--
 nuttx/configs/stm3210e-eval/pm/defconfig      |  42 +++----
 .../configs/stm3210e-eval/usbserial/defconfig |  22 ++--
 .../stm3210e-eval/usbstorage/defconfig        |  22 ++--
 nuttx/configs/stm3220g-eval/README.txt        |  10 +-
 nuttx/configs/stm3220g-eval/dhcpd/defconfig   |  30 ++---
 nuttx/configs/stm3220g-eval/nettest/defconfig |  22 ++--
 nuttx/configs/stm3220g-eval/nsh/defconfig     |  22 ++--
 nuttx/configs/stm3220g-eval/nsh2/defconfig    |  22 ++--
 nuttx/configs/stm3220g-eval/nxwm/defconfig    |  22 ++--
 nuttx/configs/stm3220g-eval/ostest/defconfig  |  36 +++---
 nuttx/configs/stm3220g-eval/telnetd/defconfig |  30 ++---
 nuttx/configs/stm3240g-eval/README.txt        |  18 +--
 nuttx/configs/stm3240g-eval/dhcpd/defconfig   |  30 ++---
 .../configs/stm3240g-eval/discover/defconfig  |  10 +-
 nuttx/configs/stm3240g-eval/nettest/defconfig |  22 ++--
 nuttx/configs/stm3240g-eval/nsh/defconfig     |  22 ++--
 nuttx/configs/stm3240g-eval/nsh2/defconfig    |  22 ++--
 .../configs/stm3240g-eval/nxconsole/defconfig |  22 ++--
 nuttx/configs/stm3240g-eval/nxwm/defconfig    |  22 ++--
 nuttx/configs/stm3240g-eval/ostest/defconfig  |  36 +++---
 nuttx/configs/stm3240g-eval/telnetd/defconfig |  30 ++---
 .../configs/stm3240g-eval/webserver/defconfig |  24 ++--
 nuttx/configs/stm3240g-eval/xmlrpc/defconfig  |   2 +-
 nuttx/configs/stm32f4discovery/nsh/defconfig  |  22 ++--
 .../stm32f4discovery/nxlines/defconfig        |  22 ++--
 .../configs/stm32f4discovery/ostest/defconfig |  36 +++---
 nuttx/configs/stm32f4discovery/pm/defconfig   |  22 ++--
 nuttx/configs/sure-pic32mx/nsh/defconfig      |  22 ++--
 nuttx/configs/sure-pic32mx/ostest/defconfig   |  22 ++--
 nuttx/configs/sure-pic32mx/usbnsh/defconfig   |  22 ++--
 nuttx/configs/teensy/hello/defconfig          |  22 ++--
 nuttx/configs/teensy/nsh/defconfig            |  22 ++--
 nuttx/configs/teensy/usbstorage/defconfig     |  22 ++--
 nuttx/configs/twr-k60n512/nsh/defconfig       |  22 ++--
 nuttx/configs/twr-k60n512/ostest/defconfig    |  22 ++--
 nuttx/configs/ubw32/nsh/defconfig             |  22 ++--
 nuttx/configs/ubw32/ostest/defconfig          |  22 ++--
 nuttx/configs/vsn/nsh/defconfig               |  22 ++--
 208 files changed, 2527 insertions(+), 2464 deletions(-)

diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index 0e63d183eb..397ccdac4a 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -358,3 +358,7 @@
 	  context is established first.  If the namedapp context is established
 	  later, it will overwrite any existing namedapp_list.h and nameapp_proto.h
 	  files.
+	* CONFIG_EXAMPLES_*: To make things consistent, changed all occurrences
+	  of CONFIG_EXAMPLE_* to CONFIG_EXAMPLES_*.
+	* Kconfig:  Fleshed out apps/examples/adc/Kconfig and apps/examples/wget/Kconfig.
+	  There are still a LOT of empty, stub Kconfig files.
diff --git a/apps/examples/Make.defs b/apps/examples/Make.defs
index e6b1f3ca3a..d03b976d25 100644
--- a/apps/examples/Make.defs
+++ b/apps/examples/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_EXAMPLES_DHCPD),y)
 CONFIGURED_APPS += examples/dhcpd
 endif
 
-ifeq ($(CONFIG_EXAMPLE_DISCOVER),y)
+ifeq ($(CONFIG_EXAMPLES_DISCOVER),y)
 CONFIGURED_APPS += examples/discover
 endif
 
diff --git a/apps/examples/README.txt b/apps/examples/README.txt
index 12d6d38929..7ef51025f4 100644
--- a/apps/examples/README.txt
+++ b/apps/examples/README.txt
@@ -61,19 +61,19 @@ examples/buttons
   specific button interfaces.  Configuration options:
 
   CONFIG_ARCH_BUTTONS                - Must be defined for button support
-  CONFIG_EXAMPLE_BUTTONS_MIN         - Lowest button number (MIN=0)
-  CONFIG_EXAMPLE_BUTTONS_MAX         - Highest button number (MAX=7)
+  CONFIG_EXAMPLES_BUTTONS_MIN         - Lowest button number (MIN=0)
+  CONFIG_EXAMPLES_BUTTONS_MAX         - Highest button number (MAX=7)
 
   CONFIG_ARCH_IRQBUTTONS             - Must be defined for interrupting button support
-  CONFIG_EXAMPLE_IRQBUTTONS_MIN      - Lowest interrupting button number (MIN=0)
-  CONFIG_EXAMPLE_IRQBUTTONS_MAX      - Highest interrupting button number (MAX=7)
+  CONFIG_EXAMPLES_IRQBUTTONS_MIN      - Lowest interrupting button number (MIN=0)
+  CONFIG_EXAMPLES_IRQBUTTONS_MAX      - Highest interrupting button number (MAX=7)
 
   Name strings for buttons:
   
-    CONFIG_EXAMPLE_BUTTONS_NAME0, CONFIG_EXAMPLE_BUTTONS_NAME1,
-    CONFIG_EXAMPLE_BUTTONS_NAME2, CONFIG_EXAMPLE_BUTTONS_NAME3,
-    CONFIG_EXAMPLE_BUTTONS_NAME4, CONFIG_EXAMPLE_BUTTONS_NAME5,
-    CONFIG_EXAMPLE_BUTTONS_NAME6, CONFIG_EXAMPLE_BUTTONS_NAME7,
+    CONFIG_EXAMPLES_BUTTONS_NAME0, CONFIG_EXAMPLES_BUTTONS_NAME1,
+    CONFIG_EXAMPLES_BUTTONS_NAME2, CONFIG_EXAMPLES_BUTTONS_NAME3,
+    CONFIG_EXAMPLES_BUTTONS_NAME4, CONFIG_EXAMPLES_BUTTONS_NAME5,
+    CONFIG_EXAMPLES_BUTTONS_NAME6, CONFIG_EXAMPLES_BUTTONS_NAME7,
 
   Additional architecture-/board- specific configuration settings may also
   be required.
@@ -260,10 +260,10 @@ examples/dhcpd
                                      configuration settings)
     CONFIG_NET_BROADCAST=y         - UDP broadcast support is needed.
 
-    CONFIG_EXAMPLE_DHCPD_NOMAC     - (May be defined to use software assigned MAC)
-    CONFIG_EXAMPLE_DHCPD_IPADDR    - Target IP address
-    CONFIG_EXAMPLE_DHCPD_DRIPADDR  - Default router IP addess
-    CONFIG_EXAMPLE_DHCPD_NETMASK   - Network mask
+    CONFIG_EXAMPLES_DHCPD_NOMAC     - (May be defined to use software assigned MAC)
+    CONFIG_EXAMPLES_DHCPD_IPADDR    - Target IP address
+    CONFIG_EXAMPLES_DHCPD_DRIPADDR  - Default router IP addess
+    CONFIG_EXAMPLES_DHCPD_NETMASK   - Network mask
 
   See also CONFIG_NETUTILS_DHCPD_* settings described elsewhere
   and used in netutils/dhcpd/dhcpd.c. These settings are required
@@ -291,11 +291,11 @@ examples/discover
 
   NuttX configuration settings:
 
-    CONFIG_EXAMPLE_DISCOVER_DHCPC - DHCP Client
-    CONFIG_EXAMPLE_DISCOVER_NOMAC - Use canned MAC address
-    CONFIG_EXAMPLE_DISCOVER_IPADDR - Target IP address
-    CONFIG_EXAMPLE_DISCOVER_DRIPADDR - Router IP address
-    CONFIG_EXAMPLE_DISCOVER_NETMASK - Network Mask
+    CONFIG_EXAMPLES_DISCOVER_DHCPC - DHCP Client
+    CONFIG_EXAMPLES_DISCOVER_NOMAC - Use canned MAC address
+    CONFIG_EXAMPLES_DISCOVER_IPADDR - Target IP address
+    CONFIG_EXAMPLES_DISCOVER_DRIPADDR - Router IP address
+    CONFIG_EXAMPLES_DISCOVER_NETMASK - Network Mask
 
 examples/ftpc
 ^^^^^^^^^^^^^
@@ -367,12 +367,12 @@ examples/ftpd
   If CONFIG_EXAMPLES_FTPD_NONETINIT is not defined, then the following may
   be specified to customized the network configuration:
 
-    CONFIG_EXAMPLE_FTPD_NOMAC - If the hardware has no MAC address of its
+    CONFIG_EXAMPLES_FTPD_NOMAC - If the hardware has no MAC address of its
       own, define this =y to provide a bogus address for testing.
-    CONFIG_EXAMPLE_FTPD_IPADDR - The target IP address.  Default 10.0.0.2
-    CONFIG_EXAMPLE_FTPD_DRIPADDR - The default router address. Default
+    CONFIG_EXAMPLES_FTPD_IPADDR - The target IP address.  Default 10.0.0.2
+    CONFIG_EXAMPLES_FTPD_DRIPADDR - The default router address. Default
       10.0.0.1
-    CONFIG_EXAMPLE_FTPD_NETMASK - The network mask.  Default: 255.255.255.0
+    CONFIG_EXAMPLES_FTPD_NETMASK - The network mask.  Default: 255.255.255.0
 
   Other required configuration settings:  Of course TCP networking support
   is required.  But here are a couple that are less obvious:
@@ -465,15 +465,15 @@ examples/igmp
   does not do much of value -- Much more is needed in order to verify
   the IGMP features!
 
-  * CONFIG_EXAMPLE_IGMP_NOMAC
+  * CONFIG_EXAMPLES_IGMP_NOMAC
       Set if the hardware has no MAC address; one will be assigned
-  * CONFIG_EXAMPLE_IGMP_IPADDR
+  * CONFIG_EXAMPLES_IGMP_IPADDR
       Target board IP address
-  * CONFIG_EXAMPLE_IGMP_DRIPADDR
+  * CONFIG_EXAMPLES_IGMP_DRIPADDR
       Default router address
-  * CONFIG_EXAMPLE_IGMP_NETMASK
+  * CONFIG_EXAMPLES_IGMP_NETMASK
       Network mask
-  * CONFIG_EXAMPLE_IGMP_GRPADDR
+  * CONFIG_EXAMPLES_IGMP_GRPADDR
       Multicast group address
 
   Applications using this example will need to provide an appconfig
@@ -1023,10 +1023,10 @@ examples/poll
   CONFIG_NSOCKET_DESCRIPTORS        - Defined to be greater than 0
   CONFIG_NET_NTCP_READAHEAD_BUFFERS - Defined to be greater than zero
 
-  CONFIG_EXAMPLE_POLL_NOMAC         - (May be defined to use software assigned MAC)
-  CONFIG_EXAMPLE_POLL_IPADDR        - Target IP address
-  CONFIG_EXAMPLE_POLL_DRIPADDR      - Default router IP addess
-  CONFIG_EXAMPLE_POLL_NETMASK       - Network mask
+  CONFIG_EXAMPLES_POLL_NOMAC         - (May be defined to use software assigned MAC)
+  CONFIG_EXAMPLES_POLL_IPADDR        - Target IP address
+  CONFIG_EXAMPLES_POLL_DRIPADDR      - Default router IP addess
+  CONFIG_EXAMPLES_POLL_NETMASK       - Network mask
 
   In order to for select to work with incoming connections, you
   must also select:
@@ -1163,14 +1163,14 @@ examples/sendmail
 
  Settings unique to this example include:
 
-    CONFIG_EXAMPLE_SENDMAIL_NOMAC     - May be defined to use software assigned MAC (optional)
-    CONFIG_EXAMPLE_SENDMAIL_IPADDR    - Target IP address (required)
-    CONFIG_EXAMPLE_SENDMAIL_DRIPADDR  - Default router IP addess (required)
-    CONFIG_EXAMPLE_SENDMAILT_NETMASK  - Network mask (required)
-    CONFIG_EXAMPLE_SENDMAIL_RECIPIENT - The recipient of the email (required)
-    CONFIG_EXAMPLE_SENDMAIL_SENDER    - Optional. Default: "nuttx-testing@example.com"
-    CONFIG_EXAMPLE_SENDMAIL_SUBJECT   - Optional. Default: "Testing SMTP from NuttX"
-    CONFIG_EXAMPLE_SENDMAIL_BODY   -    Optional. Default: "Test message sent by NuttX"
+    CONFIG_EXAMPLES_SENDMAIL_NOMAC     - May be defined to use software assigned MAC (optional)
+    CONFIG_EXAMPLES_SENDMAIL_IPADDR    - Target IP address (required)
+    CONFIG_EXAMPLES_SENDMAIL_DRIPADDR  - Default router IP addess (required)
+    CONFIG_EXAMPLES_SENDMAILT_NETMASK  - Network mask (required)
+    CONFIG_EXAMPLES_SENDMAIL_RECIPIENT - The recipient of the email (required)
+    CONFIG_EXAMPLES_SENDMAIL_SENDER    - Optional. Default: "nuttx-testing@example.com"
+    CONFIG_EXAMPLES_SENDMAIL_SUBJECT   - Optional. Default: "Testing SMTP from NuttX"
+    CONFIG_EXAMPLES_SENDMAIL_BODY   -    Optional. Default: "Test message sent by NuttX"
 
   NOTE: This test has not been verified on the NuttX target environment.
   As of this writing, unit-tested in the Cygwin/Linux host environment.
@@ -1213,12 +1213,12 @@ examples/telnetd
       Default: SCHED_PRIORITY_DEFAULT
     CONFIG_EXAMPLES_TELNETD_CLIENTSTACKSIZE - Stack size allocated for the
       Telnet client. Default: 2048
-    CONFIG_EXAMPLE_TELNETD_NOMAC - If the hardware has no MAC address of its
+    CONFIG_EXAMPLES_TELNETD_NOMAC - If the hardware has no MAC address of its
       own, define this =y to provide a bogus address for testing.
-    CONFIG_EXAMPLE_TELNETD_IPADDR - The target IP address.  Default 10.0.0.2
-    CONFIG_EXAMPLE_TELNETD_DRIPADDR - The default router address. Default
+    CONFIG_EXAMPLES_TELNETD_IPADDR - The target IP address.  Default 10.0.0.2
+    CONFIG_EXAMPLES_TELNETD_DRIPADDR - The default router address. Default
       10.0.0.1
-    CONFIG_EXAMPLE_TELNETD_NETMASK - The network mask.  Default: 255.255.255.0
+    CONFIG_EXAMPLES_TELNETD_NETMASK - The network mask.  Default: 255.255.255.0
  
   The appconfig file (apps/.config) should include:
 
@@ -1240,9 +1240,9 @@ examples/thttpd
   CGI programs.  see configs/README.txt for most THTTPD settings.
   In addition to those, this example accepts:
 
-    CONFIG_EXAMPLE_THTTPD_NOMAC    - (May be defined to use software assigned MAC)
-    CONFIG_EXAMPLE_THTTPD_DRIPADDR - Default router IP addess
-    CONFIG_EXAMPLE_THTTPD_NETMASK  - Network mask
+    CONFIG_EXAMPLES_THTTPD_NOMAC    - (May be defined to use software assigned MAC)
+    CONFIG_EXAMPLES_THTTPD_DRIPADDR - Default router IP addess
+    CONFIG_EXAMPLES_THTTPD_NETMASK  - Network mask
 
   Applications using this example will need to provide an appconfig
   file in the configuration directory with instruction to build applications
@@ -1335,11 +1335,11 @@ examples/uip
   This is a port of uIP tiny webserver example application.  Settings
   specific to this example include:
 
-    CONFIG_EXAMPLE_UIP_NOMAC     - (May be defined to use software assigned MAC)
-    CONFIG_EXAMPLE_UIP_IPADDR    - Target IP address
-    CONFIG_EXAMPLE_UIP_DRIPADDR  - Default router IP addess
-    CONFIG_EXAMPLE_UIP_NETMASK   - Network mask
-    CONFIG_EXAMPLE_UIP_DHCPC     - Select to get IP address via DHCP
+    CONFIG_EXAMPLES_UIP_NOMAC     - (May be defined to use software assigned MAC)
+    CONFIG_EXAMPLES_UIP_IPADDR    - Target IP address
+    CONFIG_EXAMPLES_UIP_DRIPADDR  - Default router IP addess
+    CONFIG_EXAMPLES_UIP_NETMASK   - Network mask
+    CONFIG_EXAMPLES_UIP_DHCPC     - Select to get IP address via DHCP
 
   If you use DHCPC, then some special configuration network options are
   required.  These include:
@@ -1637,11 +1637,11 @@ examples/wget
   A simple web client example.  It will obtain a file from a server using the HTTP
   protocol.  Settings unique to this example include:
 
-    CONFIG_EXAMPLE_WGET_URL       - The URL of the file to get
-    CONFIG_EXAMPLE_WGET_NOMAC     - (May be defined to use software assigned MAC)
-    CONFIG_EXAMPLE_WGET_IPADDR    - Target IP address
-    CONFIG_EXAMPLE_WGET_DRIPADDR  - Default router IP addess
-    CONFIG_EXAMPLE_WGET_NETMASK   - Network mask
+    CONFIG_EXAMPLES_WGET_URL       - The URL of the file to get
+    CONFIG_EXAMPLES_WGET_NOMAC     - (May be defined to use software assigned MAC)
+    CONFIG_EXAMPLES_WGET_IPADDR    - Target IP address
+    CONFIG_EXAMPLES_WGET_DRIPADDR  - Default router IP addess
+    CONFIG_EXAMPLES_WGET_NETMASK   - Network mask
 
   This example uses netutils/webclient.  Additional configuration settings apply
   to that code as follows (but built-in defaults are probably OK):
diff --git a/apps/examples/adc/Kconfig b/apps/examples/adc/Kconfig
index b6dca047c7..85c875debb 100644
--- a/apps/examples/adc/Kconfig
+++ b/apps/examples/adc/Kconfig
@@ -6,8 +6,32 @@
 config EXAMPLES_ADC
 	bool "ADC example"
 	default n
+	depends on ADC
 	---help---
 		Enable the ADC example
 
 if EXAMPLES_ADC
+
+config EXAMPLES_ADC_DEVPATH
+	string "ADC device path"
+	default "/dev/adc0"
+	---help---
+		The default path to the ADC device. Default: /dev/adc0
+
+config EXAMPLES_ADC_NSAMPLES
+	int "Number of Sample Groups"
+	default 0
+	depends on !NSH_BUILTIN_APPS
+	---help---
+		If NSH_BUILTIN_APPS is defined, then the number of samples is provided
+		on the command line and this value is ignored.  Otherwise, this number
+		of samples is collected and the program terminates.  Default:  0 (samples
+		are collected indefinitely).
+
+config EXAMPLES_ADC_GROUPSIZE
+	int "Number of Samples per Group"
+	default 4
+	---help---
+		The number of samples to read at once. Default: 4
+
 endif
diff --git a/apps/examples/adc/adc_main.c b/apps/examples/adc/adc_main.c
index 4797265db0..404fba8c1f 100644
--- a/apps/examples/adc/adc_main.c
+++ b/apps/examples/adc/adc_main.c
@@ -57,6 +57,14 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
+/* Use CONFIG_EXAMPLES_ADC_NSAMPLES == 0 to mean to collect samples
+ * indefinitely.
+ */
+
+#ifndef CONFIG_EXAMPLES_ADC_NSAMPLES
+#  define CONFIG_EXAMPLES_ADC_NSAMPLES 0
+#endif
+
 /****************************************************************************
  * Private Types
  ****************************************************************************/
@@ -249,7 +257,7 @@ int adc_main(int argc, char *argv[])
 
       adc_devpath(&g_adcstate, CONFIG_EXAMPLES_ADC_DEVPATH);
 
-#ifdef CONFIG_EXAMPLES_ADC_NSAMPLES
+#if CONFIG_EXAMPLES_ADC_NSAMPLES > 0
       g_adcstate.count = CONFIG_EXAMPLES_ADC_NSAMPLES;
 #else
       g_adcstate.count = 1;
@@ -267,7 +275,7 @@ int adc_main(int argc, char *argv[])
    * samples that we collect before returning.  Otherwise, we never return
    */
 
-#if defined(CONFIG_NSH_BUILTIN_APPS) || defined(CONFIG_EXAMPLES_ADC_NSAMPLES)
+#if defined(CONFIG_NSH_BUILTIN_APPS) || CONFIG_EXAMPLES_ADC_NSAMPLES > 0
   message("adc_main: g_adcstate.count: %d\n", g_adcstate.count);
 #endif
 
@@ -290,7 +298,7 @@ int adc_main(int argc, char *argv[])
 
 #if defined(CONFIG_NSH_BUILTIN_APPS)
   for (; g_adcstate.count > 0; g_adcstate.count--)
-#elif defined(CONFIG_EXAMPLES_ADC_NSAMPLES)
+#elif CONFIG_EXAMPLES_ADC_NSAMPLES > 0
   for (g_adcstate.count = 0; g_adcstate.count < CONFIG_EXAMPLES_ADC_NSAMPLES; g_adcstate.count++)
 #else
   for (;;)
diff --git a/apps/examples/buttons/buttons_main.c b/apps/examples/buttons/buttons_main.c
index a3f6449d4f..5f25c1ef1e 100644
--- a/apps/examples/buttons/buttons_main.c
+++ b/apps/examples/buttons/buttons_main.c
@@ -61,60 +61,60 @@
 #  error "CONFIG_ARCH_BUTTONS is not defined in the configuration"
 #endif
 
-#ifndef CONFIG_EXAMPLE_BUTTONS_NAME0
-#  define CONFIG_EXAMPLE_BUTTONS_NAME0 "BUTTON0"
+#ifndef CONFIG_EXAMPLES_BUTTONS_NAME0
+#  define CONFIG_EXAMPLES_BUTTONS_NAME0 "BUTTON0"
 #endif
-#ifndef CONFIG_EXAMPLE_BUTTONS_NAME1
-#  define CONFIG_EXAMPLE_BUTTONS_NAME1 "BUTTON1"
+#ifndef CONFIG_EXAMPLES_BUTTONS_NAME1
+#  define CONFIG_EXAMPLES_BUTTONS_NAME1 "BUTTON1"
 #endif
-#ifndef CONFIG_EXAMPLE_BUTTONS_NAME2
-#  define CONFIG_EXAMPLE_BUTTONS_NAME2 "BUTTON2"
+#ifndef CONFIG_EXAMPLES_BUTTONS_NAME2
+#  define CONFIG_EXAMPLES_BUTTONS_NAME2 "BUTTON2"
 #endif
-#ifndef CONFIG_EXAMPLE_BUTTONS_NAME3
-#  define CONFIG_EXAMPLE_BUTTONS_NAME3 "BUTTON3"
+#ifndef CONFIG_EXAMPLES_BUTTONS_NAME3
+#  define CONFIG_EXAMPLES_BUTTONS_NAME3 "BUTTON3"
 #endif
-#ifndef CONFIG_EXAMPLE_BUTTONS_NAME4
-#  define CONFIG_EXAMPLE_BUTTONS_NAME4 "BUTTON4"
+#ifndef CONFIG_EXAMPLES_BUTTONS_NAME4
+#  define CONFIG_EXAMPLES_BUTTONS_NAME4 "BUTTON4"
 #endif
-#ifndef CONFIG_EXAMPLE_BUTTONS_NAME5
-#  define CONFIG_EXAMPLE_BUTTONS_NAME5 "BUTTON5"
+#ifndef CONFIG_EXAMPLES_BUTTONS_NAME5
+#  define CONFIG_EXAMPLES_BUTTONS_NAME5 "BUTTON5"
 #endif
-#ifndef CONFIG_EXAMPLE_BUTTONS_NAME6
-#  define CONFIG_EXAMPLE_BUTTONS_NAME6 "BUTTON6"
+#ifndef CONFIG_EXAMPLES_BUTTONS_NAME6
+#  define CONFIG_EXAMPLES_BUTTONS_NAME6 "BUTTON6"
 #endif
-#ifndef CONFIG_EXAMPLE_BUTTONS_NAME7
-#  define CONFIG_EXAMPLE_BUTTONS_NAME7 "BUTTON7"
+#ifndef CONFIG_EXAMPLES_BUTTONS_NAME7
+#  define CONFIG_EXAMPLES_BUTTONS_NAME7 "BUTTON7"
 #endif
 
 #define BUTTON_MIN 0
 #define BUTTON_MAX 7
 
-#ifndef CONFIG_EXAMPLE_BUTTONS_MIN
-#  define CONFIG_EXAMPLE_BUTTONS_MIN BUTTON_MIN
+#ifndef CONFIG_EXAMPLES_BUTTONS_MIN
+#  define CONFIG_EXAMPLES_BUTTONS_MIN BUTTON_MIN
 #endif
-#ifndef CONFIG_EXAMPLE_BUTTONS_MAX
-#  define CONFIG_EXAMPLE_BUTTONS_MAX BUTTON_MAX
+#ifndef CONFIG_EXAMPLES_BUTTONS_MAX
+#  define CONFIG_EXAMPLES_BUTTONS_MAX BUTTON_MAX
 #endif
 
-#if CONFIG_EXAMPLE_BUTTONS_MIN > CONFIG_EXAMPLE_BUTTONS_MAX
-#  error "CONFIG_EXAMPLE_BUTTONS_MIN > CONFIG_EXAMPLE_BUTTONS_MAX"
+#if CONFIG_EXAMPLES_BUTTONS_MIN > CONFIG_EXAMPLES_BUTTONS_MAX
+#  error "CONFIG_EXAMPLES_BUTTONS_MIN > CONFIG_EXAMPLES_BUTTONS_MAX"
 #endif
-#if CONFIG_EXAMPLE_BUTTONS_MAX > 7
-#  error "CONFIG_EXAMPLE_BUTTONS_MAX > 7"
+#if CONFIG_EXAMPLES_BUTTONS_MAX > 7
+#  error "CONFIG_EXAMPLES_BUTTONS_MAX > 7"
 #endif
 
-#ifndef CONFIG_EXAMPLE_IRQBUTTONS_MIN
-#  define CONFIG_EXAMPLE_IRQBUTTONS_MIN CONFIG_EXAMPLE_BUTTONS_MIN
+#ifndef CONFIG_EXAMPLES_IRQBUTTONS_MIN
+#  define CONFIG_EXAMPLES_IRQBUTTONS_MIN CONFIG_EXAMPLES_BUTTONS_MIN
 #endif
-#ifndef CONFIG_EXAMPLE_IRQBUTTONS_MAX
-#  define CONFIG_EXAMPLE_IRQBUTTONS_MAX CONFIG_EXAMPLE_BUTTONS_MAX
+#ifndef CONFIG_EXAMPLES_IRQBUTTONS_MAX
+#  define CONFIG_EXAMPLES_IRQBUTTONS_MAX CONFIG_EXAMPLES_BUTTONS_MAX
 #endif
 
-#if CONFIG_EXAMPLE_IRQBUTTONS_MIN > CONFIG_EXAMPLE_IRQBUTTONS_MAX
-#  error "CONFIG_EXAMPLE_IRQBUTTONS_MIN > CONFIG_EXAMPLE_IRQBUTTONS_MAX"
+#if CONFIG_EXAMPLES_IRQBUTTONS_MIN > CONFIG_EXAMPLES_IRQBUTTONS_MAX
+#  error "CONFIG_EXAMPLES_IRQBUTTONS_MIN > CONFIG_EXAMPLES_IRQBUTTONS_MAX"
 #endif
-#if CONFIG_EXAMPLE_IRQBUTTONS_MAX > 7
-#  error "CONFIG_EXAMPLE_IRQBUTTONS_MAX > 7"
+#if CONFIG_EXAMPLES_IRQBUTTONS_MAX > 7
+#  error "CONFIG_EXAMPLES_IRQBUTTONS_MAX > 7"
 #endif
 
 #ifndef MIN
@@ -124,8 +124,8 @@
 #  define MAX(a,b) (a > b ? a : b)
 #endif
 
-#define MIN_BUTTON MIN(CONFIG_EXAMPLE_BUTTONS_MIN, CONFIG_EXAMPLE_IRQBUTTONS_MIN)
-#define MAX_BUTTON MAX(CONFIG_EXAMPLE_BUTTONS_MAX, CONFIG_EXAMPLE_IRQBUTTONS_MAX)
+#define MIN_BUTTON MIN(CONFIG_EXAMPLES_BUTTONS_MIN, CONFIG_EXAMPLES_IRQBUTTONS_MIN)
+#define MAX_BUTTON MAX(CONFIG_EXAMPLES_BUTTONS_MAX, CONFIG_EXAMPLES_IRQBUTTONS_MAX)
 
 #define NUM_BUTTONS     (MAX_BUTTON - MIN_BUTTON + 1)
 #define BUTTON_INDEX(b) ((b)-MIN_BUTTON)
@@ -187,7 +187,7 @@ static const struct button_info_s g_buttoninfo[NUM_BUTTONS] =
 {
 #if MIN_BUTTON < 1
   {
-    CONFIG_EXAMPLE_BUTTONS_NAME0,
+    CONFIG_EXAMPLES_BUTTONS_NAME0,
 #ifdef CONFIG_ARCH_IRQBUTTONS
     button0_handler
 #endif
@@ -195,7 +195,7 @@ static const struct button_info_s g_buttoninfo[NUM_BUTTONS] =
 #endif
 #if MIN_BUTTON < 2 && MAX_BUTTON > 0
   {
-    CONFIG_EXAMPLE_BUTTONS_NAME1,
+    CONFIG_EXAMPLES_BUTTONS_NAME1,
 #ifdef CONFIG_ARCH_IRQBUTTONS
     button1_handler
 #endif
@@ -203,7 +203,7 @@ static const struct button_info_s g_buttoninfo[NUM_BUTTONS] =
 #endif
 #if MIN_BUTTON < 3 && MAX_BUTTON > 1
   {
-    CONFIG_EXAMPLE_BUTTONS_NAME2,
+    CONFIG_EXAMPLES_BUTTONS_NAME2,
 #ifdef CONFIG_ARCH_IRQBUTTONS
     button2_handler
 #endif
@@ -211,7 +211,7 @@ static const struct button_info_s g_buttoninfo[NUM_BUTTONS] =
 #endif
 #if MIN_BUTTON < 4 && MAX_BUTTON > 2
   {
-    CONFIG_EXAMPLE_BUTTONS_NAME3,
+    CONFIG_EXAMPLES_BUTTONS_NAME3,
 #ifdef CONFIG_ARCH_IRQBUTTONS
     button3_handler
 #endif
@@ -219,7 +219,7 @@ static const struct button_info_s g_buttoninfo[NUM_BUTTONS] =
 #endif
 #if MIN_BUTTON < 5 && MAX_BUTTON > 3
   {
-    CONFIG_EXAMPLE_BUTTONS_NAME4,
+    CONFIG_EXAMPLES_BUTTONS_NAME4,
 #ifdef CONFIG_ARCH_IRQBUTTONS
     button4_handler
 #endif
@@ -227,7 +227,7 @@ static const struct button_info_s g_buttoninfo[NUM_BUTTONS] =
 #endif
 #if MIN_BUTTON < 6 && MAX_BUTTON > 4
   {
-    CONFIG_EXAMPLE_BUTTONS_NAME5,
+    CONFIG_EXAMPLES_BUTTONS_NAME5,
 #ifdef CONFIG_ARCH_IRQBUTTONS
     button5_handler
 #endif
@@ -235,7 +235,7 @@ static const struct button_info_s g_buttoninfo[NUM_BUTTONS] =
 #endif
 #if MIN_BUTTON < 7 && MAX_BUTTON > 5
   {
-    CONFIG_EXAMPLE_BUTTONS_NAME6,
+    CONFIG_EXAMPLES_BUTTONS_NAME6,
 #ifdef CONFIG_ARCH_IRQBUTTONS
     button6_handler
 #endif
@@ -243,7 +243,7 @@ static const struct button_info_s g_buttoninfo[NUM_BUTTONS] =
 #endif
 #if MAX_BUTTON > 6
   {
-    CONFIG_EXAMPLE_BUTTONS_NAME7,
+    CONFIG_EXAMPLES_BUTTONS_NAME7,
 #ifdef CONFIG_ARCH_IRQBUTTONS
     button7_handler
 #endif
@@ -419,7 +419,7 @@ int buttons_main(int argc, char *argv[])
   /* Register to recieve button interrupts */
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-  for (i = CONFIG_EXAMPLE_IRQBUTTONS_MIN; i <= CONFIG_EXAMPLE_IRQBUTTONS_MAX; i++)
+  for (i = CONFIG_EXAMPLES_IRQBUTTONS_MIN; i <= CONFIG_EXAMPLES_IRQBUTTONS_MAX; i++)
     {
       xcpt_t oldhandler = up_irqbutton(i, g_buttoninfo[BUTTON_INDEX(i)].handler);
 
@@ -488,7 +488,7 @@ int buttons_main(int argc, char *argv[])
   /* Un-register button handlers */
 
 #if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_NSH_BUILTIN_APPS)
-  for (i = CONFIG_EXAMPLE_IRQBUTTONS_MIN; i <= CONFIG_EXAMPLE_IRQBUTTONS_MAX; i++)
+  for (i = CONFIG_EXAMPLES_IRQBUTTONS_MIN; i <= CONFIG_EXAMPLES_IRQBUTTONS_MAX; i++)
     {
       (void)up_irqbutton(i, NULL);
     }
diff --git a/apps/examples/dhcpd/target.c b/apps/examples/dhcpd/target.c
index 9c554e8cd7..37758d0417 100644
--- a/apps/examples/dhcpd/target.c
+++ b/apps/examples/dhcpd/target.c
@@ -57,16 +57,16 @@
  * but there are default values for those so we cannot check them here.
  */
 
-#ifndef CONFIG_EXAMPLE_DHCPD_IPADDR
-#  error "You must define CONFIG_EXAMPLE_DHCPD_IPADDR"
+#ifndef CONFIG_EXAMPLES_DHCPD_IPADDR
+#  error "You must define CONFIG_EXAMPLES_DHCPD_IPADDR"
 #endif
 
-#ifndef CONFIG_EXAMPLE_DHCPD_DRIPADDR
-#  error "You must define CONFIG_EXAMPLE_DHCPD_DRIPADDR"
+#ifndef CONFIG_EXAMPLES_DHCPD_DRIPADDR
+#  error "You must define CONFIG_EXAMPLES_DHCPD_DRIPADDR"
 #endif
 
-#ifndef CONFIG_EXAMPLE_DHCPD_NETMASK
-#  error "You must define CONFIG_EXAMPLE_DHCPD_NETMASK"
+#ifndef CONFIG_EXAMPLES_DHCPD_NETMASK
+#  error "You must define CONFIG_EXAMPLES_DHCPD_NETMASK"
 #endif
 
 #ifndef CONFIG_NET
@@ -92,13 +92,13 @@
 int dhcpd_main(int argc, char *argv[])
 {
   struct in_addr addr;
-#if defined(CONFIG_EXAMPLE_DHCPD_NOMAC)
+#if defined(CONFIG_EXAMPLES_DHCPD_NOMAC)
   uint8_t mac[IFHWADDRLEN];
 #endif
 
 /* Many embedded network interfaces must have a software assigned MAC */
 
-#ifdef CONFIG_EXAMPLE_DHCPD_NOMAC
+#ifdef CONFIG_EXAMPLES_DHCPD_NOMAC
   mac[0] = 0x00;
   mac[1] = 0xe0;
   mac[2] = 0xde;
@@ -110,17 +110,17 @@ int dhcpd_main(int argc, char *argv[])
 
   /* Set up our host address */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_DHCPD_IPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_DHCPD_IPADDR);
   uip_sethostaddr("eth0", &addr);
 
   /* Set up the default router address */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_DHCPD_DRIPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_DHCPD_DRIPADDR);
   uip_setdraddr("eth0", &addr);
 
   /* Setup the subnet mask */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_DHCPD_NETMASK);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_DHCPD_NETMASK);
   uip_setnetmask("eth0", &addr);
 
   /* Then start the server */
diff --git a/apps/examples/discover/Kconfig b/apps/examples/discover/Kconfig
index 0a756d91d9..1cbb7f120e 100644
--- a/apps/examples/discover/Kconfig
+++ b/apps/examples/discover/Kconfig
@@ -3,7 +3,7 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-config EXAMPLE_DISCOVER
+config EXAMPLES_DISCOVER
 	bool "UDP Discovery Example"
 	default n
 	depends on NET_UDP
@@ -17,29 +17,29 @@ config EXAMPLE_DISCOVER
 		It is also possible to address all classes with a kind of broadcast
 		discover.
 
-config EXAMPLE_DISCOVER_DHCPC
+config EXAMPLES_DISCOVER_DHCPC
 	bool "DHCP Client"
 	default n
-	depends on EXAMPLE_DISCOVER && !NSH_BUILTIN_APPS
+	depends on EXAMPLES_DISCOVER && !NSH_BUILTIN_APPS
 	select NETUTILS_DHCPC
 	select NETUTILS_RESOLV
 
-config EXAMPLE_DISCOVER_NOMAC
+config EXAMPLES_DISCOVER_NOMAC
 	bool "Use Canned MAC Address"
 	default n
-	depends on EXAMPLE_DISCOVER && !NSH_BUILTIN_APPS
+	depends on EXAMPLES_DISCOVER && !NSH_BUILTIN_APPS
 
-config EXAMPLE_DISCOVER_IPADDR
+config EXAMPLES_DISCOVER_IPADDR
 	hex "Target IP address"
 	default 0x0a000002
-	depends on EXAMPLE_DISCOVER && !NSH_BUILTIN_APPS && !EXAMPLE_DISCOVER_DHCPC
+	depends on EXAMPLES_DISCOVER && !NSH_BUILTIN_APPS && !EXAMPLES_DISCOVER_DHCPC
 
-config EXAMPLE_DISCOVER_DRIPADDR
+config EXAMPLES_DISCOVER_DRIPADDR
 	hex "Default Router IP address (Gateway)"
 	default 0x0a000001
-	depends on EXAMPLE_DISCOVER && !NSH_BUILTIN_APPS
+	depends on EXAMPLES_DISCOVER && !NSH_BUILTIN_APPS
 
-config EXAMPLE_DISCOVER_NETMASK
+config EXAMPLES_DISCOVER_NETMASK
 	hex "Network Mask"
 	default 0xffffff00
-	depends on EXAMPLE_DISCOVER && !NSH_BUILTIN_APPS
+	depends on EXAMPLES_DISCOVER && !NSH_BUILTIN_APPS
diff --git a/apps/examples/discover/discover_main.c b/apps/examples/discover/discover_main.c
index c3acb56df3..259a93d983 100644
--- a/apps/examples/discover/discover_main.c
+++ b/apps/examples/discover/discover_main.c
@@ -54,7 +54,7 @@
 #include <apps/netutils/uiplib.h>
 #include <apps/netutils/discover.h>
 
-#ifdef CONFIG_EXAMPLE_DISCOVER_DHCPC
+#ifdef CONFIG_EXAMPLES_DISCOVER_DHCPC
 #  include <arpa/inet.h>
 #endif
 
@@ -64,7 +64,7 @@
 
 /* DHCPC may be used in conjunction with any other feature (or not) */
 
-#ifdef CONFIG_EXAMPLE_DISCOVER_DHCPC
+#ifdef CONFIG_EXAMPLES_DISCOVER_DHCPC
 #  include <apps/netutils/resolv.h>
 #  include <apps/netutils/dhcpc.h>
 #endif
@@ -93,16 +93,16 @@ int discover_main(int argc, char *argv[])
 
 #ifndef CONFIG_NSH_BUILTIN_APPS
   struct in_addr addr;
-#if defined(CONFIG_EXAMPLE_DISCOVER_DHCPC) || defined(CONFIG_EXAMPLE_DISCOVER_NOMAC)
+#if defined(CONFIG_EXAMPLES_DISCOVER_DHCPC) || defined(CONFIG_EXAMPLES_DISCOVER_NOMAC)
   uint8_t mac[IFHWADDRLEN];
 #endif
-#ifdef CONFIG_EXAMPLE_DISCOVER_DHCPC
+#ifdef CONFIG_EXAMPLES_DISCOVER_DHCPC
   void *handle;
 #endif
 
 /* Many embedded network interfaces must have a software assigned MAC */
 
-#ifdef CONFIG_EXAMPLE_DISCOVER_NOMAC
+#ifdef CONFIG_EXAMPLES_DISCOVER_NOMAC
   mac[0] = 0x00;
   mac[1] = 0xe0;
   mac[2] = 0xde;
@@ -114,24 +114,24 @@ int discover_main(int argc, char *argv[])
 
   /* Set up our host address */
 
-#ifdef CONFIG_EXAMPLE_DISCOVER_DHCPC
+#ifdef CONFIG_EXAMPLES_DISCOVER_DHCPC
   addr.s_addr = 0;
 #else
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_DISCOVER_IPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_DISCOVER_IPADDR);
 #endif
   uip_sethostaddr("eth0", &addr);
 
   /* Set up the default router address */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_DISCOVER_DRIPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_DISCOVER_DRIPADDR);
   uip_setdraddr("eth0", &addr);
 
   /* Setup the subnet mask */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_DISCOVER_NETMASK);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_DISCOVER_NETMASK);
   uip_setnetmask("eth0", &addr);
 
-#ifdef CONFIG_EXAMPLE_DISCOVER_DHCPC
+#ifdef CONFIG_EXAMPLES_DISCOVER_DHCPC
   /* Set up the resolver */
 
   resolv_init();
@@ -174,7 +174,7 @@ int discover_main(int argc, char *argv[])
       printf("IP: %s\n", inet_ntoa(ds.ipaddr));
     }
 
-#endif /* CONFIG_EXAMPLE_DISCOVER_DHCPC */
+#endif /* CONFIG_EXAMPLES_DISCOVER_DHCPC */
 #endif /* CONFIG_NSH_BUILTIN_APPS */
 
   if (discover_start() < 0)
diff --git a/apps/examples/ftpd/ftpd.h b/apps/examples/ftpd/ftpd.h
index 6a439e8184..ad20bdfb1c 100644
--- a/apps/examples/ftpd/ftpd.h
+++ b/apps/examples/ftpd/ftpd.h
@@ -61,12 +61,12 @@
  * If CONFIG_EXAMPLES_FTPD_NONETINIT is not defined, then the following may
  * be specified to customized the network configuration:
  *
- * CONFIG_EXAMPLE_FTPD_NOMAC - If the hardware has no MAC address of its
+ * CONFIG_EXAMPLES_FTPD_NOMAC - If the hardware has no MAC address of its
  *   own, define this =y to provide a bogus address for testing.
- * CONFIG_EXAMPLE_FTPD_IPADDR - The target IP address.  Default 10.0.0.2
- * CONFIG_EXAMPLE_FTPD_DRIPADDR - The default router address. Default
+ * CONFIG_EXAMPLES_FTPD_IPADDR - The target IP address.  Default 10.0.0.2
+ * CONFIG_EXAMPLES_FTPD_DRIPADDR - The default router address. Default
  *   10.0.0.1
- * CONFIG_EXAMPLE_FTPD_NETMASK - The network mask.  Default: 255.255.255.0
+ * CONFIG_EXAMPLES_FTPD_NETMASK - The network mask.  Default: 255.255.255.0
  */
 
 #ifndef CONFIG_EXAMPLES_FTPD_PRIO
@@ -92,18 +92,18 @@
 #endif
 
 #ifdef CONFIG_EXAMPLES_FTPD_NONETINIT
-#  undef CONFIG_EXAMPLE_FTPD_IPADDR
-#  undef CONFIG_EXAMPLE_FTPD_DRIPADDR
-#  undef CONFIG_EXAMPLE_FTPD_NETMASK
+#  undef CONFIG_EXAMPLES_FTPD_IPADDR
+#  undef CONFIG_EXAMPLES_FTPD_DRIPADDR
+#  undef CONFIG_EXAMPLES_FTPD_NETMASK
 #else
-#  ifndef CONFIG_EXAMPLE_FTPD_IPADDR
-#    define CONFIG_EXAMPLE_FTPD_IPADDR 0x0a000002
+#  ifndef CONFIG_EXAMPLES_FTPD_IPADDR
+#    define CONFIG_EXAMPLES_FTPD_IPADDR 0x0a000002
 #  endif
-#  ifndef CONFIG_EXAMPLE_FTPD_DRIPADDR
-#    define CONFIG_EXAMPLE_FTPD_DRIPADDR 0x0a000001
+#  ifndef CONFIG_EXAMPLES_FTPD_DRIPADDR
+#    define CONFIG_EXAMPLES_FTPD_DRIPADDR 0x0a000001
 #  endif
-#  ifndef CONFIG_EXAMPLE_FTPD_NETMASK
-#    define CONFIG_EXAMPLE_FTPD_NETMASK 0xffffff00
+#  ifndef CONFIG_EXAMPLES_FTPD_NETMASK
+#    define CONFIG_EXAMPLES_FTPD_NETMASK 0xffffff00
 #  endif
 #endif
 
diff --git a/apps/examples/ftpd/ftpd_main.c b/apps/examples/ftpd/ftpd_main.c
index 6d19f952c5..1907da18cd 100644
--- a/apps/examples/ftpd/ftpd_main.c
+++ b/apps/examples/ftpd/ftpd_main.c
@@ -83,13 +83,13 @@ static void fptd_netinit(void)
 {
 #ifndef CONFIG_EXAMPLES_FTPD_NONETINIT
   struct in_addr addr;
-#ifdef CONFIG_EXAMPLE_FTPD_NOMAC
+#ifdef CONFIG_EXAMPLES_FTPD_NOMAC
   uint8_t mac[IFHWADDRLEN];
 #endif
 
 /* Many embedded network interfaces must have a software assigned MAC */
 
-#ifdef CONFIG_EXAMPLE_FTPD_NOMAC
+#ifdef CONFIG_EXAMPLES_FTPD_NOMAC
   mac[0] = 0x00;
   mac[1] = 0xe0;
   mac[2] = 0xde;
@@ -101,17 +101,17 @@ static void fptd_netinit(void)
 
   /* Set up our host address */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_FTPD_IPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_FTPD_IPADDR);
   uip_sethostaddr("eth0", &addr);
 
   /* Set up the default router address */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_FTPD_DRIPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_FTPD_DRIPADDR);
   uip_setdraddr("eth0", &addr);
 
   /* Setup the subnet mask */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_FTPD_NETMASK);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_FTPD_NETMASK);
   uip_setnetmask("eth0", &addr);
 #endif /* CONFIG_EXAMPLES_FTPD_NONETINIT */
 }
diff --git a/apps/examples/igmp/igmp.c b/apps/examples/igmp/igmp.c
index 73ca8a3e67..ebb4feb075 100644
--- a/apps/examples/igmp/igmp.c
+++ b/apps/examples/igmp/igmp.c
@@ -64,8 +64,8 @@
  *   addresses=0xff (ff00::/8.)
  */
 
-#if ((CONFIG_EXAMPLE_IGMP_GRPADDR & 0xffff0000) < 0xe0000000ul) || \
-    ((CONFIG_EXAMPLE_IGMP_GRPADDR & 0xffff0000) > 0xeffffffful)
+#if ((CONFIG_EXAMPLES_IGMP_GRPADDR & 0xffff0000) < 0xe0000000ul) || \
+    ((CONFIG_EXAMPLES_IGMP_GRPADDR & 0xffff0000) > 0xeffffffful)
 #  error "Bad range for IGMP group address"
 #endif
 
@@ -84,7 +84,7 @@
 int igmp_main(int argc, char *argv[])
 {
   struct in_addr addr;
-#if defined(CONFIG_EXAMPLE_IGMP_NOMAC)
+#if defined(CONFIG_EXAMPLES_IGMP_NOMAC)
   uint8_t mac[IFHWADDRLEN];
 #endif
 
@@ -92,7 +92,7 @@ int igmp_main(int argc, char *argv[])
   
   /* Many embedded network interfaces must have a software assigned MAC */
 
-#ifdef CONFIG_EXAMPLE_IGMP_NOMAC
+#ifdef CONFIG_EXAMPLES_IGMP_NOMAC
   mac[0] = 0x00;
   mac[1] = 0xe0;
   mac[2] = 0xde;
@@ -104,24 +104,24 @@ int igmp_main(int argc, char *argv[])
 
   /* Set up our host address */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_IGMP_IPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_IGMP_IPADDR);
   uip_sethostaddr("eth0", &addr);
 
   /* Set up the default router address */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_IGMP_DRIPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_IGMP_DRIPADDR);
   uip_setdraddr("eth0", &addr);
 
   /* Setup the subnet mask */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_IGMP_NETMASK);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_IGMP_NETMASK);
   uip_setnetmask("eth0", &addr);
 
   /* Not much of a test for now */
   /* Join the group */
 
   message("Join group...\n");
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_IGMP_GRPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_IGMP_GRPADDR);
   ipmsfilter("eth0", &addr, MCAST_INCLUDE);
 
   /* Wait a while */
diff --git a/apps/examples/nettest/Makefile b/apps/examples/nettest/Makefile
index ac07665ab1..9dd80e271b 100644
--- a/apps/examples/nettest/Makefile
+++ b/apps/examples/nettest/Makefile
@@ -43,7 +43,7 @@ TARG_ASRCS	=
 TARG_AOBJS	= $(TARG_ASRCS:.S=$(OBJEXT))
 
 TARG_CSRCS	= nettest.c
-ifeq ($(CONFIG_EXAMPLE_NETTEST_SERVER),y)
+ifeq ($(CONFIG_EXAMPLES_NETTEST_SERVER),y)
 TARG_CSRCS	+= nettest_server.c
 else
 TARG_CSRCS	+= nettest_client.c
@@ -61,19 +61,19 @@ else
   TARG_BIN	= "$(TARG_POSIX)"
 endif
 
-HOSTCFLAGS	+= -DCONFIG_EXAMPLE_NETTEST_HOST=1
-ifeq ($(CONFIG_EXAMPLE_NETTEST_SERVER),y)
-HOSTCFLAGS	+= -DCONFIG_EXAMPLE_NETTEST_SERVER=1 \
-		   -DCONFIG_EXAMPLE_NETTEST_CLIENTIP="$(CONFIG_EXAMPLE_NETTEST_CLIENTIP)"
+HOSTCFLAGS	+= -DCONFIG_EXAMPLES_NETTEST_HOST=1
+ifeq ($(CONFIG_EXAMPLES_NETTEST_SERVER),y)
+HOSTCFLAGS	+= -DCONFIG_EXAMPLES_NETTEST_SERVER=1 \
+		   -DCONFIG_EXAMPLES_NETTEST_CLIENTIP="$(CONFIG_EXAMPLES_NETTEST_CLIENTIP)"
 endif
-ifeq ($(CONFIG_EXAMPLE_NETTEST_PERFORMANCE),y)
-HOSTCFLAGS	+= -DCONFIG_EXAMPLE_NETTEST_PERFORMANCE=1
+ifeq ($(CONFIG_EXAMPLES_NETTEST_PERFORMANCE),y)
+HOSTCFLAGS	+= -DCONFIG_EXAMPLES_NETTEST_PERFORMANCE=1
 endif
 
 
 
 HOST_SRCS	= host.c
-ifeq ($(CONFIG_EXAMPLE_NETTEST_SERVER),y)
+ifeq ($(CONFIG_EXAMPLES_NETTEST_SERVER),y)
 HOST_SRCS	+= nettest_client.c
 else
 HOST_SRCS	+= nettest_server.c
diff --git a/apps/examples/nettest/host.c b/apps/examples/nettest/host.c
index 25cb854551..ad9d5e9424 100644
--- a/apps/examples/nettest/host.c
+++ b/apps/examples/nettest/host.c
@@ -53,7 +53,7 @@
 
 int main(int argc, char **argv, char **envp)
 {
-#ifdef CONFIG_EXAMPLE_NETTEST_SERVER
+#ifdef CONFIG_EXAMPLES_NETTEST_SERVER
   send_client();
 #else
   recv_server();
diff --git a/apps/examples/nettest/nettest.c b/apps/examples/nettest/nettest.c
index b95d9da623..81faf9b935 100644
--- a/apps/examples/nettest/nettest.c
+++ b/apps/examples/nettest/nettest.c
@@ -68,13 +68,13 @@
 int nettest_main(int argc, char *argv[])
 {
   struct in_addr addr;
-#ifdef CONFIG_EXAMPLE_NETTEST_NOMAC
+#ifdef CONFIG_EXAMPLES_NETTEST_NOMAC
   uint8_t mac[IFHWADDRLEN];
 #endif
 
 /* Many embedded network interfaces must have a software assigned MAC */
 
-#ifdef CONFIG_EXAMPLE_NETTEST_NOMAC
+#ifdef CONFIG_EXAMPLES_NETTEST_NOMAC
   mac[0] = 0x00;
   mac[1] = 0xe0;
   mac[2] = 0xde;
@@ -86,20 +86,20 @@ int nettest_main(int argc, char *argv[])
 
   /* Set up our host address */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_NETTEST_IPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_NETTEST_IPADDR);
   uip_sethostaddr("eth0", &addr);
 
   /* Set up the default router address */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_NETTEST_DRIPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_NETTEST_DRIPADDR);
   uip_setdraddr("eth0", &addr);
 
   /* Setup the subnet mask */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_NETTEST_NETMASK);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_NETTEST_NETMASK);
   uip_setnetmask("eth0", &addr);
 
-#ifdef CONFIG_EXAMPLE_NETTEST_SERVER
+#ifdef CONFIG_EXAMPLES_NETTEST_SERVER
   recv_server();
 #else
   send_client();
diff --git a/apps/examples/nettest/nettest.h b/apps/examples/nettest/nettest.h
index be33215cf3..f05038584d 100644
--- a/apps/examples/nettest/nettest.h
+++ b/apps/examples/nettest/nettest.h
@@ -40,7 +40,7 @@
  * Included Files
  ****************************************************************************/
 
-#ifdef CONFIG_EXAMPLE_NETTEST_HOST
+#ifdef CONFIG_EXAMPLES_NETTEST_HOST
 #else
 # include <debug.h>
 #endif
@@ -49,7 +49,7 @@
  * Definitions
  ****************************************************************************/
 
-#ifdef CONFIG_EXAMPLE_NETTEST_HOST
+#ifdef CONFIG_EXAMPLES_NETTEST_HOST
    /* HTONS/L macros are unique to uIP */
 
 #  define HTONS(a)       htons(a)
diff --git a/apps/examples/nettest/nettest_client.c b/apps/examples/nettest/nettest_client.c
index d498feb319..8ab5b14d62 100644
--- a/apps/examples/nettest/nettest_client.c
+++ b/apps/examples/nettest/nettest_client.c
@@ -56,12 +56,12 @@ void send_client(void)
 {
   struct sockaddr_in myaddr;
   char *outbuf;
-#ifndef CONFIG_EXAMPLE_NETTEST_PERFORMANCE
+#ifndef CONFIG_EXAMPLES_NETTEST_PERFORMANCE
   char *inbuf;
 #endif
   int sockfd;
   int nbytessent;
-#ifndef CONFIG_EXAMPLE_NETTEST_PERFORMANCE
+#ifndef CONFIG_EXAMPLES_NETTEST_PERFORMANCE
   int nbytesrecvd;
   int totalbytesrecvd;
 #endif
@@ -71,7 +71,7 @@ void send_client(void)
   /* Allocate buffers */
 
   outbuf = (char*)malloc(SENDSIZE);
-#ifndef CONFIG_EXAMPLE_NETTEST_PERFORMANCE
+#ifndef CONFIG_EXAMPLES_NETTEST_PERFORMANCE
   inbuf  = (char*)malloc(SENDSIZE);
   if (!outbuf || !inbuf)
 #else
@@ -98,7 +98,7 @@ void send_client(void)
 #if 0
   myaddr.sin_addr.s_addr = HTONL(INADDR_LOOPBACK);
 #else
-  myaddr.sin_addr.s_addr = HTONL(CONFIG_EXAMPLE_NETTEST_CLIENTIP);
+  myaddr.sin_addr.s_addr = HTONL(CONFIG_EXAMPLES_NETTEST_CLIENTIP);
 #endif
 
   message("client: Connecting...\n");
@@ -121,7 +121,7 @@ void send_client(void)
         }
     }
 
-#ifdef CONFIG_EXAMPLE_NETTEST_PERFORMANCE
+#ifdef CONFIG_EXAMPLES_NETTEST_PERFORMANCE
   /* Then send messages forever */
 
   for (;;)
@@ -192,7 +192,7 @@ void send_client(void)
 
   close(sockfd);
   free(outbuf);
-#ifndef CONFIG_EXAMPLE_NETTEST_PERFORMANCE
+#ifndef CONFIG_EXAMPLES_NETTEST_PERFORMANCE
   free(inbuf);
 #endif
   return;
@@ -203,7 +203,7 @@ errout_with_socket:
 
 errout_with_buffers:
   free(outbuf);
-#ifndef CONFIG_EXAMPLE_NETTEST_PERFORMANCE
+#ifndef CONFIG_EXAMPLES_NETTEST_PERFORMANCE
   free(inbuf);
 #endif
   exit(1);
diff --git a/apps/examples/nettest/nettest_server.c b/apps/examples/nettest/nettest_server.c
index 76a20e6522..5757a778a7 100644
--- a/apps/examples/nettest/nettest_server.c
+++ b/apps/examples/nettest/nettest_server.c
@@ -63,7 +63,7 @@ void recv_server(void)
   int acceptsd;
   socklen_t addrlen;
   int nbytesread;
-#ifndef CONFIG_EXAMPLE_NETTEST_PERFORMANCE
+#ifndef CONFIG_EXAMPLES_NETTEST_PERFORMANCE
   int totalbytesread;
   int nbytessent;
   int ch;
@@ -143,7 +143,7 @@ void recv_server(void)
     }
 #endif
 
-#ifdef CONFIG_EXAMPLE_NETTEST_PERFORMANCE
+#ifdef CONFIG_EXAMPLES_NETTEST_PERFORMANCE
   /* Then receive data forever */
 
   for (;;)
diff --git a/apps/examples/poll/net_listener.c b/apps/examples/poll/net_listener.c
index 81ad7cdcca..2be98673cb 100644
--- a/apps/examples/poll/net_listener.c
+++ b/apps/examples/poll/net_listener.c
@@ -290,14 +290,14 @@ static inline bool net_mksocket(struct net_listener_s *nls)
 static void net_configure(void)
 {
   struct in_addr addr;
-#if defined(CONFIG_EXAMPLE_POLL_NOMAC)
+#if defined(CONFIG_EXAMPLES_POLL_NOMAC)
   uint8_t mac[IFHWADDRLEN];
 #endif
 
   /* Configure uIP */
   /* Many embedded network interfaces must have a software assigned MAC */
 
-#ifdef CONFIG_EXAMPLE_POLL_NOMAC
+#ifdef CONFIG_EXAMPLES_POLL_NOMAC
   mac[0] = 0x00;
   mac[1] = 0xe0;
   mac[2] = 0xde;
@@ -309,17 +309,17 @@ static void net_configure(void)
 
   /* Set up our host address */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_POLL_IPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_POLL_IPADDR);
   uip_sethostaddr("eth0", &addr);
 
   /* Set up the default router address */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_POLL_DRIPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_POLL_DRIPADDR);
   uip_setdraddr("eth0", &addr);
 
   /* Setup the subnet mask */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_POLL_NETMASK);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_POLL_NETMASK);
   uip_setnetmask("eth0", &addr);
 }
 
diff --git a/apps/examples/poll/net_reader.c b/apps/examples/poll/net_reader.c
index 8a13618c37..2f23bab3c9 100644
--- a/apps/examples/poll/net_reader.c
+++ b/apps/examples/poll/net_reader.c
@@ -83,14 +83,14 @@
 static void net_configure(void)
 {
   struct in_addr addr;
-#if defined(CONFIG_EXAMPLE_POLL_NOMAC)
+#if defined(CONFIG_EXAMPLES_POLL_NOMAC)
   uint8_t mac[IFHWADDRLEN];
 #endif
 
   /* Configure uIP */
   /* Many embedded network interfaces must have a software assigned MAC */
 
-#ifdef CONFIG_EXAMPLE_POLL_NOMAC
+#ifdef CONFIG_EXAMPLES_POLL_NOMAC
   mac[0] = 0x00;
   mac[1] = 0xe0;
   mac[2] = 0xde;
@@ -102,17 +102,17 @@ static void net_configure(void)
 
   /* Set up our host address */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_POLL_IPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_POLL_IPADDR);
   uip_sethostaddr("eth0", &addr);
 
   /* Set up the default router address */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_POLL_DRIPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_POLL_DRIPADDR);
   uip_setdraddr("eth0", &addr);
 
   /* Setup the subnet mask */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_POLL_NETMASK);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_POLL_NETMASK);
   uip_setnetmask("eth0", &addr);
 }
 
diff --git a/apps/examples/sendmail/target.c b/apps/examples/sendmail/target.c
index 8440c78137..59a51f5d9b 100644
--- a/apps/examples/sendmail/target.c
+++ b/apps/examples/sendmail/target.c
@@ -52,32 +52,32 @@
  * Pre-processor Defintitions
  ****************************************************************************/
 
-#ifndef CONFIG_EXAMPLE_SENDMAIL_RECIPIENT
-#  error "You must provice CONFIG_EXAMPLE_SENDMAIL_RECIPIENT"
+#ifndef CONFIG_EXAMPLES_SENDMAIL_RECIPIENT
+#  error "You must provice CONFIG_EXAMPLES_SENDMAIL_RECIPIENT"
 #endif
 
-#ifndef CONFIG_EXAMPLE_SENDMAIL_IPADDR
-#  error "You must provice CONFIG_EXAMPLE_SENDMAIL_IPADDR"
+#ifndef CONFIG_EXAMPLES_SENDMAIL_IPADDR
+#  error "You must provice CONFIG_EXAMPLES_SENDMAIL_IPADDR"
 #endif
 
-#ifndef CONFIG_EXAMPLE_SENDMAIL_DRIPADDR
-#  error "You must provice CONFIG_EXAMPLE_SENDMAIL_DRIPADDR"
+#ifndef CONFIG_EXAMPLES_SENDMAIL_DRIPADDR
+#  error "You must provice CONFIG_EXAMPLES_SENDMAIL_DRIPADDR"
 #endif
 
-#ifndef CONFIG_EXAMPLE_SENDMAIL_NETMASK
-#  error "You must provice CONFIG_EXAMPLE_SENDMAIL_NETMASK"
+#ifndef CONFIG_EXAMPLES_SENDMAIL_NETMASK
+#  error "You must provice CONFIG_EXAMPLES_SENDMAIL_NETMASK"
 #endif
 
-#ifndef CONFIG_EXAMPLE_SENDMAIL_SENDER
-#  define CONFIG_EXAMPLE_SENDMAIL_SENDER "nuttx-testing@example.com"
+#ifndef CONFIG_EXAMPLES_SENDMAIL_SENDER
+#  define CONFIG_EXAMPLES_SENDMAIL_SENDER "nuttx-testing@example.com"
 #endif
 
-#ifndef CONFIG_EXAMPLE_SENDMAIL_SUBJECT
-#  define CONFIG_EXAMPLE_SENDMAIL_SUBJECT "Testing SMTP from NuttX"
+#ifndef CONFIG_EXAMPLES_SENDMAIL_SUBJECT
+#  define CONFIG_EXAMPLES_SENDMAIL_SUBJECT "Testing SMTP from NuttX"
 #endif
 
-#ifndef CONFIG_EXAMPLE_SENDMAIL_BODY
-#  define CONFIG_EXAMPLE_SENDMAIL_BODY "Test message sent by NuttX"
+#ifndef CONFIG_EXAMPLES_SENDMAIL_BODY
+#  define CONFIG_EXAMPLES_SENDMAIL_BODY "Test message sent by NuttX"
 #endif
 
 /****************************************************************************
@@ -85,10 +85,10 @@
  ****************************************************************************/
 
 static const char g_host_name[] = "localhost";
-static const char g_recipient[] = CONFIG_EXAMPLE_SENDMAIL_RECIPIENT;
-static const char g_sender[]    = CONFIG_EXAMPLE_SENDMAIL_SENDER;
-static const char g_subject[]   = CONFIG_EXAMPLE_SENDMAIL_SUBJECT;
-static const char g_msg_body[]  = CONFIG_EXAMPLE_SENDMAIL_BODY "\r\n";
+static const char g_recipient[] = CONFIG_EXAMPLES_SENDMAIL_RECIPIENT;
+static const char g_sender[]    = CONFIG_EXAMPLES_SENDMAIL_SENDER;
+static const char g_subject[]   = CONFIG_EXAMPLES_SENDMAIL_SUBJECT;
+static const char g_msg_body[]  = CONFIG_EXAMPLES_SENDMAIL_BODY "\r\n";
 
 /****************************************************************************
  * Private Functions
@@ -105,7 +105,7 @@ static const char g_msg_body[]  = CONFIG_EXAMPLE_SENDMAIL_BODY "\r\n";
 int sendmail_main(int argc, char *argv[])
 {
   struct in_addr addr;
-#if defined(CONFIG_EXAMPLE_SENDMAIL_NOMAC)
+#if defined(CONFIG_EXAMPLES_SENDMAIL_NOMAC)
   uint8_t mac[IFHWADDRLEN];
 #endif
   void *handle;
@@ -117,7 +117,7 @@ int sendmail_main(int argc, char *argv[])
 
 /* Many embedded network interfaces must have a software assigned MAC */
 
-#ifdef CONFIG_EXAMPLE_SENDMAIL_NOMAC
+#ifdef CONFIG_EXAMPLES_SENDMAIL_NOMAC
   mac[0] = 0x00;
   mac[1] = 0xe0;
   mac[2] = 0xde;
@@ -129,17 +129,17 @@ int sendmail_main(int argc, char *argv[])
 
   /* Set up our host address */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_SENDMAIL_IPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_SENDMAIL_IPADDR);
   uip_sethostaddr("eth0", &addr);
 
   /* Set up the default router address */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_SENDMAIL_DRIPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_SENDMAIL_DRIPADDR);
   uip_setdraddr("eth0", &addr);
 
   /* Setup the subnet mask */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_SENDMAIL_NETMASK);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_SENDMAIL_NETMASK);
   uip_setnetmask("eth0", &addr);
 
   /* Then send the mail */
diff --git a/apps/examples/telnetd/shell.c b/apps/examples/telnetd/shell.c
index 3033698c5f..3058daa39e 100644
--- a/apps/examples/telnetd/shell.c
+++ b/apps/examples/telnetd/shell.c
@@ -186,13 +186,13 @@ int shell_session(int argc, char *argv[])
 static void shell_netinit(void)
 {
   struct in_addr addr;
-#ifdef CONFIG_EXAMPLE_TELNETD_NOMAC
+#ifdef CONFIG_EXAMPLES_TELNETD_NOMAC
   uint8_t mac[IFHWADDRLEN];
 #endif
 
 /* Many embedded network interfaces must have a software assigned MAC */
 
-#ifdef CONFIG_EXAMPLE_TELNETD_NOMAC
+#ifdef CONFIG_EXAMPLES_TELNETD_NOMAC
   mac[0] = 0x00;
   mac[1] = 0xe0;
   mac[2] = 0xde;
@@ -204,17 +204,17 @@ static void shell_netinit(void)
 
   /* Set up our host address */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_TELNETD_IPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_TELNETD_IPADDR);
   uip_sethostaddr("eth0", &addr);
 
   /* Set up the default router address */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_TELNETD_DRIPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_TELNETD_DRIPADDR);
   uip_setdraddr("eth0", &addr);
 
   /* Setup the subnet mask */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_TELNETD_NETMASK);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_TELNETD_NETMASK);
   uip_setnetmask("eth0", &addr);
 }
 
diff --git a/apps/examples/telnetd/shell.h b/apps/examples/telnetd/shell.h
index a5cec32b38..59d51a562d 100644
--- a/apps/examples/telnetd/shell.h
+++ b/apps/examples/telnetd/shell.h
@@ -47,12 +47,12 @@
  *   Default: SCHED_PRIORITY_DEFAULT
  * CONFIG_EXAMPLES_TELNETD_CLIENTSTACKSIZE - Stack size allocated for the
  *   Telnet client. Default: 2048
- * CONFIG_EXAMPLE_TELNETD_NOMAC - If the hardware has no MAC address of its
+ * CONFIG_EXAMPLES_TELNETD_NOMAC - If the hardware has no MAC address of its
  *   own, define this =y to provide a bogus address for testing.
- * CONFIG_EXAMPLE_TELNETD_IPADDR - The target IP address.  Default 10.0.0.2
- * CONFIG_EXAMPLE_TELNETD_DRIPADDR - The default router address. Default
+ * CONFIG_EXAMPLES_TELNETD_IPADDR - The target IP address.  Default 10.0.0.2
+ * CONFIG_EXAMPLES_TELNETD_DRIPADDR - The default router address. Default
  *   10.0.0.1
- * CONFIG_EXAMPLE_TELNETD_NETMASK - The network mask.  Default: 255.255.255.0
+ * CONFIG_EXAMPLES_TELNETD_NETMASK - The network mask.  Default: 255.255.255.0
  */
 
 #ifndef CONFIG_EXAMPLES_TELNETD_DAEMONPRIO
@@ -71,14 +71,14 @@
 #  define CONFIG_EXAMPLES_TELNETD_CLIENTSTACKSIZE 2048
 #endif
 
-#ifndef CONFIG_EXAMPLE_TELNETD_IPADDR
-#  define CONFIG_EXAMPLE_TELNETD_IPADDR 0x0a000002
+#ifndef CONFIG_EXAMPLES_TELNETD_IPADDR
+#  define CONFIG_EXAMPLES_TELNETD_IPADDR 0x0a000002
 #endif
-#ifndef CONFIG_EXAMPLE_TELNETD_DRIPADDR
-#  define CONFIG_EXAMPLE_TELNETD_DRIPADDR 0x0a000002
+#ifndef CONFIG_EXAMPLES_TELNETD_DRIPADDR
+#  define CONFIG_EXAMPLES_TELNETD_DRIPADDR 0x0a000002
 #endif
-#ifndef CONFIG_EXAMPLE_TELNETD_NETMASK
-#  define CONFIG_EXAMPLE_TELNETD_NETMASK 0xffffff00
+#ifndef CONFIG_EXAMPLES_TELNETD_NETMASK
+#  define CONFIG_EXAMPLES_TELNETD_NETMASK 0xffffff00
 #endif
 
 /* Other definitions ********************************************************/
diff --git a/apps/examples/thttpd/thttpd_main.c b/apps/examples/thttpd/thttpd_main.c
index f4d5d58db4..b31d0a8642 100644
--- a/apps/examples/thttpd/thttpd_main.c
+++ b/apps/examples/thttpd/thttpd_main.c
@@ -99,7 +99,7 @@
 
    /* No MAC address operations */
 
-#  undef CONFIG_EXAMPLE_THTTPD_NOMAC
+#  undef CONFIG_EXAMPLES_THTTPD_NOMAC
 
    /* TTY device to use */
 
@@ -172,7 +172,7 @@ int                         g_thttpdnsymbols;
 int thttp_main(int argc, char *argv[])
 {
   struct in_addr addr;
-#ifdef CONFIG_EXAMPLE_THTTPD_NOMAC
+#ifdef CONFIG_EXAMPLES_THTTPD_NOMAC
   uint8_t mac[IFHWADDRLEN];
 #endif
   char *thttpd_argv = "thttpd";
@@ -191,7 +191,7 @@ int thttp_main(int argc, char *argv[])
 
 /* Many embedded network interfaces must have a software assigned MAC */
 
-#ifdef CONFIG_EXAMPLE_THTTPD_NOMAC
+#ifdef CONFIG_EXAMPLES_THTTPD_NOMAC
   message("Assigning MAC\n");
 
   mac[0] = 0x00;
@@ -211,12 +211,12 @@ int thttp_main(int argc, char *argv[])
 
   /* Set up the default router address */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_THTTPD_DRIPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_THTTPD_DRIPADDR);
   uip_setdraddr(NET_DEVNAME, &addr);
 
   /* Setup the subnet mask */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_THTTPD_NETMASK);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_THTTPD_NETMASK);
   uip_setnetmask(NET_DEVNAME, &addr);
 
   /* Initialize the NXFLAT binary loader */
diff --git a/apps/examples/udp/Makefile b/apps/examples/udp/Makefile
index 337d323e88..17438321c3 100644
--- a/apps/examples/udp/Makefile
+++ b/apps/examples/udp/Makefile
@@ -42,7 +42,7 @@ include $(APPDIR)/Make.defs
 TARG_ASRCS	= 
 
 TARG_CSRCS	= target.c
-ifeq ($(CONFIG_EXAMPLE_UDP_SERVER),y)
+ifeq ($(CONFIG_EXAMPLES_UDP_SERVER),y)
 TARG_CSRCS	+= udp-server.c
 else
 TARG_CSRCS	+= udp-client.c
@@ -60,14 +60,14 @@ else
   TARG_BIN	= "$(APPDIR)/libapps$(LIBEXT)"
 endif
 
-HOSTCFLAGS	+= -DCONFIG_EXAMPLE_UDP_HOST=1
-ifeq ($(CONFIG_EXAMPLE_UDP_SERVER),y)
-HOSTCFLAGS	+= -DCONFIG_EXAMPLE_UDP_SERVER=1 \
-		   -DCONFIG_EXAMPLE_UDP_SERVERIP="$(CONFIG_EXAMPLE_UDP_SERVERIP)"
+HOSTCFLAGS	+= -DCONFIG_EXAMPLES_UDP_HOST=1
+ifeq ($(CONFIG_EXAMPLES_UDP_SERVER),y)
+HOSTCFLAGS	+= -DCONFIG_EXAMPLES_UDP_SERVER=1 \
+		   -DCONFIG_EXAMPLES_UDP_SERVERIP="$(CONFIG_EXAMPLES_UDP_SERVERIP)"
 endif
 
 HOST_SRCS	= host.c
-ifeq ($(CONFIG_EXAMPLE_UDP_SERVER),y)
+ifeq ($(CONFIG_EXAMPLES_UDP_SERVER),y)
 HOST_SRCS	+= udp-client.c
 else
 HOST_SRCS	+= udp-server.c
diff --git a/apps/examples/udp/host.c b/apps/examples/udp/host.c
index 9d2aa73d97..e103acd8c6 100644
--- a/apps/examples/udp/host.c
+++ b/apps/examples/udp/host.c
@@ -53,7 +53,7 @@
 
 int main(int argc, char **argv, char **envp)
 {
-#ifdef CONFIG_EXAMPLE_UDP_SERVER
+#ifdef CONFIG_EXAMPLES_UDP_SERVER
   send_client();
 #else
   recv_server();
diff --git a/apps/examples/udp/target.c b/apps/examples/udp/target.c
index e43ff2a0be..d7b64638dc 100644
--- a/apps/examples/udp/target.c
+++ b/apps/examples/udp/target.c
@@ -68,20 +68,20 @@ int udp_main(int argc, char *argv[])
 
   /* Set up our host address */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_UDP_IPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_UDP_IPADDR);
   uip_sethostaddr("eth0", &addr);
 
   /* Set up the default router address */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_UDP_DRIPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_UDP_DRIPADDR);
   uip_setdraddr("eth0", &addr);
 
   /* Setup the subnet mask */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_UDP_NETMASK);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_UDP_NETMASK);
   uip_setnetmask("eth0", &addr);
 
-#ifdef CONFIG_EXAMPLE_UDP_SERVER
+#ifdef CONFIG_EXAMPLES_UDP_SERVER
   recv_server();
 #else
   send_client();
diff --git a/apps/examples/udp/udp-client.c b/apps/examples/udp/udp-client.c
index fb98ab3420..6b84735828 100644
--- a/apps/examples/udp/udp-client.c
+++ b/apps/examples/udp/udp-client.c
@@ -102,7 +102,7 @@ void send_client(void)
 
       server.sin_family      = AF_INET;
       server.sin_port        = HTONS(PORTNO);
-      server.sin_addr.s_addr = HTONL(CONFIG_EXAMPLE_UDP_SERVERIP);
+      server.sin_addr.s_addr = HTONL(CONFIG_EXAMPLES_UDP_SERVERIP);
 
       message("client: %d. Sending %d bytes\n", offset, SENDSIZE);
       nbytes = sendto(sockfd, outbuf, SENDSIZE, 0,
diff --git a/apps/examples/udp/udp-internal.h b/apps/examples/udp/udp-internal.h
index 04a685d17a..2a966c7466 100644
--- a/apps/examples/udp/udp-internal.h
+++ b/apps/examples/udp/udp-internal.h
@@ -40,7 +40,7 @@
  * Included Files
  ****************************************************************************/
 
-#ifdef CONFIG_EXAMPLE_UDP_HOST
+#ifdef CONFIG_EXAMPLES_UDP_HOST
 #else
 # include <debug.h>
 #endif
@@ -49,7 +49,7 @@
  * Definitions
  ****************************************************************************/
 
-#ifdef CONFIG_EXAMPLE_UDP_HOST
+#ifdef CONFIG_EXAMPLES_UDP_HOST
    /* HTONS/L macros are unique to uIP */
 
 #  define HTONS(a)       htons(a)
diff --git a/apps/examples/uip/uip_main.c b/apps/examples/uip/uip_main.c
index b552aed75a..6c2f96f39b 100644
--- a/apps/examples/uip/uip_main.c
+++ b/apps/examples/uip/uip_main.c
@@ -59,7 +59,7 @@
 
 #include <apps/netutils/uiplib.h>
 
-#ifdef CONFIG_EXAMPLE_UIP_DHCPC
+#ifdef CONFIG_EXAMPLES_UIP_DHCPC
 #include <arpa/inet.h>
 #endif
 
@@ -69,7 +69,7 @@
 
 /* DHCPC may be used in conjunction with any other feature (or not) */
 
-#ifdef CONFIG_EXAMPLE_UIP_DHCPC
+#ifdef CONFIG_EXAMPLES_UIP_DHCPC
 # include <apps/netutils/resolv.h>
 # include <apps/netutils/dhcpc.h>
 #endif
@@ -113,16 +113,16 @@
 int uip_main(int argc, char *argv[])
 {
   struct in_addr addr;
-#if defined(CONFIG_EXAMPLE_UIP_DHCPC) || defined(CONFIG_EXAMPLE_UIP_NOMAC)
+#if defined(CONFIG_EXAMPLES_UIP_DHCPC) || defined(CONFIG_EXAMPLES_UIP_NOMAC)
   uint8_t mac[IFHWADDRLEN];
 #endif
-#ifdef CONFIG_EXAMPLE_UIP_DHCPC
+#ifdef CONFIG_EXAMPLES_UIP_DHCPC
   void *handle;
 #endif
 
 /* Many embedded network interfaces must have a software assigned MAC */
 
-#ifdef CONFIG_EXAMPLE_UIP_NOMAC
+#ifdef CONFIG_EXAMPLES_UIP_NOMAC
   mac[0] = 0x00;
   mac[1] = 0xe0;
   mac[2] = 0xde;
@@ -134,24 +134,24 @@ int uip_main(int argc, char *argv[])
 
   /* Set up our host address */
 
-#ifdef CONFIG_EXAMPLE_UIP_DHCPC
+#ifdef CONFIG_EXAMPLES_UIP_DHCPC
   addr.s_addr = 0;
 #else
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_UIP_IPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_UIP_IPADDR);
 #endif
   uip_sethostaddr("eth0", &addr);
 
   /* Set up the default router address */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_UIP_DRIPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_UIP_DRIPADDR);
   uip_setdraddr("eth0", &addr);
 
   /* Setup the subnet mask */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_UIP_NETMASK);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_UIP_NETMASK);
   uip_setnetmask("eth0", &addr);
 
-#ifdef CONFIG_EXAMPLE_UIP_DHCPC
+#ifdef CONFIG_EXAMPLES_UIP_DHCPC
   /* Set up the resolver */
 
   resolv_init();
diff --git a/apps/examples/wget/Kconfig b/apps/examples/wget/Kconfig
index f7a1927f30..f7d5a2a89a 100644
--- a/apps/examples/wget/Kconfig
+++ b/apps/examples/wget/Kconfig
@@ -6,8 +6,32 @@
 config EXAMPLES_WGET
 	bool "wget example"
 	default n
+	depends on NET_TCP && !NSH_BUILTIN_APPS
 	---help---
 		Enable the wget example
 
 if EXAMPLES_WGET
+
+config EXAMPLES_WGET_URL
+	string "File URL"
+	default ""
+	---help---
+	The URL of the file to get
+
+config EXAMPLES_WGET_NOMAC
+	bool "Use Canned MAC Address"
+	default n
+
+config EXAMPLES_WGET_IPADDR
+	hex "Target IP address"
+	default 0x0a000002
+
+config EXAMPLES_WGET_DRIPADDR
+	hex "Default Router IP address (Gateway)"
+	default 0x0a000001
+
+config EXAMPLES_WGET_NETMASK
+	hex "Network Mask"
+	default 0xffffff00
+
 endif
diff --git a/apps/examples/wget/target.c b/apps/examples/wget/target.c
index 5c5c656653..d205a81ae0 100644
--- a/apps/examples/wget/target.c
+++ b/apps/examples/wget/target.c
@@ -62,16 +62,16 @@
  * but there are default values for those so we cannot check them here.
  */
 
-#ifndef CONFIG_EXAMPLE_WGET_IPADDR
-#  error "You must define CONFIG_EXAMPLE_WGET_IPADDR"
+#ifndef CONFIG_EXAMPLES_WGET_IPADDR
+#  error "You must define CONFIG_EXAMPLES_WGET_IPADDR"
 #endif
 
-#ifndef CONFIG_EXAMPLE_WGET_DRIPADDR
-#  error "You must define CONFIG_EXAMPLE_WGET_DRIPADDR"
+#ifndef CONFIG_EXAMPLES_WGET_DRIPADDR
+#  error "You must define CONFIG_EXAMPLES_WGET_DRIPADDR"
 #endif
 
-#ifndef CONFIG_EXAMPLE_WGET_NETMASK
-#  error "You must define CONFIG_EXAMPLE_WGET_NETMASK"
+#ifndef CONFIG_EXAMPLES_WGET_NETMASK
+#  error "You must define CONFIG_EXAMPLES_WGET_NETMASK"
 #endif
 
 #ifndef CONFIG_NET
@@ -112,13 +112,13 @@ static void callback(FAR char **buffer, int offset, int datend,
 int wget_main(int argc, char *argv[])
 {
   struct in_addr addr;
-#if defined(CONFIG_EXAMPLE_WGET_NOMAC)
+#if defined(CONFIG_EXAMPLES_WGET_NOMAC)
   uint8_t mac[IFHWADDRLEN];
 #endif
 
 /* Many embedded network interfaces must have a software assigned MAC */
 
-#ifdef CONFIG_EXAMPLE_WGET_NOMAC
+#ifdef CONFIG_EXAMPLES_WGET_NOMAC
   mac[0] = 0x00;
   mac[1] = 0xe0;
   mac[2] = 0xde;
@@ -130,21 +130,21 @@ int wget_main(int argc, char *argv[])
 
   /* Set up our host address */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_WGET_IPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_WGET_IPADDR);
   uip_sethostaddr("eth0", &addr);
 
   /* Set up the default router address */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_WGET_DRIPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_WGET_DRIPADDR);
   uip_setdraddr("eth0", &addr);
 
   /* Setup the subnet mask */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_WGET_NETMASK);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_WGET_NETMASK);
   uip_setnetmask("eth0", &addr);
 
   /* Then start the server */
   
-  wget(CONFIG_EXAMPLE_WGET_URL, g_iobuffer, 512, callback, NULL);
+  wget(CONFIG_EXAMPLES_WGET_URL, g_iobuffer, 512, callback, NULL);
   return 0;
 }
diff --git a/apps/examples/wlan/wlan_main.c b/apps/examples/wlan/wlan_main.c
index dcb8c770ac..aa48a02382 100644
--- a/apps/examples/wlan/wlan_main.c
+++ b/apps/examples/wlan/wlan_main.c
@@ -64,7 +64,7 @@
 
 /* DHCPC may be used in conjunction with any other feature (or not) */
 
-#ifdef CONFIG_EXAMPLE_WLAN_DHCPC
+#ifdef CONFIG_EXAMPLES_WLAN_DHCPC
 #  include <arpa/inet.h>
 #  include <apps/netutils/resolv.h>
 #  include <apps/netutils/dhcpc.h>
@@ -131,11 +131,11 @@ static struct usbhost_driver_s *g_drvr;
 
 static inline void wlan_bringup(void)
 {
-#if defined(CONFIG_EXAMPLE_WLAN_DHCPC) || defined(CONFIG_EXAMPLE_WLAN_NOMAC)
+#if defined(CONFIG_EXAMPLES_WLAN_DHCPC) || defined(CONFIG_EXAMPLES_WLAN_NOMAC)
   uint8_t mac[IFHWADDRLEN];
 #endif
   struct in_addr addr;
-#ifdef CONFIG_EXAMPLE_WLAN_DHCPC
+#ifdef CONFIG_EXAMPLES_WLAN_DHCPC
   void *handle;
 #endif
 
@@ -143,7 +143,7 @@ static inline void wlan_bringup(void)
    * MAC
    */
 
-#ifdef CONFIG_EXAMPLE_WLAN_NOMAC
+#ifdef CONFIG_EXAMPLES_WLAN_NOMAC
   mac[0] = 0x00;
   mac[1] = 0xe0;
   mac[2] = 0xde;
@@ -155,24 +155,24 @@ static inline void wlan_bringup(void)
 
   /* Set up the default router address */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_WLAN_DRIPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_WLAN_DRIPADDR);
   uip_setdraddr("eth0", &addr);
 
   /* Setup the subnet mask */
 
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_WLAN_NETMASK);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_WLAN_NETMASK);
   uip_setnetmask("eth0", &addr);
 
   /* Set up our host address */
 
-#ifdef CONFIG_EXAMPLE_WLAN_DHCPC
+#ifdef CONFIG_EXAMPLES_WLAN_DHCPC
   addr.s_addr = 0;
 #else
-  addr.s_addr = HTONL(CONFIG_EXAMPLE_WLAN_IPADDR);
+  addr.s_addr = HTONL(CONFIG_EXAMPLES_WLAN_IPADDR);
 #endif
   uip_sethostaddr("eth0", &addr);
 
-#ifdef CONFIG_EXAMPLE_WLAN_DHCPC
+#ifdef CONFIG_EXAMPLES_WLAN_DHCPC
   /* Set up the resolver */
 
   resolv_init();
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 4ea03f34f8..eb85a8e7ce 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3461,3 +3461,5 @@
 	* board.h file for shenzhou, fire-stm32v2, and olimex-stm32-p107:
 	  Add frequencies for HSE, HSI, LSE, and LSI.  These are needed
 	  by the STM32 watchdog driver.
+	* CONFIG_EXAMPLES_*: To make things consistent, changed all occurrences
+	  of CONFIG_EXAMPLE_* to CONFIG_EXAMPLES_*.
diff --git a/nuttx/Documentation/NuttXRelated.html b/nuttx/Documentation/NuttXRelated.html
index bc55bbfc12..978eb1d441 100644
--- a/nuttx/Documentation/NuttXRelated.html
+++ b/nuttx/Documentation/NuttXRelated.html
@@ -41,6 +41,7 @@
       <li><a href="http://osmocom.org/" target="top">Osmocom-BB</a></li>
       <li><a href="https://pixhawk.ethz.ch/px4/" target="top">PX4 Autopilot</a></li>
       <li><a href="http://rgmp.sourceforge.net/wiki/index.php/Main_Page" target="top">RGMP</a></li>
+      <li><a href="http://code.google.com/p/tmr/" target="top">Top Multi-Rotor (TMR)</a></li>
   </tr>
   <tr>
     <td align="center" valign="top" width="22">
diff --git a/nuttx/arch/sim/src/up_tapdev.c b/nuttx/arch/sim/src/up_tapdev.c
index d0deea6d9b..f2bbcc14a2 100644
--- a/nuttx/arch/sim/src/up_tapdev.c
+++ b/nuttx/arch/sim/src/up_tapdev.c
@@ -72,7 +72,7 @@ extern int uipdriver_setmacaddr(unsigned char *macaddr);
 
 #define DEVTAP          "/dev/net/tun"
 
-#ifndef CONFIG_EXAMPLE_UIP_DHCPC
+#ifndef CONFIG_EXAMPLES_UIP_DHCPC
 #  define UIP_IPADDR0   192
 #  define UIP_IPADDR1   168
 #  define UIP_IPADDR2   0
diff --git a/nuttx/arch/sim/src/up_wpcap.c b/nuttx/arch/sim/src/up_wpcap.c
index 42e8764f80..62f0b6ad03 100644
--- a/nuttx/arch/sim/src/up_wpcap.c
+++ b/nuttx/arch/sim/src/up_wpcap.c
@@ -62,7 +62,7 @@ extern int uipdriver_setmacaddr(unsigned char *macaddr);
 
 #define BUF ((struct uip_eth_hdr *)&uip_buf[0])
 
-#ifndef CONFIG_EXAMPLE_UIP_DHCPC
+#ifndef CONFIG_EXAMPLES_UIP_DHCPC
 #  define UIP_IPADDR (10 << 24 | 0 << 16 | 0 << 8 | 1)
 #else
 #  define UIP_IPADDR (0)
diff --git a/nuttx/configs/amber/hello/defconfig b/nuttx/configs/amber/hello/defconfig
index 66127604ec..fece8db36b 100644
--- a/nuttx/configs/amber/hello/defconfig
+++ b/nuttx/configs/amber/hello/defconfig
@@ -318,21 +318,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/avr32dev1/nsh/defconfig b/nuttx/configs/avr32dev1/nsh/defconfig
index b9f6e35a6c..7e75380c09 100755
--- a/nuttx/configs/avr32dev1/nsh/defconfig
+++ b/nuttx/configs/avr32dev1/nsh/defconfig
@@ -341,20 +341,20 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/avr32dev1/ostest/defconfig b/nuttx/configs/avr32dev1/ostest/defconfig
index 74ac8f0722..b70cbb6af4 100755
--- a/nuttx/configs/avr32dev1/ostest/defconfig
+++ b/nuttx/configs/avr32dev1/ostest/defconfig
@@ -341,20 +341,20 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/c5471evm/httpd/defconfig b/nuttx/configs/c5471evm/httpd/defconfig
index 1e599d9a11..372fb330f7 100644
--- a/nuttx/configs/c5471evm/httpd/defconfig
+++ b/nuttx/configs/c5471evm/httpd/defconfig
@@ -210,21 +210,21 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_NOMAC=y
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=y
+CONFIG_EXAMPLES_UIP_NOMAC=y
+CONFIG_EXAMPLES_UIP_IPADDR=0x0a000002
+CONFIG_EXAMPLES_UIP_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=y
 
 #
 # Settings for examples/nettest
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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/nsh
@@ -241,11 +241,11 @@ CONFIG_NSH_NETMASK=0xffffff00
 #
 # Settings for examples/wget
 #
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
 
 #
 # Stack and heap information
diff --git a/nuttx/configs/c5471evm/nettest/defconfig b/nuttx/configs/c5471evm/nettest/defconfig
index 807a23f155..179b4c1854 100644
--- a/nuttx/configs/c5471evm/nettest/defconfig
+++ b/nuttx/configs/c5471evm/nettest/defconfig
@@ -210,21 +210,21 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_NOMAC=y
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_NOMAC=y
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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/nsh
@@ -241,11 +241,11 @@ CONFIG_NSH_NETMASK=0xffffff00
 #
 # Settings for examples/wget
 #
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
 
 #
 # Stack and heap information
diff --git a/nuttx/configs/c5471evm/nsh/defconfig b/nuttx/configs/c5471evm/nsh/defconfig
index 9f5bc6373a..5746f833a2 100644
--- a/nuttx/configs/c5471evm/nsh/defconfig
+++ b/nuttx/configs/c5471evm/nsh/defconfig
@@ -210,21 +210,21 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_NOMAC=y
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_NOMAC=y
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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/nsh
@@ -241,11 +241,11 @@ CONFIG_NSH_NETMASK=0xffffff00
 #
 # Settings for examples/wget
 #
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
 
 #
 # Stack and heap information
diff --git a/nuttx/configs/c5471evm/ostest/defconfig b/nuttx/configs/c5471evm/ostest/defconfig
index 4921b59e6a..e0c6297c13 100644
--- a/nuttx/configs/c5471evm/ostest/defconfig
+++ b/nuttx/configs/c5471evm/ostest/defconfig
@@ -210,21 +210,21 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_NOMAC=y
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_NOMAC=y
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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/nsh
@@ -241,11 +241,11 @@ CONFIG_NSH_NETMASK=0xffffff00
 #
 # Settings for examples/wget
 #
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
 
 #
 # Stack and heap information
diff --git a/nuttx/configs/compal_e88/nsh_highram/defconfig b/nuttx/configs/compal_e88/nsh_highram/defconfig
index bfb3017d2d..3cf0af6295 100644
--- a/nuttx/configs/compal_e88/nsh_highram/defconfig
+++ b/nuttx/configs/compal_e88/nsh_highram/defconfig
@@ -223,21 +223,21 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_NOMAC=y
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_NOMAC=y
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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/nsh
@@ -260,11 +260,11 @@ CONFIG_EXAMPLES_HELLO_BUILTIN=y
 #
 # Settings for examples/wget
 #
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
 
 #
 # Stack and heap information
diff --git a/nuttx/configs/compal_e99/nsh_compalram/defconfig b/nuttx/configs/compal_e99/nsh_compalram/defconfig
index 5bd924d7d5..f9bf23af66 100644
--- a/nuttx/configs/compal_e99/nsh_compalram/defconfig
+++ b/nuttx/configs/compal_e99/nsh_compalram/defconfig
@@ -229,21 +229,21 @@ CONFIG_EXAMPLES_HELLO_BUILTIN=y
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_NOMAC=y
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_NOMAC=y
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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/nsh
@@ -262,11 +262,11 @@ CONFIG_NSH_BUILTIN_APPS=y
 #
 # Settings for examples/wget
 #
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
 
 #
 # Stack and heap information
diff --git a/nuttx/configs/compal_e99/nsh_highram/defconfig b/nuttx/configs/compal_e99/nsh_highram/defconfig
index e3f3dd8164..f5323c664c 100644
--- a/nuttx/configs/compal_e99/nsh_highram/defconfig
+++ b/nuttx/configs/compal_e99/nsh_highram/defconfig
@@ -226,21 +226,21 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_NOMAC=y
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_NOMAC=y
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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/nsh
@@ -306,11 +306,11 @@ CONFIG_EXAMPLES_NXTEXT_DEVNO=0
 #
 # Settings for examples/wget
 #
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
 
 #
 # Stack and heap information
diff --git a/nuttx/configs/demo9s12ne64/ostest/defconfig b/nuttx/configs/demo9s12ne64/ostest/defconfig
index 6265e6e53f..a45fc7e474 100755
--- a/nuttx/configs/demo9s12ne64/ostest/defconfig
+++ b/nuttx/configs/demo9s12ne64/ostest/defconfig
@@ -311,20 +311,20 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/ea3131/nsh/defconfig b/nuttx/configs/ea3131/nsh/defconfig
index 32521f012f..38caf93aaf 100644
--- a/nuttx/configs/ea3131/nsh/defconfig
+++ b/nuttx/configs/ea3131/nsh/defconfig
@@ -312,21 +312,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/ea3131/ostest/defconfig b/nuttx/configs/ea3131/ostest/defconfig
index 1ef35f969b..abc2c8ba54 100644
--- a/nuttx/configs/ea3131/ostest/defconfig
+++ b/nuttx/configs/ea3131/ostest/defconfig
@@ -312,21 +312,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/ea3131/pgnsh/defconfig b/nuttx/configs/ea3131/pgnsh/defconfig
index 995bc90d98..f03432e8de 100644
--- a/nuttx/configs/ea3131/pgnsh/defconfig
+++ b/nuttx/configs/ea3131/pgnsh/defconfig
@@ -355,21 +355,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/ea3131/usbserial/defconfig b/nuttx/configs/ea3131/usbserial/defconfig
index 4e45989dfa..3314de254b 100644
--- a/nuttx/configs/ea3131/usbserial/defconfig
+++ b/nuttx/configs/ea3131/usbserial/defconfig
@@ -315,21 +315,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/ea3131/usbstorage/defconfig b/nuttx/configs/ea3131/usbstorage/defconfig
index 772de7e694..a857523df3 100644
--- a/nuttx/configs/ea3131/usbstorage/defconfig
+++ b/nuttx/configs/ea3131/usbstorage/defconfig
@@ -316,21 +316,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/ea3152/ostest/defconfig b/nuttx/configs/ea3152/ostest/defconfig
index 845faf60b5..5b7b5b59df 100644
--- a/nuttx/configs/ea3152/ostest/defconfig
+++ b/nuttx/configs/ea3152/ostest/defconfig
@@ -313,21 +313,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/eagle100/httpd/defconfig b/nuttx/configs/eagle100/httpd/defconfig
index 0fdddc2df1..7c47f44674 100644
--- a/nuttx/configs/eagle100/httpd/defconfig
+++ b/nuttx/configs/eagle100/httpd/defconfig
@@ -263,21 +263,21 @@ CONFIG_NETUTILS_HTTPD_DUMPPSTATE=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
@@ -324,10 +324,10 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 # Settings for examples/dhcpd
 #
-CONFIG_EXAMPLE_DHCPD_NOMAC=y
-CONFIG_EXAMPLE_DHCPD_IPADDR=0x0a000001
-CONFIG_EXAMPLE_DHCPD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_DHCPD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_DHCPD_NOMAC=y
+CONFIG_EXAMPLES_DHCPD_IPADDR=0x0a000001
+CONFIG_EXAMPLES_DHCPD_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
 
 #
 # Stack and heap information
diff --git a/nuttx/configs/eagle100/nettest/defconfig b/nuttx/configs/eagle100/nettest/defconfig
index 943f462230..4f27210454 100644
--- a/nuttx/configs/eagle100/nettest/defconfig
+++ b/nuttx/configs/eagle100/nettest/defconfig
@@ -254,21 +254,21 @@ CONFIG_NET_RESOLV_ENTRIES=4
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/eagle100/nsh/defconfig b/nuttx/configs/eagle100/nsh/defconfig
index 2e04850b3c..4848e957bf 100644
--- a/nuttx/configs/eagle100/nsh/defconfig
+++ b/nuttx/configs/eagle100/nsh/defconfig
@@ -256,20 +256,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/eagle100/nxflat/defconfig b/nuttx/configs/eagle100/nxflat/defconfig
index d4228f16b4..01931b0d3a 100644
--- a/nuttx/configs/eagle100/nxflat/defconfig
+++ b/nuttx/configs/eagle100/nxflat/defconfig
@@ -258,20 +258,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/eagle100/ostest/defconfig b/nuttx/configs/eagle100/ostest/defconfig
index 6cffe1450d..13a316ca44 100644
--- a/nuttx/configs/eagle100/ostest/defconfig
+++ b/nuttx/configs/eagle100/ostest/defconfig
@@ -252,20 +252,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/eagle100/thttpd/defconfig b/nuttx/configs/eagle100/thttpd/defconfig
index afb7dbce83..412a89e9cf 100644
--- a/nuttx/configs/eagle100/thttpd/defconfig
+++ b/nuttx/configs/eagle100/thttpd/defconfig
@@ -289,27 +289,27 @@ CONFIG_THTTPD_URLPATTERN=n
 #
 # Additional settings for examples/thttpd
 #
-CONFIG_EXAMPLE_THTTPD_NOMAC=n
-CONFIG_EXAMPLE_THTTPD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_THTTPD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_THTTPD_NOMAC=n
+CONFIG_EXAMPLES_THTTPD_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/ekk-lm3s9b96/nsh/defconfig b/nuttx/configs/ekk-lm3s9b96/nsh/defconfig
index 1e162a4a12..11407295fd 100644
--- a/nuttx/configs/ekk-lm3s9b96/nsh/defconfig
+++ b/nuttx/configs/ekk-lm3s9b96/nsh/defconfig
@@ -271,20 +271,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/ekk-lm3s9b96/ostest/defconfig b/nuttx/configs/ekk-lm3s9b96/ostest/defconfig
index d08e990774..734ad031e2 100644
--- a/nuttx/configs/ekk-lm3s9b96/ostest/defconfig
+++ b/nuttx/configs/ekk-lm3s9b96/ostest/defconfig
@@ -268,20 +268,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/ez80f910200kitg/ostest/defconfig b/nuttx/configs/ez80f910200kitg/ostest/defconfig
index adc92f8796..22b6275429 100644
--- a/nuttx/configs/ez80f910200kitg/ostest/defconfig
+++ b/nuttx/configs/ez80f910200kitg/ostest/defconfig
@@ -306,20 +306,20 @@ CONFIG_NX_MXCLIENTMSGS=16
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
 
 #
 # Settings for examples/ostest
@@ -386,11 +386,11 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 #
 # Settings for examples/wget
 #
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
 
 #
 # Stack and heap information
diff --git a/nuttx/configs/ez80f910200zco/dhcpd/defconfig b/nuttx/configs/ez80f910200zco/dhcpd/defconfig
index 8f7b6479f7..ea9844dc2e 100644
--- a/nuttx/configs/ez80f910200zco/dhcpd/defconfig
+++ b/nuttx/configs/ez80f910200zco/dhcpd/defconfig
@@ -312,28 +312,28 @@ CONFIG_NX_MXCLIENTMSGS=16
 
 #
 # Settings for examples/poll
-CONFIG_EXAMPLE_POLL_NOMAC=y
-CONFIG_EXAMPLE_POLL_IPADDR=0x0a000002
-CONFIG_EXAMPLE_POLL_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_POLL_NETMASK=0xffffff00
+CONFIG_EXAMPLES_POLL_NOMAC=y
+CONFIG_EXAMPLES_POLL_IPADDR=0x0a000002
+CONFIG_EXAMPLES_POLL_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_POLL_NETMASK=0xffffff00
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
@@ -376,10 +376,10 @@ CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/dhcpd
-CONFIG_EXAMPLE_DHCPD_NOMAC=y
-CONFIG_EXAMPLE_DHCPD_IPADDR=0x0a000001
-CONFIG_EXAMPLE_DHCPD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_DHCPD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_DHCPD_NOMAC=y
+CONFIG_EXAMPLES_DHCPD_IPADDR=0x0a000001
+CONFIG_EXAMPLES_DHCPD_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
 
 #
 # Settings for examples/nx
@@ -407,11 +407,11 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 #
 # Settings for examples/wget
 #
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
 
 #
 # Stack and heap information
diff --git a/nuttx/configs/ez80f910200zco/httpd/defconfig b/nuttx/configs/ez80f910200zco/httpd/defconfig
index 296521a9e0..ddf34285ab 100644
--- a/nuttx/configs/ez80f910200zco/httpd/defconfig
+++ b/nuttx/configs/ez80f910200zco/httpd/defconfig
@@ -320,28 +320,28 @@ CONFIG_NETUTILS_HTTPD_DUMPPSTATE=n
 
 #
 # Settings for examples/poll
-CONFIG_EXAMPLE_POLL_NOMAC=y
-CONFIG_EXAMPLE_POLL_IPADDR=0x0a000002
-CONFIG_EXAMPLE_POLL_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_POLL_NETMASK=0xffffff00
+CONFIG_EXAMPLES_POLL_NOMAC=y
+CONFIG_EXAMPLES_POLL_IPADDR=0x0a000002
+CONFIG_EXAMPLES_POLL_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_POLL_NETMASK=0xffffff00
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
@@ -384,10 +384,10 @@ CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/dhcpd
-CONFIG_EXAMPLE_DHCPD_NOMAC=y
-CONFIG_EXAMPLE_DHCPD_IPADDR=0x0a000001
-CONFIG_EXAMPLE_DHCPD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_DHCPD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_DHCPD_NOMAC=y
+CONFIG_EXAMPLES_DHCPD_IPADDR=0x0a000001
+CONFIG_EXAMPLES_DHCPD_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
 
 #
 # Settings for examples/nx
@@ -415,11 +415,11 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 #
 # Settings for examples/wget
 #
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
 
 #
 # Stack and heap information
diff --git a/nuttx/configs/ez80f910200zco/nettest/defconfig b/nuttx/configs/ez80f910200zco/nettest/defconfig
index fb424a7669..7b1415bf4b 100644
--- a/nuttx/configs/ez80f910200zco/nettest/defconfig
+++ b/nuttx/configs/ez80f910200zco/nettest/defconfig
@@ -312,28 +312,28 @@ CONFIG_NX_MXCLIENTMSGS=16
 
 #
 # Settings for examples/poll
-CONFIG_EXAMPLE_POLL_NOMAC=y
-CONFIG_EXAMPLE_POLL_IPADDR=0x0a000002
-CONFIG_EXAMPLE_POLL_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_POLL_NETMASK=0xffffff00
+CONFIG_EXAMPLES_POLL_NOMAC=y
+CONFIG_EXAMPLES_POLL_IPADDR=0x0a000002
+CONFIG_EXAMPLES_POLL_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_POLL_NETMASK=0xffffff00
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
@@ -400,11 +400,11 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 #
 # Settings for examples/wget
 #
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
 
 #
 # Stack and heap information
diff --git a/nuttx/configs/ez80f910200zco/nsh/defconfig b/nuttx/configs/ez80f910200zco/nsh/defconfig
index 9c4b5aaee3..fa701253d6 100644
--- a/nuttx/configs/ez80f910200zco/nsh/defconfig
+++ b/nuttx/configs/ez80f910200zco/nsh/defconfig
@@ -312,28 +312,28 @@ CONFIG_NX_MXCLIENTMSGS=16
 
 #
 # Settings for examples/poll
-CONFIG_EXAMPLE_POLL_NOMAC=y
-CONFIG_EXAMPLE_POLL_IPADDR=0x0a000002
-CONFIG_EXAMPLE_POLL_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_POLL_NETMASK=0xffffff00
+CONFIG_EXAMPLES_POLL_NOMAC=y
+CONFIG_EXAMPLES_POLL_IPADDR=0x0a000002
+CONFIG_EXAMPLES_POLL_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_POLL_NETMASK=0xffffff00
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
@@ -400,11 +400,11 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 #
 # Settings for examples/wget
 #
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
 
 #
 # Stack and heap information
diff --git a/nuttx/configs/ez80f910200zco/ostest/defconfig b/nuttx/configs/ez80f910200zco/ostest/defconfig
index 548ce3376c..f16ddee39f 100644
--- a/nuttx/configs/ez80f910200zco/ostest/defconfig
+++ b/nuttx/configs/ez80f910200zco/ostest/defconfig
@@ -308,27 +308,27 @@ CONFIG_NX_MXCLIENTMSGS=16
 
 #
 # Settings for examples/poll
-CONFIG_EXAMPLE_POLL_NOMAC=y
-CONFIG_EXAMPLE_POLL_IPADDR=0x0a000002
-CONFIG_EXAMPLE_POLL_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_POLL_NETMASK=0xffffff00
+CONFIG_EXAMPLES_POLL_NOMAC=y
+CONFIG_EXAMPLES_POLL_IPADDR=0x0a000002
+CONFIG_EXAMPLES_POLL_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_POLL_NETMASK=0xffffff00
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
 
 #
 # Settings for examples/ostest
@@ -395,11 +395,11 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 #
 # Settings for examples/wget
 #
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
 
 #
 # Stack and heap information
diff --git a/nuttx/configs/ez80f910200zco/poll/defconfig b/nuttx/configs/ez80f910200zco/poll/defconfig
index 0334ebc260..6ad505dc56 100644
--- a/nuttx/configs/ez80f910200zco/poll/defconfig
+++ b/nuttx/configs/ez80f910200zco/poll/defconfig
@@ -312,28 +312,28 @@ CONFIG_NX_MXCLIENTMSGS=16
 
 #
 # Settings for examples/poll
-CONFIG_EXAMPLE_POLL_NOMAC=y
-CONFIG_EXAMPLE_POLL_IPADDR=0x0a000002
-CONFIG_EXAMPLE_POLL_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_POLL_NETMASK=0xffffff00
+CONFIG_EXAMPLES_POLL_NOMAC=y
+CONFIG_EXAMPLES_POLL_IPADDR=0x0a000002
+CONFIG_EXAMPLES_POLL_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_POLL_NETMASK=0xffffff00
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
@@ -400,11 +400,11 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 #
 # Settings for examples/wget
 #
-CONFIG_EXAMPLE_WGET_URL="http://www.nuttx.org/index.html"
-CONFIG_EXAMPLE_WGET_NOMAC=y
-CONFIG_EXAMPLE_WGET_IPADDR=0x0a000002
-CONFIG_EXAMPLE_WGET_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_WGET_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WGET_URL="http://www.nuttx.org/index.html"
+CONFIG_EXAMPLES_WGET_NOMAC=y
+CONFIG_EXAMPLES_WGET_IPADDR=0x0a000002
+CONFIG_EXAMPLES_WGET_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_WGET_NETMASK=0xffffff00
 
 #
 # Stack and heap information
diff --git a/nuttx/configs/fire-stm32v2/nsh/defconfig b/nuttx/configs/fire-stm32v2/nsh/defconfig
index 25e782dfed..5edde6ed12 100644
--- a/nuttx/configs/fire-stm32v2/nsh/defconfig
+++ b/nuttx/configs/fire-stm32v2/nsh/defconfig
@@ -751,7 +751,7 @@ CONFIG_EXAMPLES_NSH=y
 #
 # UDP Discovery Daemon Example
 #
-# CONFIG_EXAMPLE_DISCOVER is not set
+# CONFIG_EXAMPLES_DISCOVER is not set
 
 #
 # uIP Web Server Example
diff --git a/nuttx/configs/hymini-stm32v/buttons/defconfig b/nuttx/configs/hymini-stm32v/buttons/defconfig
index 59b7b111fc..44dcf3c41a 100644
--- a/nuttx/configs/hymini-stm32v/buttons/defconfig
+++ b/nuttx/configs/hymini-stm32v/buttons/defconfig
@@ -373,36 +373,36 @@ CONFIG_WATCHDOG=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=7
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=2
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="WAKEUP"
-CONFIG_EXAMPLE_BUTTONS_NAME1="TAMPER"
-CONFIG_EXAMPLE_BUTTONS_NAME2="KEY"
-CONFIG_EXAMPLE_BUTTONS_NAME3="SELECT"
-CONFIG_EXAMPLE_BUTTONS_NAME4="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME5="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME6="RIGHT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="UP"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=7
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=2
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="WAKEUP"
+CONFIG_EXAMPLES_BUTTONS_NAME1="TAMPER"
+CONFIG_EXAMPLES_BUTTONS_NAME2="KEY"
+CONFIG_EXAMPLES_BUTTONS_NAME3="SELECT"
+CONFIG_EXAMPLES_BUTTONS_NAME4="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME5="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME6="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="UP"
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/hymini-stm32v/nsh/defconfig b/nuttx/configs/hymini-stm32v/nsh/defconfig
index 1b0944d022..52da9f6f62 100755
--- a/nuttx/configs/hymini-stm32v/nsh/defconfig
+++ b/nuttx/configs/hymini-stm32v/nsh/defconfig
@@ -373,20 +373,20 @@ CONFIG_WATCHDOG=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/hymini-stm32v/nx/defconfig b/nuttx/configs/hymini-stm32v/nx/defconfig
index 645feac1b5..e411baf835 100644
--- a/nuttx/configs/hymini-stm32v/nx/defconfig
+++ b/nuttx/configs/hymini-stm32v/nx/defconfig
@@ -435,20 +435,20 @@ CONFIG_LCD_BACKLIGHT=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/hymini-stm32v/usbserial/defconfig b/nuttx/configs/hymini-stm32v/usbserial/defconfig
index 379e51a5ef..7883db8273 100755
--- a/nuttx/configs/hymini-stm32v/usbserial/defconfig
+++ b/nuttx/configs/hymini-stm32v/usbserial/defconfig
@@ -395,20 +395,20 @@ CONFIG_WATCHDOG=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/hymini-stm32v/usbstorage/defconfig b/nuttx/configs/hymini-stm32v/usbstorage/defconfig
index b56f627544..c3434e3a46 100755
--- a/nuttx/configs/hymini-stm32v/usbstorage/defconfig
+++ b/nuttx/configs/hymini-stm32v/usbstorage/defconfig
@@ -380,20 +380,20 @@ CONFIG_WATCHDOG=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/kwikstik-k40/ostest/defconfig b/nuttx/configs/kwikstik-k40/ostest/defconfig
index 29bed1244f..2cf29894b2 100755
--- a/nuttx/configs/kwikstik-k40/ostest/defconfig
+++ b/nuttx/configs/kwikstik-k40/ostest/defconfig
@@ -377,20 +377,20 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/lincoln60/nsh/defconfig b/nuttx/configs/lincoln60/nsh/defconfig
index a120e2c748..43944f0a68 100644
--- a/nuttx/configs/lincoln60/nsh/defconfig
+++ b/nuttx/configs/lincoln60/nsh/defconfig
@@ -359,20 +359,20 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/lincoln60/ostest/defconfig b/nuttx/configs/lincoln60/ostest/defconfig
index 6c74a9f541..6dd51eb07d 100644
--- a/nuttx/configs/lincoln60/ostest/defconfig
+++ b/nuttx/configs/lincoln60/ostest/defconfig
@@ -369,21 +369,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
@@ -395,18 +395,18 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=7
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1"
-CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2"
-CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP"
-CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER"
-CONFIG_EXAMPLE_BUTTONS_NAME4="UP"
-CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=7
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="BUT1"
+CONFIG_EXAMPLES_BUTTONS_NAME1="BUT2"
+CONFIG_EXAMPLES_BUTTONS_NAME2="WAKE-UP"
+CONFIG_EXAMPLES_BUTTONS_NAME3="CENTER"
+CONFIG_EXAMPLES_BUTTONS_NAME4="UP"
+CONFIG_EXAMPLES_BUTTONS_NAME5="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME6="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="RIGHT"
 
 #
 # Settings for apps/nshlib
diff --git a/nuttx/configs/lm3s6432-s2e/nsh/defconfig b/nuttx/configs/lm3s6432-s2e/nsh/defconfig
index b4dd453ac6..f0cf503efb 100644
--- a/nuttx/configs/lm3s6432-s2e/nsh/defconfig
+++ b/nuttx/configs/lm3s6432-s2e/nsh/defconfig
@@ -271,20 +271,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
 #
 # Settings for examples/uip
 #
-#CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-#CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-#CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=y
+#CONFIG_EXAMPLES_UIP_IPADDR=0x0a000002
+#CONFIG_EXAMPLES_UIP_DRIPADDR=0x0a000001
+#CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=y
 
 #
 # Settings for examples/nettest
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/lm3s6432-s2e/ostest/defconfig b/nuttx/configs/lm3s6432-s2e/ostest/defconfig
index e04f3da8d5..daeac0177d 100644
--- a/nuttx/configs/lm3s6432-s2e/ostest/defconfig
+++ b/nuttx/configs/lm3s6432-s2e/ostest/defconfig
@@ -268,20 +268,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/lm3s6965-ek/nsh/defconfig b/nuttx/configs/lm3s6965-ek/nsh/defconfig
index bfad857f08..2771a3dc93 100755
--- a/nuttx/configs/lm3s6965-ek/nsh/defconfig
+++ b/nuttx/configs/lm3s6965-ek/nsh/defconfig
@@ -273,20 +273,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/lm3s6965-ek/nx/defconfig b/nuttx/configs/lm3s6965-ek/nx/defconfig
index 4bc7d73a60..83b338161c 100755
--- a/nuttx/configs/lm3s6965-ek/nx/defconfig
+++ b/nuttx/configs/lm3s6965-ek/nx/defconfig
@@ -322,20 +322,20 @@ CONFIG_P14201_FRAMEBUFFER=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/lm3s6965-ek/ostest/defconfig b/nuttx/configs/lm3s6965-ek/ostest/defconfig
index 8aeef4a002..0bfe9ef720 100755
--- a/nuttx/configs/lm3s6965-ek/ostest/defconfig
+++ b/nuttx/configs/lm3s6965-ek/ostest/defconfig
@@ -269,20 +269,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/lm3s8962-ek/nsh/defconfig b/nuttx/configs/lm3s8962-ek/nsh/defconfig
index 8c3d834f5d..001a873874 100755
--- a/nuttx/configs/lm3s8962-ek/nsh/defconfig
+++ b/nuttx/configs/lm3s8962-ek/nsh/defconfig
@@ -271,20 +271,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/lm3s8962-ek/nx/defconfig b/nuttx/configs/lm3s8962-ek/nx/defconfig
index 49bbe06753..dbae4b2aa7 100755
--- a/nuttx/configs/lm3s8962-ek/nx/defconfig
+++ b/nuttx/configs/lm3s8962-ek/nx/defconfig
@@ -320,20 +320,20 @@ CONFIG_P14201_FRAMEBUFFER=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/lm3s8962-ek/ostest/defconfig b/nuttx/configs/lm3s8962-ek/ostest/defconfig
index adb806b9c7..aeb0a1ecf8 100755
--- a/nuttx/configs/lm3s8962-ek/ostest/defconfig
+++ b/nuttx/configs/lm3s8962-ek/ostest/defconfig
@@ -268,20 +268,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/lpc4330-xplorer/nsh/defconfig b/nuttx/configs/lpc4330-xplorer/nsh/defconfig
index 406f6f2ba0..e4269ea67d 100644
--- a/nuttx/configs/lpc4330-xplorer/nsh/defconfig
+++ b/nuttx/configs/lpc4330-xplorer/nsh/defconfig
@@ -468,21 +468,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
@@ -541,11 +541,11 @@ CONFIG_I2CTOOL_DEFFREQ=100000
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=0
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=0
-CONFIG_EXAMPLE_BUTTONS_NAME1="SW2"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=0
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=0
+CONFIG_EXAMPLES_BUTTONS_NAME1="SW2"
 
 #
 # examples/modbus
diff --git a/nuttx/configs/lpc4330-xplorer/ostest/defconfig b/nuttx/configs/lpc4330-xplorer/ostest/defconfig
index 560e3327b0..d5ac58ef17 100644
--- a/nuttx/configs/lpc4330-xplorer/ostest/defconfig
+++ b/nuttx/configs/lpc4330-xplorer/ostest/defconfig
@@ -452,20 +452,20 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
@@ -524,11 +524,11 @@ CONFIG_I2CTOOL_DEFFREQ=100000
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=0
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=0
-CONFIG_EXAMPLE_BUTTONS_NAME1="SW2"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=0
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=0
+CONFIG_EXAMPLES_BUTTONS_NAME1="SW2"
 
 #
 # Settings for examples/usbserial
diff --git a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig
index 0b7f1c153f..01c54fa9fe 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig
@@ -375,29 +375,29 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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/dhcpd
 #
-CONFIG_EXAMPLE_DHCPD_NOMAC=y
-CONFIG_EXAMPLE_DHCPD_IPADDR=0x0a000001
-CONFIG_EXAMPLE_DHCPD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_DHCPD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_DHCPD_NOMAC=y
+CONFIG_EXAMPLES_DHCPD_IPADDR=0x0a000001
+CONFIG_EXAMPLES_DHCPD_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig b/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig
index cb78f88cc6..6d0be84007 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig
@@ -393,21 +393,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig b/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig
index 54c6828a82..a94571a835 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig
@@ -426,21 +426,21 @@ CONFIG_UG9664HSWAG01_POWER=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig b/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig
index a808333ff5..f58c78773e 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig
@@ -371,21 +371,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig b/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig
index 227bbdebdf..08d251d431 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig
@@ -403,28 +403,28 @@ CONFIG_THTTPD_URLPATTERN=n
 #
 # Additional settings for examples/thttpd
 #
-CONFIG_EXAMPLE_THTTPD_NOMAC=y
-CONFIG_EXAMPLE_THTTPD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_THTTPD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_THTTPD_NOMAC=y
+CONFIG_EXAMPLES_THTTPD_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig
index 4aca6768cd..08f4ad1cfa 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig
@@ -367,21 +367,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/mbed/hidkbd/defconfig b/nuttx/configs/mbed/hidkbd/defconfig
index edcf8e181d..3ec6912765 100644
--- a/nuttx/configs/mbed/hidkbd/defconfig
+++ b/nuttx/configs/mbed/hidkbd/defconfig
@@ -387,21 +387,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/mbed/nsh/defconfig b/nuttx/configs/mbed/nsh/defconfig
index c1a35e4b1a..dba89ec7b7 100755
--- a/nuttx/configs/mbed/nsh/defconfig
+++ b/nuttx/configs/mbed/nsh/defconfig
@@ -359,20 +359,20 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/micropendous3/hello/defconfig b/nuttx/configs/micropendous3/hello/defconfig
index 4563a12e3a..4e0ea0e997 100644
--- a/nuttx/configs/micropendous3/hello/defconfig
+++ b/nuttx/configs/micropendous3/hello/defconfig
@@ -313,21 +313,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/mirtoo/nsh/defconfig b/nuttx/configs/mirtoo/nsh/defconfig
index c210c134ba..4e3cb684e6 100644
--- a/nuttx/configs/mirtoo/nsh/defconfig
+++ b/nuttx/configs/mirtoo/nsh/defconfig
@@ -396,21 +396,21 @@ CONFIG_PGA11X_MULTIPLE=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/mirtoo/nxffs/defconfig b/nuttx/configs/mirtoo/nxffs/defconfig
index 1dbb2c02c5..31e3ef89b1 100644
--- a/nuttx/configs/mirtoo/nxffs/defconfig
+++ b/nuttx/configs/mirtoo/nxffs/defconfig
@@ -395,21 +395,21 @@ CONFIG_PGA11X_MULTIPLE=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/mirtoo/ostest/defconfig b/nuttx/configs/mirtoo/ostest/defconfig
index 702b01bc8b..a3af96fbcf 100644
--- a/nuttx/configs/mirtoo/ostest/defconfig
+++ b/nuttx/configs/mirtoo/ostest/defconfig
@@ -372,21 +372,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/mx1ads/ostest/defconfig b/nuttx/configs/mx1ads/ostest/defconfig
index c699aab510..9e425975df 100644
--- a/nuttx/configs/mx1ads/ostest/defconfig
+++ b/nuttx/configs/mx1ads/ostest/defconfig
@@ -270,20 +270,20 @@ CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/nsh
diff --git a/nuttx/configs/ne64badge/ostest/defconfig b/nuttx/configs/ne64badge/ostest/defconfig
index 59f52f6615..ee36399f15 100755
--- a/nuttx/configs/ne64badge/ostest/defconfig
+++ b/nuttx/configs/ne64badge/ostest/defconfig
@@ -317,20 +317,20 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/ntosd-dm320/nettest/defconfig b/nuttx/configs/ntosd-dm320/nettest/defconfig
index 848cf2f9da..1786380545 100644
--- a/nuttx/configs/ntosd-dm320/nettest/defconfig
+++ b/nuttx/configs/ntosd-dm320/nettest/defconfig
@@ -266,20 +266,20 @@ CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/nsh
diff --git a/nuttx/configs/ntosd-dm320/nsh/defconfig b/nuttx/configs/ntosd-dm320/nsh/defconfig
index d824f55fc2..33cf33c24c 100644
--- a/nuttx/configs/ntosd-dm320/nsh/defconfig
+++ b/nuttx/configs/ntosd-dm320/nsh/defconfig
@@ -271,20 +271,20 @@ CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/ntosd-dm320/ostest/defconfig b/nuttx/configs/ntosd-dm320/ostest/defconfig
index edc991880d..52ebe0bd9b 100644
--- a/nuttx/configs/ntosd-dm320/ostest/defconfig
+++ b/nuttx/configs/ntosd-dm320/ostest/defconfig
@@ -262,20 +262,20 @@ CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/nsh
diff --git a/nuttx/configs/ntosd-dm320/poll/defconfig b/nuttx/configs/ntosd-dm320/poll/defconfig
index 7386ff966d..f27dcc2c32 100644
--- a/nuttx/configs/ntosd-dm320/poll/defconfig
+++ b/nuttx/configs/ntosd-dm320/poll/defconfig
@@ -266,27 +266,27 @@ CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/poll
-CONFIG_EXAMPLE_POLL_NOMAC=n
-CONFIG_EXAMPLE_POLL_IPADDR=0x0a000002
-CONFIG_EXAMPLE_POLL_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_POLL_NETMASK=0xffffff00
+CONFIG_EXAMPLES_POLL_NOMAC=n
+CONFIG_EXAMPLES_POLL_IPADDR=0x0a000002
+CONFIG_EXAMPLES_POLL_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_POLL_NETMASK=0xffffff00
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/nsh
diff --git a/nuttx/configs/ntosd-dm320/thttpd/defconfig b/nuttx/configs/ntosd-dm320/thttpd/defconfig
index 90f84c5e38..becec2ef17 100644
--- a/nuttx/configs/ntosd-dm320/thttpd/defconfig
+++ b/nuttx/configs/ntosd-dm320/thttpd/defconfig
@@ -318,26 +318,26 @@ CONFIG_THTTPD_URLPATTERN=n
 #
 # Additional settings for examples/thttpd
 #
-CONFIG_EXAMPLE_THTTPD_NOMAC=n
-CONFIG_EXAMPLE_THTTPD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_THTTPD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_THTTPD_NOMAC=n
+CONFIG_EXAMPLES_THTTPD_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/nsh
diff --git a/nuttx/configs/ntosd-dm320/udp/defconfig b/nuttx/configs/ntosd-dm320/udp/defconfig
index 4bc4b4bc80..869f2e442e 100644
--- a/nuttx/configs/ntosd-dm320/udp/defconfig
+++ b/nuttx/configs/ntosd-dm320/udp/defconfig
@@ -266,28 +266,28 @@ CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/udp
-CONFIG_EXAMPLE_UDP_SERVER=n
-CONFIG_EXAMPLE_UDP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UDP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UDP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UDP_SERVERIP=0x0a000001
+CONFIG_EXAMPLES_UDP_SERVER=n
+CONFIG_EXAMPLES_UDP_IPADDR=0x0a000002
+CONFIG_EXAMPLES_UDP_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_UDP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UDP_SERVERIP=0x0a000001
 
 #
 # Settings for examples/nsh
diff --git a/nuttx/configs/ntosd-dm320/uip/defconfig b/nuttx/configs/ntosd-dm320/uip/defconfig
index 88a45f94d5..19ffe452a9 100644
--- a/nuttx/configs/ntosd-dm320/uip/defconfig
+++ b/nuttx/configs/ntosd-dm320/uip/defconfig
@@ -274,20 +274,20 @@ CONFIG_NETUTILS_HTTPD_DUMPPSTATE=n
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/nsh
diff --git a/nuttx/configs/nucleus2g/nsh/defconfig b/nuttx/configs/nucleus2g/nsh/defconfig
index 9397820cde..080c487705 100755
--- a/nuttx/configs/nucleus2g/nsh/defconfig
+++ b/nuttx/configs/nucleus2g/nsh/defconfig
@@ -381,21 +381,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/nucleus2g/ostest/defconfig b/nuttx/configs/nucleus2g/ostest/defconfig
index 848fafdbaa..02eb316339 100755
--- a/nuttx/configs/nucleus2g/ostest/defconfig
+++ b/nuttx/configs/nucleus2g/ostest/defconfig
@@ -359,20 +359,20 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/nucleus2g/usbserial/defconfig b/nuttx/configs/nucleus2g/usbserial/defconfig
index d0decf903f..300d30ab31 100755
--- a/nuttx/configs/nucleus2g/usbserial/defconfig
+++ b/nuttx/configs/nucleus2g/usbserial/defconfig
@@ -360,20 +360,20 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/nucleus2g/usbstorage/defconfig b/nuttx/configs/nucleus2g/usbstorage/defconfig
index ec79e8fd33..7887818fbc 100755
--- a/nuttx/configs/nucleus2g/usbstorage/defconfig
+++ b/nuttx/configs/nucleus2g/usbstorage/defconfig
@@ -361,20 +361,20 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig b/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig
index 3498195b11..6d1375e92c 100755
--- a/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig
@@ -433,28 +433,28 @@ CONFIG_THTTPD_URLPATTERN=n
 #
 # Additional settings for examples/thttpd
 #
-CONFIG_EXAMPLE_THTTPD_NOMAC=y
-CONFIG_EXAMPLE_THTTPD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_THTTPD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_THTTPD_NOMAC=y
+CONFIG_EXAMPLES_THTTPD_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
@@ -466,18 +466,18 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=7
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1"
-CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2"
-CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP"
-CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER"
-CONFIG_EXAMPLE_BUTTONS_NAME4="UP"
-CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=7
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="BUT1"
+CONFIG_EXAMPLES_BUTTONS_NAME1="BUT2"
+CONFIG_EXAMPLES_BUTTONS_NAME2="WAKE-UP"
+CONFIG_EXAMPLES_BUTTONS_NAME3="CENTER"
+CONFIG_EXAMPLES_BUTTONS_NAME4="UP"
+CONFIG_EXAMPLES_BUTTONS_NAME5="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME6="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="RIGHT"
 
 #
 # Settings for apps/nshlib
diff --git a/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig b/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig
index 9acf60d9d7..7c9fe4c4e5 100755
--- a/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig
@@ -397,21 +397,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
@@ -423,18 +423,18 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=7
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1"
-CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2"
-CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP"
-CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER"
-CONFIG_EXAMPLE_BUTTONS_NAME4="UP"
-CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=7
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="BUT1"
+CONFIG_EXAMPLES_BUTTONS_NAME1="BUT2"
+CONFIG_EXAMPLES_BUTTONS_NAME2="WAKE-UP"
+CONFIG_EXAMPLES_BUTTONS_NAME3="CENTER"
+CONFIG_EXAMPLES_BUTTONS_NAME4="UP"
+CONFIG_EXAMPLES_BUTTONS_NAME5="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME6="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="RIGHT"
 
 #
 # Settings for apps/nshlib
diff --git a/nuttx/configs/olimex-lpc1766stk/nettest/defconfig b/nuttx/configs/olimex-lpc1766stk/nettest/defconfig
index 040b3ecff6..628ff01124 100755
--- a/nuttx/configs/olimex-lpc1766stk/nettest/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/nettest/defconfig
@@ -376,21 +376,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
@@ -402,18 +402,18 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=7
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1"
-CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2"
-CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP"
-CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER"
-CONFIG_EXAMPLE_BUTTONS_NAME4="UP"
-CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=7
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="BUT1"
+CONFIG_EXAMPLES_BUTTONS_NAME1="BUT2"
+CONFIG_EXAMPLES_BUTTONS_NAME2="WAKE-UP"
+CONFIG_EXAMPLES_BUTTONS_NAME3="CENTER"
+CONFIG_EXAMPLES_BUTTONS_NAME4="UP"
+CONFIG_EXAMPLES_BUTTONS_NAME5="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME6="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="RIGHT"
 
 #
 # Settings for apps/nshlib
diff --git a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig
index 1324ca5d47..c2722cb9be 100755
--- a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig
@@ -420,21 +420,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
@@ -446,18 +446,18 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=7
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1"
-CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2"
-CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP"
-CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER"
-CONFIG_EXAMPLE_BUTTONS_NAME4="UP"
-CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=7
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="BUT1"
+CONFIG_EXAMPLES_BUTTONS_NAME1="BUT2"
+CONFIG_EXAMPLES_BUTTONS_NAME2="WAKE-UP"
+CONFIG_EXAMPLES_BUTTONS_NAME3="CENTER"
+CONFIG_EXAMPLES_BUTTONS_NAME4="UP"
+CONFIG_EXAMPLES_BUTTONS_NAME5="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME6="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="RIGHT"
 
 #
 # Settings for apps/nshlib
diff --git a/nuttx/configs/olimex-lpc1766stk/nx/defconfig b/nuttx/configs/olimex-lpc1766stk/nx/defconfig
index de5763c0e9..d86b8b83fd 100755
--- a/nuttx/configs/olimex-lpc1766stk/nx/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/nx/defconfig
@@ -441,21 +441,21 @@ CONFIG_LCD_MAXPOWER=127
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
@@ -467,18 +467,18 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=7
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1"
-CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2"
-CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP"
-CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER"
-CONFIG_EXAMPLE_BUTTONS_NAME4="UP"
-CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=7
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="BUT1"
+CONFIG_EXAMPLES_BUTTONS_NAME1="BUT2"
+CONFIG_EXAMPLES_BUTTONS_NAME2="WAKE-UP"
+CONFIG_EXAMPLES_BUTTONS_NAME3="CENTER"
+CONFIG_EXAMPLES_BUTTONS_NAME4="UP"
+CONFIG_EXAMPLES_BUTTONS_NAME5="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME6="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="RIGHT"
 
 #
 # Settings for apps/nshlib
diff --git a/nuttx/configs/olimex-lpc1766stk/ostest/defconfig b/nuttx/configs/olimex-lpc1766stk/ostest/defconfig
index f36f911e60..a11c022764 100755
--- a/nuttx/configs/olimex-lpc1766stk/ostest/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/ostest/defconfig
@@ -369,21 +369,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
@@ -395,18 +395,18 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=7
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1"
-CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2"
-CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP"
-CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER"
-CONFIG_EXAMPLE_BUTTONS_NAME4="UP"
-CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=7
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="BUT1"
+CONFIG_EXAMPLES_BUTTONS_NAME1="BUT2"
+CONFIG_EXAMPLES_BUTTONS_NAME2="WAKE-UP"
+CONFIG_EXAMPLES_BUTTONS_NAME3="CENTER"
+CONFIG_EXAMPLES_BUTTONS_NAME4="UP"
+CONFIG_EXAMPLES_BUTTONS_NAME5="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME6="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="RIGHT"
 
 #
 # Settings for apps/nshlib
diff --git a/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig b/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig
index a30c2b9a6c..32092d216f 100755
--- a/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig
@@ -412,28 +412,28 @@ CONFIG_THTTPD_URLPATTERN=n
 #
 # Additional settings for examples/thttpd
 #
-CONFIG_EXAMPLE_THTTPD_NOMAC=y
-CONFIG_EXAMPLE_THTTPD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_THTTPD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_THTTPD_NOMAC=y
+CONFIG_EXAMPLES_THTTPD_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
@@ -445,18 +445,18 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=7
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1"
-CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2"
-CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP"
-CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER"
-CONFIG_EXAMPLE_BUTTONS_NAME4="UP"
-CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=7
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="BUT1"
+CONFIG_EXAMPLES_BUTTONS_NAME1="BUT2"
+CONFIG_EXAMPLES_BUTTONS_NAME2="WAKE-UP"
+CONFIG_EXAMPLES_BUTTONS_NAME3="CENTER"
+CONFIG_EXAMPLES_BUTTONS_NAME4="UP"
+CONFIG_EXAMPLES_BUTTONS_NAME5="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME6="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="RIGHT"
 
 #
 # Settings for apps/nshlib
diff --git a/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig b/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig
index 1c287cfca9..94ac19f42e 100755
--- a/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig
@@ -407,28 +407,28 @@ CONFIG_THTTPD_URLPATTERN=n
 #
 # Additional settings for examples/thttpd
 #
-CONFIG_EXAMPLE_THTTPD_NOMAC=y
-CONFIG_EXAMPLE_THTTPD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_THTTPD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_THTTPD_NOMAC=y
+CONFIG_EXAMPLES_THTTPD_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
@@ -440,18 +440,18 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=7
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1"
-CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2"
-CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP"
-CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER"
-CONFIG_EXAMPLE_BUTTONS_NAME4="UP"
-CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=7
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="BUT1"
+CONFIG_EXAMPLES_BUTTONS_NAME1="BUT2"
+CONFIG_EXAMPLES_BUTTONS_NAME2="WAKE-UP"
+CONFIG_EXAMPLES_BUTTONS_NAME3="CENTER"
+CONFIG_EXAMPLES_BUTTONS_NAME4="UP"
+CONFIG_EXAMPLES_BUTTONS_NAME5="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME6="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="RIGHT"
 
 #
 # Settings for apps/nshlib
diff --git a/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig b/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig
index 4ead7ffebe..2bd892cc30 100755
--- a/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig
@@ -370,21 +370,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
@@ -396,18 +396,18 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=7
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1"
-CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2"
-CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP"
-CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER"
-CONFIG_EXAMPLE_BUTTONS_NAME4="UP"
-CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=7
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="BUT1"
+CONFIG_EXAMPLES_BUTTONS_NAME1="BUT2"
+CONFIG_EXAMPLES_BUTTONS_NAME2="WAKE-UP"
+CONFIG_EXAMPLES_BUTTONS_NAME3="CENTER"
+CONFIG_EXAMPLES_BUTTONS_NAME4="UP"
+CONFIG_EXAMPLES_BUTTONS_NAME5="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME6="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="RIGHT"
 
 #
 # Settings for apps/nshlib
diff --git a/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig b/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig
index 53cf8001c5..8b55cc94d8 100755
--- a/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig
@@ -371,21 +371,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
@@ -397,18 +397,18 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=7
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="BUT1"
-CONFIG_EXAMPLE_BUTTONS_NAME1="BUT2"
-CONFIG_EXAMPLE_BUTTONS_NAME2="WAKE-UP"
-CONFIG_EXAMPLE_BUTTONS_NAME3="CENTER"
-CONFIG_EXAMPLE_BUTTONS_NAME4="UP"
-CONFIG_EXAMPLE_BUTTONS_NAME5="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME6="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=7
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="BUT1"
+CONFIG_EXAMPLES_BUTTONS_NAME1="BUT2"
+CONFIG_EXAMPLES_BUTTONS_NAME2="WAKE-UP"
+CONFIG_EXAMPLES_BUTTONS_NAME3="CENTER"
+CONFIG_EXAMPLES_BUTTONS_NAME4="UP"
+CONFIG_EXAMPLES_BUTTONS_NAME5="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME6="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="RIGHT"
 
 #
 # Settings for apps/nshlib
diff --git a/nuttx/configs/olimex-lpc1766stk/wlan/defconfig b/nuttx/configs/olimex-lpc1766stk/wlan/defconfig
index 0df5f2cf72..4d73807e0c 100755
--- a/nuttx/configs/olimex-lpc1766stk/wlan/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/wlan/defconfig
@@ -390,30 +390,30 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for apps/examples/wlan
 #
-CONFIG_EXAMPLE_WLAN_DHCPC=n
-CONFIG_EXAMPLE_WLAN_NOMAC=n
-CONFIG_EXAMPLE_WLAN_IPADDR=0xc0a800c9
-CONFIG_EXAMPLE_WLAN_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_WLAN_NETMASK=0xffffff00
+CONFIG_EXAMPLES_WLAN_DHCPC=n
+CONFIG_EXAMPLES_WLAN_NOMAC=n
+CONFIG_EXAMPLES_WLAN_IPADDR=0xc0a800c9
+CONFIG_EXAMPLES_WLAN_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_WLAN_NETMASK=0xffffff00
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/olimex-stm32-p107/nsh/defconfig b/nuttx/configs/olimex-stm32-p107/nsh/defconfig
index e3fb69ca2e..67a153f9a2 100644
--- a/nuttx/configs/olimex-stm32-p107/nsh/defconfig
+++ b/nuttx/configs/olimex-stm32-p107/nsh/defconfig
@@ -443,20 +443,20 @@ CONFIG_WATCHDOG=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/olimex-stm32-p107/ostest/defconfig b/nuttx/configs/olimex-stm32-p107/ostest/defconfig
index 36fade11bb..26a8470d26 100644
--- a/nuttx/configs/olimex-stm32-p107/ostest/defconfig
+++ b/nuttx/configs/olimex-stm32-p107/ostest/defconfig
@@ -420,20 +420,20 @@ CONFIG_WATCHDOG=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/olimex-strp711/nettest/defconfig b/nuttx/configs/olimex-strp711/nettest/defconfig
index e8455ab941..c401fe8c69 100755
--- a/nuttx/configs/olimex-strp711/nettest/defconfig
+++ b/nuttx/configs/olimex-strp711/nettest/defconfig
@@ -338,13 +338,13 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/nettest
 #
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/pcblogic-pic32mx/nsh/defconfig b/nuttx/configs/pcblogic-pic32mx/nsh/defconfig
index 09febe7b1d..1e439e4667 100644
--- a/nuttx/configs/pcblogic-pic32mx/nsh/defconfig
+++ b/nuttx/configs/pcblogic-pic32mx/nsh/defconfig
@@ -373,21 +373,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/pcblogic-pic32mx/ostest/defconfig b/nuttx/configs/pcblogic-pic32mx/ostest/defconfig
index dc76a54bb4..868ba46695 100644
--- a/nuttx/configs/pcblogic-pic32mx/ostest/defconfig
+++ b/nuttx/configs/pcblogic-pic32mx/ostest/defconfig
@@ -363,21 +363,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/pic32-starterkit/nsh/defconfig b/nuttx/configs/pic32-starterkit/nsh/defconfig
index 5c19d2e439..17cb151a76 100644
--- a/nuttx/configs/pic32-starterkit/nsh/defconfig
+++ b/nuttx/configs/pic32-starterkit/nsh/defconfig
@@ -537,21 +537,21 @@ CONFIG_NX_MXCLIENTMSGS=16
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/pic32-starterkit/nsh2/defconfig b/nuttx/configs/pic32-starterkit/nsh2/defconfig
index 8d9bd8e271..c751591b21 100644
--- a/nuttx/configs/pic32-starterkit/nsh2/defconfig
+++ b/nuttx/configs/pic32-starterkit/nsh2/defconfig
@@ -536,21 +536,21 @@ CONFIG_NX_MXCLIENTMSGS=16
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/pic32-starterkit/ostest/defconfig b/nuttx/configs/pic32-starterkit/ostest/defconfig
index 687b63970a..c8e32419ea 100644
--- a/nuttx/configs/pic32-starterkit/ostest/defconfig
+++ b/nuttx/configs/pic32-starterkit/ostest/defconfig
@@ -534,21 +534,21 @@ CONFIG_NX_MXCLIENTMSGS=16
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/pic32mx7mmb/nsh/defconfig b/nuttx/configs/pic32mx7mmb/nsh/defconfig
index bb95316943..0523636563 100644
--- a/nuttx/configs/pic32mx7mmb/nsh/defconfig
+++ b/nuttx/configs/pic32mx7mmb/nsh/defconfig
@@ -583,21 +583,21 @@ CONFIG_LCD_RPORTRAIT=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/pic32mx7mmb/ostest/defconfig b/nuttx/configs/pic32mx7mmb/ostest/defconfig
index a14fa99480..851f6022f2 100644
--- a/nuttx/configs/pic32mx7mmb/ostest/defconfig
+++ b/nuttx/configs/pic32mx7mmb/ostest/defconfig
@@ -534,21 +534,21 @@ CONFIG_NX_MXCLIENTMSGS=16
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/qemu-i486/nsh/defconfig b/nuttx/configs/qemu-i486/nsh/defconfig
index 72e97539a3..9085eb5fa4 100644
--- a/nuttx/configs/qemu-i486/nsh/defconfig
+++ b/nuttx/configs/qemu-i486/nsh/defconfig
@@ -250,20 +250,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/qemu-i486/ostest/defconfig b/nuttx/configs/qemu-i486/ostest/defconfig
index 3f87e11cd8..a9867fdc98 100644
--- a/nuttx/configs/qemu-i486/ostest/defconfig
+++ b/nuttx/configs/qemu-i486/ostest/defconfig
@@ -182,20 +182,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/rgmp/arm/default/defconfig b/nuttx/configs/rgmp/arm/default/defconfig
index d722dd5e77..186c687248 100644
--- a/nuttx/configs/rgmp/arm/default/defconfig
+++ b/nuttx/configs/rgmp/arm/default/defconfig
@@ -181,20 +181,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80a02
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80a01
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80a02
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80a01
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
 
 #
 # Settings for examples/nsh
diff --git a/nuttx/configs/rgmp/arm/nsh/defconfig b/nuttx/configs/rgmp/arm/nsh/defconfig
index 279437d477..8fbbc7b8b4 100644
--- a/nuttx/configs/rgmp/arm/nsh/defconfig
+++ b/nuttx/configs/rgmp/arm/nsh/defconfig
@@ -181,20 +181,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
 
 #
 # Settings for apps/nshlib
diff --git a/nuttx/configs/rgmp/x86/default/defconfig b/nuttx/configs/rgmp/x86/default/defconfig
index 4e37d90922..9b4b58d89c 100644
--- a/nuttx/configs/rgmp/x86/default/defconfig
+++ b/nuttx/configs/rgmp/x86/default/defconfig
@@ -181,20 +181,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80a02
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80a01
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80a02
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80a01
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
 
 #
 # Settings for examples/nsh
diff --git a/nuttx/configs/rgmp/x86/nsh/defconfig b/nuttx/configs/rgmp/x86/nsh/defconfig
index 363ef609da..7af320ff72 100644
--- a/nuttx/configs/rgmp/x86/nsh/defconfig
+++ b/nuttx/configs/rgmp/x86/nsh/defconfig
@@ -181,20 +181,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
 
 #
 # Settings for apps/nshlib
diff --git a/nuttx/configs/sam3u-ek/knsh/defconfig b/nuttx/configs/sam3u-ek/knsh/defconfig
index 82616f338a..9aba512edf 100755
--- a/nuttx/configs/sam3u-ek/knsh/defconfig
+++ b/nuttx/configs/sam3u-ek/knsh/defconfig
@@ -395,20 +395,20 @@ CONFIG_NX_MXCLIENTMSGS=16
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/sam3u-ek/nsh/defconfig b/nuttx/configs/sam3u-ek/nsh/defconfig
index 56071d2230..02b9804183 100755
--- a/nuttx/configs/sam3u-ek/nsh/defconfig
+++ b/nuttx/configs/sam3u-ek/nsh/defconfig
@@ -370,20 +370,20 @@ CONFIG_NX_MXCLIENTMSGS=16
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/sam3u-ek/nx/defconfig b/nuttx/configs/sam3u-ek/nx/defconfig
index 943c47cfcc..82e9e3cbc4 100755
--- a/nuttx/configs/sam3u-ek/nx/defconfig
+++ b/nuttx/configs/sam3u-ek/nx/defconfig
@@ -379,20 +379,20 @@ CONFIG_NX_MXCLIENTMSGS=16
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/sam3u-ek/ostest/defconfig b/nuttx/configs/sam3u-ek/ostest/defconfig
index 098fc3600a..da582acb65 100755
--- a/nuttx/configs/sam3u-ek/ostest/defconfig
+++ b/nuttx/configs/sam3u-ek/ostest/defconfig
@@ -370,20 +370,20 @@ CONFIG_NX_MXCLIENTMSGS=16
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/sam3u-ek/touchscreen/defconfig b/nuttx/configs/sam3u-ek/touchscreen/defconfig
index 2165dec4bc..f3ced72cc4 100755
--- a/nuttx/configs/sam3u-ek/touchscreen/defconfig
+++ b/nuttx/configs/sam3u-ek/touchscreen/defconfig
@@ -410,20 +410,20 @@ CONFIG_LCD_PORTRAIT=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/shenzhou/nsh/defconfig b/nuttx/configs/shenzhou/nsh/defconfig
index 21b7fcf906..fdc065c48e 100644
--- a/nuttx/configs/shenzhou/nsh/defconfig
+++ b/nuttx/configs/shenzhou/nsh/defconfig
@@ -694,7 +694,7 @@ CONFIG_EXAMPLES_NSH=y
 #
 # UDP Discovery Daemon Example
 #
-# CONFIG_EXAMPLE_DISCOVER is not set
+# CONFIG_EXAMPLES_DISCOVER is not set
 
 #
 # uIP Web Server Example
diff --git a/nuttx/configs/shenzhou/nxwm/defconfig b/nuttx/configs/shenzhou/nxwm/defconfig
index 0bdc9f45c9..e4316d1fe7 100644
--- a/nuttx/configs/shenzhou/nxwm/defconfig
+++ b/nuttx/configs/shenzhou/nxwm/defconfig
@@ -794,7 +794,7 @@ CONFIG_NAMEDAPP=y
 #
 # UDP Discovery Daemon Example
 #
-# CONFIG_EXAMPLE_DISCOVER is not set
+# CONFIG_EXAMPLES_DISCOVER is not set
 
 #
 # uIP Web Server Example
diff --git a/nuttx/configs/sim/README.txt b/nuttx/configs/sim/README.txt
index b8a921e7f4..ee262e49a5 100644
--- a/nuttx/configs/sim/README.txt
+++ b/nuttx/configs/sim/README.txt
@@ -221,7 +221,7 @@ nettest
 
     NOTE that the IP address is hard-coded in arch/sim/src/up_wpcap.c.
     You will either need to edit your configuration files to use 10.0.0.1
-    on the "target" (CONFIG_EXAMPLE_NETTEST_*) or edit up_wpcap.c to
+    on the "target" (CONFIG_EXAMPLES_NETTEST_*) or edit up_wpcap.c to
     select the IP address that you want to use.
 
 nsh
diff --git a/nuttx/configs/sim/mount/defconfig b/nuttx/configs/sim/mount/defconfig
index f5d28054fc..b980b38dda 100644
--- a/nuttx/configs/sim/mount/defconfig
+++ b/nuttx/configs/sim/mount/defconfig
@@ -173,20 +173,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/sim/nettest/defconfig b/nuttx/configs/sim/nettest/defconfig
index 83de44c368..d724046409 100644
--- a/nuttx/configs/sim/nettest/defconfig
+++ b/nuttx/configs/sim/nettest/defconfig
@@ -173,20 +173,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/sim/nsh/defconfig b/nuttx/configs/sim/nsh/defconfig
index 3f0ceab26a..cd1fc8c7b3 100644
--- a/nuttx/configs/sim/nsh/defconfig
+++ b/nuttx/configs/sim/nsh/defconfig
@@ -202,20 +202,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/sim/nsh2/defconfig b/nuttx/configs/sim/nsh2/defconfig
index f6f36bf51c..787e388c7d 100644
--- a/nuttx/configs/sim/nsh2/defconfig
+++ b/nuttx/configs/sim/nsh2/defconfig
@@ -250,21 +250,21 @@ CONFIG_NX_MXCLIENTMSGS=16
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
 #
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/sim/nx/defconfig b/nuttx/configs/sim/nx/defconfig
index 34d86f3849..5b48d72a71 100644
--- a/nuttx/configs/sim/nx/defconfig
+++ b/nuttx/configs/sim/nx/defconfig
@@ -228,21 +228,21 @@ CONFIG_NXCONSOLE_MXCHARS=256
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
 #
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/sim/nx11/defconfig b/nuttx/configs/sim/nx11/defconfig
index 8734ebc69c..43d57bd50a 100644
--- a/nuttx/configs/sim/nx11/defconfig
+++ b/nuttx/configs/sim/nx11/defconfig
@@ -235,21 +235,21 @@ CONFIG_NXCONSOLE_MXCHARS=256
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
 #
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/sim/nxffs/defconfig b/nuttx/configs/sim/nxffs/defconfig
index 22746a2f60..c30227bd84 100644
--- a/nuttx/configs/sim/nxffs/defconfig
+++ b/nuttx/configs/sim/nxffs/defconfig
@@ -174,20 +174,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/sim/nxwm/defconfig b/nuttx/configs/sim/nxwm/defconfig
index 812233cbfe..d34202e05c 100644
--- a/nuttx/configs/sim/nxwm/defconfig
+++ b/nuttx/configs/sim/nxwm/defconfig
@@ -283,21 +283,21 @@ CONFIG_NXCONSOLE_MXCHARS=256
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
 #
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/sim/ostest/defconfig b/nuttx/configs/sim/ostest/defconfig
index 92c696dc61..0d3669a25b 100644
--- a/nuttx/configs/sim/ostest/defconfig
+++ b/nuttx/configs/sim/ostest/defconfig
@@ -173,20 +173,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/sim/pashello/defconfig b/nuttx/configs/sim/pashello/defconfig
index 57530d3bbc..e3cf3a7b5b 100644
--- a/nuttx/configs/sim/pashello/defconfig
+++ b/nuttx/configs/sim/pashello/defconfig
@@ -173,20 +173,20 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
 
 #
 # Settings for examples/nsh
diff --git a/nuttx/configs/sim/touchscreen/defconfig b/nuttx/configs/sim/touchscreen/defconfig
index b9630c8e2c..b112449b39 100644
--- a/nuttx/configs/sim/touchscreen/defconfig
+++ b/nuttx/configs/sim/touchscreen/defconfig
@@ -224,20 +224,20 @@ CONFIG_NX_MXCLIENTMSGS=16
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0xc0a80080
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0xc0a80001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0xc0a8006a
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80080
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0xc0a80001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0xc0a8006a
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/skp16c26/ostest/defconfig b/nuttx/configs/skp16c26/ostest/defconfig
index 91917f8f08..8cb2eb4691 100644
--- a/nuttx/configs/skp16c26/ostest/defconfig
+++ b/nuttx/configs/skp16c26/ostest/defconfig
@@ -266,20 +266,20 @@ CONFIG_USBMSC_REMOVABLE=y
 
 #
 # Settings for examples/uip
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/nsh
diff --git a/nuttx/configs/stm3210e-eval/RIDE/defconfig b/nuttx/configs/stm3210e-eval/RIDE/defconfig
index a5b60fe4e3..f4593d5ea0 100755
--- a/nuttx/configs/stm3210e-eval/RIDE/defconfig
+++ b/nuttx/configs/stm3210e-eval/RIDE/defconfig
@@ -378,20 +378,20 @@ CONFIG_WATCHDOG=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/stm3210e-eval/buttons/defconfig b/nuttx/configs/stm3210e-eval/buttons/defconfig
index fbfac0dc64..ac3f108874 100644
--- a/nuttx/configs/stm3210e-eval/buttons/defconfig
+++ b/nuttx/configs/stm3210e-eval/buttons/defconfig
@@ -389,36 +389,36 @@ CONFIG_WATCHDOG=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=7
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=2
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="WAKEUP"
-CONFIG_EXAMPLE_BUTTONS_NAME1="TAMPER"
-CONFIG_EXAMPLE_BUTTONS_NAME2="KEY"
-CONFIG_EXAMPLE_BUTTONS_NAME3="SELECT"
-CONFIG_EXAMPLE_BUTTONS_NAME4="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME5="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME6="RIGHT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="UP"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=7
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=2
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="WAKEUP"
+CONFIG_EXAMPLES_BUTTONS_NAME1="TAMPER"
+CONFIG_EXAMPLES_BUTTONS_NAME2="KEY"
+CONFIG_EXAMPLES_BUTTONS_NAME3="SELECT"
+CONFIG_EXAMPLES_BUTTONS_NAME4="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME5="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME6="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="UP"
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/stm3210e-eval/composite/defconfig b/nuttx/configs/stm3210e-eval/composite/defconfig
index 84ed18494a..18c2164d36 100755
--- a/nuttx/configs/stm3210e-eval/composite/defconfig
+++ b/nuttx/configs/stm3210e-eval/composite/defconfig
@@ -438,20 +438,20 @@ CONFIG_COMPOSITE_VERSIONNO=0x0101
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/stm3210e-eval/nsh/defconfig b/nuttx/configs/stm3210e-eval/nsh/defconfig
index 27d26ff731..facfe105a1 100755
--- a/nuttx/configs/stm3210e-eval/nsh/defconfig
+++ b/nuttx/configs/stm3210e-eval/nsh/defconfig
@@ -389,20 +389,20 @@ CONFIG_WATCHDOG=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/stm3210e-eval/nsh2/defconfig b/nuttx/configs/stm3210e-eval/nsh2/defconfig
index d4fa891fb3..c30691cc98 100644
--- a/nuttx/configs/stm3210e-eval/nsh2/defconfig
+++ b/nuttx/configs/stm3210e-eval/nsh2/defconfig
@@ -538,20 +538,20 @@ CONFIG_LCD_PWM=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/stm3210e-eval/nx/defconfig b/nuttx/configs/stm3210e-eval/nx/defconfig
index cab297583b..0833e7a787 100644
--- a/nuttx/configs/stm3210e-eval/nx/defconfig
+++ b/nuttx/configs/stm3210e-eval/nx/defconfig
@@ -462,20 +462,20 @@ CONFIG_LCD_PWM=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/stm3210e-eval/nxconsole/defconfig b/nuttx/configs/stm3210e-eval/nxconsole/defconfig
index 35ba0dcc1d..637967efc5 100644
--- a/nuttx/configs/stm3210e-eval/nxconsole/defconfig
+++ b/nuttx/configs/stm3210e-eval/nxconsole/defconfig
@@ -463,20 +463,20 @@ CONFIG_LCD_PWM=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/stm3210e-eval/nxlines/defconfig b/nuttx/configs/stm3210e-eval/nxlines/defconfig
index b81f4127ca..0a124407af 100644
--- a/nuttx/configs/stm3210e-eval/nxlines/defconfig
+++ b/nuttx/configs/stm3210e-eval/nxlines/defconfig
@@ -461,20 +461,20 @@ CONFIG_LCD_PWM=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/stm3210e-eval/nxtext/defconfig b/nuttx/configs/stm3210e-eval/nxtext/defconfig
index 22dd209a92..14e20946e4 100644
--- a/nuttx/configs/stm3210e-eval/nxtext/defconfig
+++ b/nuttx/configs/stm3210e-eval/nxtext/defconfig
@@ -461,20 +461,20 @@ CONFIG_LCD_PWM=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/stm3210e-eval/ostest/defconfig b/nuttx/configs/stm3210e-eval/ostest/defconfig
index 7a2e5b528c..8585235ec4 100755
--- a/nuttx/configs/stm3210e-eval/ostest/defconfig
+++ b/nuttx/configs/stm3210e-eval/ostest/defconfig
@@ -398,20 +398,20 @@ CONFIG_WATCHDOG=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/stm3210e-eval/pm/defconfig b/nuttx/configs/stm3210e-eval/pm/defconfig
index 6ca7cda871..f7ae420e4f 100644
--- a/nuttx/configs/stm3210e-eval/pm/defconfig
+++ b/nuttx/configs/stm3210e-eval/pm/defconfig
@@ -569,34 +569,34 @@ CONFIG_LCD_PWM=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLE_BUTTONS_NAME0="WAKEUP"
-CONFIG_EXAMPLE_BUTTONS_NAME1="TAMPER"
-CONFIG_EXAMPLE_BUTTONS_NAME2="KEY"
-CONFIG_EXAMPLE_BUTTONS_NAME3="SELECT"
-CONFIG_EXAMPLE_BUTTONS_NAME4="DOWN"
-CONFIG_EXAMPLE_BUTTONS_NAME5="LEFT"
-CONFIG_EXAMPLE_BUTTONS_NAME6="RIGHT"
-CONFIG_EXAMPLE_BUTTONS_NAME7="UP"
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
+CONFIG_EXAMPLES_BUTTONS_NAME0="WAKEUP"
+CONFIG_EXAMPLES_BUTTONS_NAME1="TAMPER"
+CONFIG_EXAMPLES_BUTTONS_NAME2="KEY"
+CONFIG_EXAMPLES_BUTTONS_NAME3="SELECT"
+CONFIG_EXAMPLES_BUTTONS_NAME4="DOWN"
+CONFIG_EXAMPLES_BUTTONS_NAME5="LEFT"
+CONFIG_EXAMPLES_BUTTONS_NAME6="RIGHT"
+CONFIG_EXAMPLES_BUTTONS_NAME7="UP"
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/stm3210e-eval/usbserial/defconfig b/nuttx/configs/stm3210e-eval/usbserial/defconfig
index 99a5e25728..ac3ff1c9a3 100755
--- a/nuttx/configs/stm3210e-eval/usbserial/defconfig
+++ b/nuttx/configs/stm3210e-eval/usbserial/defconfig
@@ -413,20 +413,20 @@ CONFIG_WATCHDOG=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/stm3210e-eval/usbstorage/defconfig b/nuttx/configs/stm3210e-eval/usbstorage/defconfig
index 812226ee6d..160d952370 100755
--- a/nuttx/configs/stm3210e-eval/usbstorage/defconfig
+++ b/nuttx/configs/stm3210e-eval/usbstorage/defconfig
@@ -395,20 +395,20 @@ CONFIG_WATCHDOG=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/stm3220g-eval/README.txt b/nuttx/configs/stm3220g-eval/README.txt
index 89c6b92330..22038893e6 100644
--- a/nuttx/configs/stm3220g-eval/README.txt
+++ b/nuttx/configs/stm3220g-eval/README.txt
@@ -724,11 +724,11 @@ Where <subdir> is one of the following:
     using the STM32's Ethernet controller. It uses apps/examples/nettest to excercise the
     TCP/IP network.
 
-    CONFIG_EXAMPLE_NETTEST_SERVER=n                       : Target is configured as the client
-    CONFIG_EXAMPLE_NETTEST_PERFORMANCE=y                  : Only network performance is verified.
-    CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2)   : Target side is IP: 10.0.0.2
-    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.
+    CONFIG_EXAMPLES_NETTEST_SERVER=n                       : Target is configured as the client
+    CONFIG_EXAMPLES_NETTEST_PERFORMANCE=y                  : Only network performance is verified.
+    CONFIG_EXAMPLES_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2)   : Target side is IP: 10.0.0.2
+    CONFIG_EXAMPLES_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) : Host side is IP: 10.0.0.1
+    CONFIG_EXAMPLES_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) : Server address used by which ever is client.
 
   nsh:
   ---
diff --git a/nuttx/configs/stm3220g-eval/dhcpd/defconfig b/nuttx/configs/stm3220g-eval/dhcpd/defconfig
index d011a3bfb0..762607bd05 100644
--- a/nuttx/configs/stm3220g-eval/dhcpd/defconfig
+++ b/nuttx/configs/stm3220g-eval/dhcpd/defconfig
@@ -523,28 +523,28 @@ CONFIG_NX_MXCLIENTMSGS=16
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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/dhcpd
 #
-CONFIG_EXAMPLE_DHCPD_NOMAC=y
-CONFIG_EXAMPLE_DHCPD_IPADDR=0x0a000001
-CONFIG_EXAMPLE_DHCPD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_DHCPD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_DHCPD_NOMAC=y
+CONFIG_EXAMPLES_DHCPD_IPADDR=0x0a000001
+CONFIG_EXAMPLES_DHCPD_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/stm3220g-eval/nettest/defconfig b/nuttx/configs/stm3220g-eval/nettest/defconfig
index 48a7982c2a..9262e8c24e 100644
--- a/nuttx/configs/stm3220g-eval/nettest/defconfig
+++ b/nuttx/configs/stm3220g-eval/nettest/defconfig
@@ -523,21 +523,21 @@ CONFIG_NX_MXCLIENTMSGS=16
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=y
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=y
+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
diff --git a/nuttx/configs/stm3220g-eval/nsh/defconfig b/nuttx/configs/stm3220g-eval/nsh/defconfig
index 1f8cac1f14..ca1d914de2 100644
--- a/nuttx/configs/stm3220g-eval/nsh/defconfig
+++ b/nuttx/configs/stm3220g-eval/nsh/defconfig
@@ -639,20 +639,20 @@ CONFIG_STM32_ILI9325_DISABLE=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/stm3220g-eval/nsh2/defconfig b/nuttx/configs/stm3220g-eval/nsh2/defconfig
index 8462ef3766..324c920d72 100644
--- a/nuttx/configs/stm3220g-eval/nsh2/defconfig
+++ b/nuttx/configs/stm3220g-eval/nsh2/defconfig
@@ -626,20 +626,20 @@ CONFIG_STM32_ILI9325_DISABLE=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/stm3220g-eval/nxwm/defconfig b/nuttx/configs/stm3220g-eval/nxwm/defconfig
index 83c2f48417..41f365257e 100644
--- a/nuttx/configs/stm3220g-eval/nxwm/defconfig
+++ b/nuttx/configs/stm3220g-eval/nxwm/defconfig
@@ -670,20 +670,20 @@ CONFIG_STM32_ILI9325_DISABLE=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/stm3220g-eval/ostest/defconfig b/nuttx/configs/stm3220g-eval/ostest/defconfig
index 5fc04f03c3..b8663a72a9 100644
--- a/nuttx/configs/stm3220g-eval/ostest/defconfig
+++ b/nuttx/configs/stm3220g-eval/ostest/defconfig
@@ -529,20 +529,20 @@ CONFIG_STM32_ILI9325_DISABLE=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
@@ -661,13 +661,13 @@ CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=2
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=2
-CONFIG_EXAMPLE_BUTTONS_NAME0="Key/Select"
-CONFIG_EXAMPLE_BUTTONS_NAME1="Left/Right"
-CONFIG_EXAMPLE_BUTTONS_NAME2="Up/Down"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=2
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=2
+CONFIG_EXAMPLES_BUTTONS_NAME0="Key/Select"
+CONFIG_EXAMPLES_BUTTONS_NAME1="Left/Right"
+CONFIG_EXAMPLES_BUTTONS_NAME2="Up/Down"
 
 #
 # I2C tool settings
diff --git a/nuttx/configs/stm3220g-eval/telnetd/defconfig b/nuttx/configs/stm3220g-eval/telnetd/defconfig
index e369a522ef..28670bb476 100644
--- a/nuttx/configs/stm3220g-eval/telnetd/defconfig
+++ b/nuttx/configs/stm3220g-eval/telnetd/defconfig
@@ -523,21 +523,21 @@ CONFIG_NX_MXCLIENTMSGS=16
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=y
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=y
+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/telnetd
@@ -546,10 +546,10 @@ CONFIG_EXAMPLES_TELNETD_DAEMONPRIO=128
 CONFIG_EXAMPLES_TELNETD_DAEMONSTACKSIZE=2048
 CONFIG_EXAMPLES_TELNETD_CLIENTPRIO=128
 CONFIG_EXAMPLES_TELNETD_CLIENTSTACKSIZE=2048
-CONFIG_EXAMPLE_TELNETD_NOMAC=y
-CONFIG_EXAMPLE_TELNETD_IPADDR=0x0a000002
-CONFIG_EXAMPLE_TELNETD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_TELNETD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_TELNETD_NOMAC=y
+CONFIG_EXAMPLES_TELNETD_IPADDR=0x0a000002
+CONFIG_EXAMPLES_TELNETD_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_TELNETD_NETMASK=0xffffff00
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/stm3240g-eval/README.txt b/nuttx/configs/stm3240g-eval/README.txt
index b536097a88..a1a596bae2 100644
--- a/nuttx/configs/stm3240g-eval/README.txt
+++ b/nuttx/configs/stm3240g-eval/README.txt
@@ -893,10 +893,10 @@ Where <subdir> is one of the following:
     Configuration settings that you may need to change for your
     environment:
 
-      CONFIG_STM32_CODESOURCERYL=y    - CodeSourcery for Linux
-      CONFIG_EXAMPLE_DISCOVER_DHCPC=y - DHCP Client
-      CONFIG_EXAMPLE_DISCOVER_IPADDR  - (not defined)
-      CONFIG_EXAMPLE_DISCOVER_DRIPADDR - Router IP address
+      CONFIG_STM32_CODESOURCERYL=y      - CodeSourcery for Linux
+      CONFIG_EXAMPLES_DISCOVER_DHCPC=y  - DHCP Client
+      CONFIG_EXAMPLES_DISCOVER_IPADDR   - (not defined)
+      CONFIG_EXAMPLES_DISCOVER_DRIPADDR - Router IP address
 
     NOTE:  This configuration uses to the mconf configuration tool to control
     the configuration.  See the section entitled "NuttX Configuration Tool"
@@ -909,11 +909,11 @@ Where <subdir> is one of the following:
     using the STM32's Ethernet controller. It uses apps/examples/nettest to excercise the
     TCP/IP network.
 
-    CONFIG_EXAMPLE_NETTEST_SERVER=n                       : Target is configured as the client
-    CONFIG_EXAMPLE_NETTEST_PERFORMANCE=y                  : Only network performance is verified.
-    CONFIG_EXAMPLE_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2)   : Target side is IP: 10.0.0.2
-    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.
+    CONFIG_EXAMPLES_NETTEST_SERVER=n                       : Target is configured as the client
+    CONFIG_EXAMPLES_NETTEST_PERFORMANCE=y                  : Only network performance is verified.
+    CONFIG_EXAMPLES_NETTEST_IPADDR=(10<<24|0<<16|0<<8|2)   : Target side is IP: 10.0.0.2
+    CONFIG_EXAMPLES_NETTEST_DRIPADDR=(10<<24|0<<16|0<<8|1) : Host side is IP: 10.0.0.1
+    CONFIG_EXAMPLES_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1) : Server address used by which ever is client.
 
   nsh:
   ---
diff --git a/nuttx/configs/stm3240g-eval/dhcpd/defconfig b/nuttx/configs/stm3240g-eval/dhcpd/defconfig
index 842e0c66be..e33b62f871 100644
--- a/nuttx/configs/stm3240g-eval/dhcpd/defconfig
+++ b/nuttx/configs/stm3240g-eval/dhcpd/defconfig
@@ -536,28 +536,28 @@ CONFIG_NX_MXCLIENTMSGS=16
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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/dhcpd
 #
-CONFIG_EXAMPLE_DHCPD_NOMAC=y
-CONFIG_EXAMPLE_DHCPD_IPADDR=0x0a000001
-CONFIG_EXAMPLE_DHCPD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_DHCPD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_DHCPD_NOMAC=y
+CONFIG_EXAMPLES_DHCPD_IPADDR=0x0a000001
+CONFIG_EXAMPLES_DHCPD_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/stm3240g-eval/discover/defconfig b/nuttx/configs/stm3240g-eval/discover/defconfig
index 12075b8915..7c1163b9b4 100644
--- a/nuttx/configs/stm3240g-eval/discover/defconfig
+++ b/nuttx/configs/stm3240g-eval/discover/defconfig
@@ -714,11 +714,11 @@ CONFIG_HAVE_CXXINITIALIZE=y
 #
 # UDP Discovery Daemon Example
 #
-CONFIG_EXAMPLE_DISCOVER=y
-CONFIG_EXAMPLE_DISCOVER_DHCPC=y
-CONFIG_EXAMPLE_DISCOVER_NOMAC=y
-CONFIG_EXAMPLE_DISCOVER_DRIPADDR=0xc0a80201
-CONFIG_EXAMPLE_DISCOVER_NETMASK=0xffffff00
+CONFIG_EXAMPLES_DISCOVER=y
+CONFIG_EXAMPLES_DISCOVER_DHCPC=y
+CONFIG_EXAMPLES_DISCOVER_NOMAC=y
+CONFIG_EXAMPLES_DISCOVER_DRIPADDR=0xc0a80201
+CONFIG_EXAMPLES_DISCOVER_NETMASK=0xffffff00
 
 #
 # uIP Web Server Example
diff --git a/nuttx/configs/stm3240g-eval/nettest/defconfig b/nuttx/configs/stm3240g-eval/nettest/defconfig
index 55ac141577..813912b848 100644
--- a/nuttx/configs/stm3240g-eval/nettest/defconfig
+++ b/nuttx/configs/stm3240g-eval/nettest/defconfig
@@ -536,21 +536,21 @@ CONFIG_NX_MXCLIENTMSGS=16
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=y
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=y
+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
diff --git a/nuttx/configs/stm3240g-eval/nsh/defconfig b/nuttx/configs/stm3240g-eval/nsh/defconfig
index 653538b45a..8c7c290782 100644
--- a/nuttx/configs/stm3240g-eval/nsh/defconfig
+++ b/nuttx/configs/stm3240g-eval/nsh/defconfig
@@ -639,20 +639,20 @@ CONFIG_STM32_ILI9325_DISABLE=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/stm3240g-eval/nsh2/defconfig b/nuttx/configs/stm3240g-eval/nsh2/defconfig
index 9d25910681..53b0896d81 100644
--- a/nuttx/configs/stm3240g-eval/nsh2/defconfig
+++ b/nuttx/configs/stm3240g-eval/nsh2/defconfig
@@ -586,20 +586,20 @@ CONFIG_NX_MXCLIENTMSGS=16
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/stm3240g-eval/nxconsole/defconfig b/nuttx/configs/stm3240g-eval/nxconsole/defconfig
index e7d27bd2ec..f87acc69e4 100644
--- a/nuttx/configs/stm3240g-eval/nxconsole/defconfig
+++ b/nuttx/configs/stm3240g-eval/nxconsole/defconfig
@@ -609,20 +609,20 @@ CONFIG_STM32_ILI9325_DISABLE=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/stm3240g-eval/nxwm/defconfig b/nuttx/configs/stm3240g-eval/nxwm/defconfig
index c90051b9b4..d1fa395ddb 100644
--- a/nuttx/configs/stm3240g-eval/nxwm/defconfig
+++ b/nuttx/configs/stm3240g-eval/nxwm/defconfig
@@ -670,20 +670,20 @@ CONFIG_STM32_ILI9325_DISABLE=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/stm3240g-eval/ostest/defconfig b/nuttx/configs/stm3240g-eval/ostest/defconfig
index bfc576f5fc..cc7a9ac58b 100644
--- a/nuttx/configs/stm3240g-eval/ostest/defconfig
+++ b/nuttx/configs/stm3240g-eval/ostest/defconfig
@@ -541,20 +541,20 @@ CONFIG_STM32_ILI9325_DISABLE=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
@@ -673,13 +673,13 @@ CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=2
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=2
-CONFIG_EXAMPLE_BUTTONS_NAME0="Key/Select"
-CONFIG_EXAMPLE_BUTTONS_NAME1="Left/Right"
-CONFIG_EXAMPLE_BUTTONS_NAME2="Up/Down"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=2
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=2
+CONFIG_EXAMPLES_BUTTONS_NAME0="Key/Select"
+CONFIG_EXAMPLES_BUTTONS_NAME1="Left/Right"
+CONFIG_EXAMPLES_BUTTONS_NAME2="Up/Down"
 
 #
 # I2C tool settings
diff --git a/nuttx/configs/stm3240g-eval/telnetd/defconfig b/nuttx/configs/stm3240g-eval/telnetd/defconfig
index f138e5e6f1..4ab86aeb99 100644
--- a/nuttx/configs/stm3240g-eval/telnetd/defconfig
+++ b/nuttx/configs/stm3240g-eval/telnetd/defconfig
@@ -536,21 +536,21 @@ CONFIG_NX_MXCLIENTMSGS=16
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=y
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=y
+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/telnetd
@@ -559,10 +559,10 @@ CONFIG_EXAMPLES_TELNETD_DAEMONPRIO=128
 CONFIG_EXAMPLES_TELNETD_DAEMONSTACKSIZE=2048
 CONFIG_EXAMPLES_TELNETD_CLIENTPRIO=128
 CONFIG_EXAMPLES_TELNETD_CLIENTSTACKSIZE=2048
-CONFIG_EXAMPLE_TELNETD_NOMAC=y
-CONFIG_EXAMPLE_TELNETD_IPADDR=0x0a000002
-CONFIG_EXAMPLE_TELNETD_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_TELNETD_NETMASK=0xffffff00
+CONFIG_EXAMPLES_TELNETD_NOMAC=y
+CONFIG_EXAMPLES_TELNETD_IPADDR=0x0a000002
+CONFIG_EXAMPLES_TELNETD_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_TELNETD_NETMASK=0xffffff00
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/stm3240g-eval/webserver/defconfig b/nuttx/configs/stm3240g-eval/webserver/defconfig
index 25f1800b6d..8921d503ce 100644
--- a/nuttx/configs/stm3240g-eval/webserver/defconfig
+++ b/nuttx/configs/stm3240g-eval/webserver/defconfig
@@ -639,21 +639,21 @@ CONFIG_STM32_ILI9325_DISABLE=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0xc0a80232
-CONFIG_EXAMPLE_UIP_DRIPADDR=0xc0a80201
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_NOMAC=y
-CONFIG_EXAMPLE_UIP_DHCPC=n
+CONFIG_EXAMPLES_UIP_IPADDR=0xc0a80232
+CONFIG_EXAMPLES_UIP_DRIPADDR=0xc0a80201
+CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
+CONFIG_EXAMPLES_UIP_NOMAC=y
+CONFIG_EXAMPLES_UIP_DHCPC=n
 
 #
 # Settings for examples/nettest
-CONFIG_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/stm3240g-eval/xmlrpc/defconfig b/nuttx/configs/stm3240g-eval/xmlrpc/defconfig
index c2ba860fa4..20639dac42 100644
--- a/nuttx/configs/stm3240g-eval/xmlrpc/defconfig
+++ b/nuttx/configs/stm3240g-eval/xmlrpc/defconfig
@@ -707,7 +707,7 @@ CONFIG_HAVE_CXXINITIALIZE=y
 #
 # UDP Discovery Daemon Example
 #
-# CONFIG_EXAMPLE_DISCOVER is not set
+# CONFIG_EXAMPLES_DISCOVER is not set
 
 #
 # uIP Web Server Example
diff --git a/nuttx/configs/stm32f4discovery/nsh/defconfig b/nuttx/configs/stm32f4discovery/nsh/defconfig
index 38a0a1e038..c216c5997c 100644
--- a/nuttx/configs/stm32f4discovery/nsh/defconfig
+++ b/nuttx/configs/stm32f4discovery/nsh/defconfig
@@ -579,20 +579,20 @@ CONFIG_NX_MXCLIENTMSGS=16
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/stm32f4discovery/nxlines/defconfig b/nuttx/configs/stm32f4discovery/nxlines/defconfig
index bbdbf0feae..e1e4f21316 100644
--- a/nuttx/configs/stm32f4discovery/nxlines/defconfig
+++ b/nuttx/configs/stm32f4discovery/nxlines/defconfig
@@ -590,21 +590,21 @@ CONFIG_LCD_RPORTRAIT=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/stm32f4discovery/ostest/defconfig b/nuttx/configs/stm32f4discovery/ostest/defconfig
index a10efe9eca..dba07f76b5 100644
--- a/nuttx/configs/stm32f4discovery/ostest/defconfig
+++ b/nuttx/configs/stm32f4discovery/ostest/defconfig
@@ -546,20 +546,20 @@ CONFIG_STM32_R61580_DISABLE=n
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
@@ -678,13 +678,13 @@ CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25
 #
 # Settings for examples/buttons
 #
-CONFIG_EXAMPLE_BUTTONS_MIN=0
-CONFIG_EXAMPLE_BUTTONS_MAX=2
-CONFIG_EXAMPLE_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLE_IRQBUTTONS_MAX=2
-CONFIG_EXAMPLE_BUTTONS_NAME0="Key/Select"
-CONFIG_EXAMPLE_BUTTONS_NAME1="Left/Right"
-CONFIG_EXAMPLE_BUTTONS_NAME2="Up/Down"
+CONFIG_EXAMPLES_BUTTONS_MIN=0
+CONFIG_EXAMPLES_BUTTONS_MAX=2
+CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
+CONFIG_EXAMPLES_IRQBUTTONS_MAX=2
+CONFIG_EXAMPLES_BUTTONS_NAME0="Key/Select"
+CONFIG_EXAMPLES_BUTTONS_NAME1="Left/Right"
+CONFIG_EXAMPLES_BUTTONS_NAME2="Up/Down"
 
 #
 # Settings for examples/usbserial
diff --git a/nuttx/configs/stm32f4discovery/pm/defconfig b/nuttx/configs/stm32f4discovery/pm/defconfig
index 8960253f90..07a99c764d 100644
--- a/nuttx/configs/stm32f4discovery/pm/defconfig
+++ b/nuttx/configs/stm32f4discovery/pm/defconfig
@@ -598,20 +598,20 @@ CONFIG_NX_MXCLIENTMSGS=16
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/sure-pic32mx/nsh/defconfig b/nuttx/configs/sure-pic32mx/nsh/defconfig
index ffd95e4ac6..8025f968c3 100644
--- a/nuttx/configs/sure-pic32mx/nsh/defconfig
+++ b/nuttx/configs/sure-pic32mx/nsh/defconfig
@@ -409,21 +409,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/sure-pic32mx/ostest/defconfig b/nuttx/configs/sure-pic32mx/ostest/defconfig
index 731529df87..f3c3fee36b 100644
--- a/nuttx/configs/sure-pic32mx/ostest/defconfig
+++ b/nuttx/configs/sure-pic32mx/ostest/defconfig
@@ -364,21 +364,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/sure-pic32mx/usbnsh/defconfig b/nuttx/configs/sure-pic32mx/usbnsh/defconfig
index 0abcd72b86..cdebb2953b 100644
--- a/nuttx/configs/sure-pic32mx/usbnsh/defconfig
+++ b/nuttx/configs/sure-pic32mx/usbnsh/defconfig
@@ -406,21 +406,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/teensy/hello/defconfig b/nuttx/configs/teensy/hello/defconfig
index dee8b264e9..83176f57e9 100644
--- a/nuttx/configs/teensy/hello/defconfig
+++ b/nuttx/configs/teensy/hello/defconfig
@@ -313,21 +313,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/teensy/nsh/defconfig b/nuttx/configs/teensy/nsh/defconfig
index 32b7e5a41f..0908f02430 100755
--- a/nuttx/configs/teensy/nsh/defconfig
+++ b/nuttx/configs/teensy/nsh/defconfig
@@ -324,21 +324,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/teensy/usbstorage/defconfig b/nuttx/configs/teensy/usbstorage/defconfig
index 68d54b8704..94cc301db3 100755
--- a/nuttx/configs/teensy/usbstorage/defconfig
+++ b/nuttx/configs/teensy/usbstorage/defconfig
@@ -332,21 +332,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/twr-k60n512/nsh/defconfig b/nuttx/configs/twr-k60n512/nsh/defconfig
index 47aecfea60..d8ccd6a6d3 100644
--- a/nuttx/configs/twr-k60n512/nsh/defconfig
+++ b/nuttx/configs/twr-k60n512/nsh/defconfig
@@ -378,20 +378,20 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/twr-k60n512/ostest/defconfig b/nuttx/configs/twr-k60n512/ostest/defconfig
index 984ff5cff8..8909add134 100644
--- a/nuttx/configs/twr-k60n512/ostest/defconfig
+++ b/nuttx/configs/twr-k60n512/ostest/defconfig
@@ -376,20 +376,20 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest
diff --git a/nuttx/configs/ubw32/nsh/defconfig b/nuttx/configs/ubw32/nsh/defconfig
index cfc0dad304..afa4e10c8a 100644
--- a/nuttx/configs/ubw32/nsh/defconfig
+++ b/nuttx/configs/ubw32/nsh/defconfig
@@ -396,21 +396,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/ubw32/ostest/defconfig b/nuttx/configs/ubw32/ostest/defconfig
index 0fc2984bc6..0849fe800e 100644
--- a/nuttx/configs/ubw32/ostest/defconfig
+++ b/nuttx/configs/ubw32/ostest/defconfig
@@ -395,21 +395,21 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=y
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+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
diff --git a/nuttx/configs/vsn/nsh/defconfig b/nuttx/configs/vsn/nsh/defconfig
index c55fae0f3e..8c59b42981 100755
--- a/nuttx/configs/vsn/nsh/defconfig
+++ b/nuttx/configs/vsn/nsh/defconfig
@@ -426,20 +426,20 @@ CONFIG_USBMSC_REMOVABLE=y
 #
 # Settings for examples/uip
 #
-CONFIG_EXAMPLE_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLE_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLE_UIP_DHCPC=n
+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_EXAMPLE_NETTEST_SERVER=n
-CONFIG_EXAMPLE_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLE_NETTEST_NOMAC=n
-CONFIG_EXAMPLE_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLE_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLE_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLE_NETTEST_CLIENTIP=0x0a000001
+CONFIG_EXAMPLES_NETTEST_SERVER=n
+CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
+CONFIG_EXAMPLES_NETTEST_NOMAC=n
+CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
+CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
+CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
+CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 
 #
 # Settings for examples/ostest

From eb041b927ae19ab2b8ccbd89ae264b1c42c4a017 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Thu, 4 Oct 2012 18:42:28 +0000
Subject: [PATCH 15/43] Fix some W25 driver errors

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5212 42af7a65-404d-4744-a932-0658087f49c3
---
 apps/ChangeLog.txt                      |  2 +
 apps/examples/README.txt                |  4 +-
 apps/examples/buttons/Kconfig           | 52 ++++++++++++++++++++++++-
 nuttx/ChangeLog                         |  2 +
 nuttx/configs/fire-stm32v2/src/up_w25.c | 12 +++---
 nuttx/configs/shenzhou/src/up_ili93xx.c |  2 +-
 nuttx/configs/shenzhou/src/up_w25.c     | 12 +++---
 nuttx/drivers/mtd/w25.c                 | 21 +++-------
 nuttx/fs/nxffs/Kconfig                  | 16 ++++----
 9 files changed, 84 insertions(+), 39 deletions(-)

diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index 397ccdac4a..bf2a85a9bb 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -362,3 +362,5 @@
 	  of CONFIG_EXAMPLE_* to CONFIG_EXAMPLES_*.
 	* Kconfig:  Fleshed out apps/examples/adc/Kconfig and apps/examples/wget/Kconfig.
 	  There are still a LOT of empty, stub Kconfig files.
+	* Kconfig:  Fleshed out apps/examples/buttons/Kconfig. There are still a LOT
+	  of empty, stub Kconfig files.
diff --git a/apps/examples/README.txt b/apps/examples/README.txt
index 7ef51025f4..763427e326 100644
--- a/apps/examples/README.txt
+++ b/apps/examples/README.txt
@@ -60,11 +60,11 @@ examples/buttons
   This is a simple configuration that may be used to test the board-
   specific button interfaces.  Configuration options:
 
-  CONFIG_ARCH_BUTTONS                - Must be defined for button support
+  CONFIG_ARCH_BUTTONS                 - Must be defined for button support
   CONFIG_EXAMPLES_BUTTONS_MIN         - Lowest button number (MIN=0)
   CONFIG_EXAMPLES_BUTTONS_MAX         - Highest button number (MAX=7)
 
-  CONFIG_ARCH_IRQBUTTONS             - Must be defined for interrupting button support
+  CONFIG_ARCH_IRQBUTTONS              - Must be defined for interrupting button support
   CONFIG_EXAMPLES_IRQBUTTONS_MIN      - Lowest interrupting button number (MIN=0)
   CONFIG_EXAMPLES_IRQBUTTONS_MAX      - Highest interrupting button number (MAX=7)
 
diff --git a/apps/examples/buttons/Kconfig b/apps/examples/buttons/Kconfig
index 9c34b37bcb..d145867fc0 100644
--- a/apps/examples/buttons/Kconfig
+++ b/apps/examples/buttons/Kconfig
@@ -7,7 +7,57 @@ config EXAMPLES_BUTTONS
 	bool "Buttons example"
 	default n
 	---help---
-		Enable the buttons example
+		Enable the buttons example.  May require ARCH_BUTTONS on some boards.
 
 if EXAMPLES_BUTTONS
+config EXAMPLES_BUTTONS_MIN
+int "Lowest Button Number"
+default 0
+
+config EXAMPLES_BUTTONS_MAX
+int "Highest Button Number"
+default 7
+
+if ARCH_IRQBUTTONS 
+config EXAMPLES_IRQBUTTONS_MIN
+int "Lowest Interrupting Button Number"
+default 0
+
+config EXAMPLES_IRQBUTTONS_MAX
+int "Highest Interrupting Button Number"
+default 7
+
+config EXAMPLES_BUTTONS_NAME0
+string "Button 0 Name"
+default "Button 0"
+
+config EXAMPLES_BUTTONS_NAME1
+string "Button 1 Name"
+default "Button 1"
+
+config EXAMPLES_BUTTONS_NAME2
+string "Button 2 Name"
+default "Button 2"
+
+config EXAMPLES_BUTTONS_NAME3
+string "Button 3 Name"
+default "Button 3"
+
+config EXAMPLES_BUTTONS_NAME4
+string "Button 4 Name"
+default "Button 4"
+
+config EXAMPLES_BUTTONS_NAME5
+string "Button 5 Name"
+default "Button 5"
+
+config EXAMPLES_BUTTONS_NAME6
+string "Button 6 Name"
+default "Button 6"
+
+config EXAMPLES_BUTTONS_NAME7
+string "Button 7 Name"
+default "Button 7"
+
+endif
 endif
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index eb85a8e7ce..257119a353 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3463,3 +3463,5 @@
 	  by the STM32 watchdog driver.
 	* CONFIG_EXAMPLES_*: To make things consistent, changed all occurrences
 	  of CONFIG_EXAMPLE_* to CONFIG_EXAMPLES_*.
+	* drivers/mtd/w25.c and configs/*/src/up_w25.c:  Several fixes for the
+	  W25 SPI FLASH.
diff --git a/nuttx/configs/fire-stm32v2/src/up_w25.c b/nuttx/configs/fire-stm32v2/src/up_w25.c
index a3460a1588..e78b50ed23 100644
--- a/nuttx/configs/fire-stm32v2/src/up_w25.c
+++ b/nuttx/configs/fire-stm32v2/src/up_w25.c
@@ -96,23 +96,23 @@ int stm32_w25initialize(int minor)
 #ifdef HAVE_W25
   FAR struct spi_dev_s *spi;
   FAR struct mtd_dev_s *mtd;
-#ifndef CONFIG_FS_NXFFS
-  uint8_t devname[12];
+#ifdef CONFIG_FS_NXFFS
+  char devname[12];
 #endif
   int ret;
 
   /* Get the SPI port */
 
-  spi = up_spiinitialize(2);
+  spi = up_spiinitialize(1);
   if (!spi)
     {
       fdbg("ERROR: Failed to initialize SPI port 2\n");
       return -ENODEV;
     }
 
-  /* Now bind the SPI interface to the SST 25 SPI FLASH driver */
+  /* Now bind the SPI interface to the W25 SPI FLASH driver */
 
-  mtd = sst25_initialize(spi);
+  mtd = w25_initialize(spi);
   if (!mtd)
     {
       fdbg("ERROR: Failed to bind SPI port 2 to the SST 25 FLASH driver\n");
@@ -140,7 +140,7 @@ int stm32_w25initialize(int minor)
 
   /* Mount the file system at /mnt/w25 */
 
-  snprintf(devname, 12, "/mnt/w25%c", a + minor);
+  snprintf(devname, 12, "/mnt/w25%c", 'a' + minor);
   ret = mount(NULL, devname, "nxffs", 0, NULL);
   if (ret < 0)
     {
diff --git a/nuttx/configs/shenzhou/src/up_ili93xx.c b/nuttx/configs/shenzhou/src/up_ili93xx.c
index d3e2291da7..a89e20d02e 100644
--- a/nuttx/configs/shenzhou/src/up_ili93xx.c
+++ b/nuttx/configs/shenzhou/src/up_ili93xx.c
@@ -805,7 +805,7 @@ static uint16_t stm32_readnoshift(FAR struct stm32_dev_s *priv, FAR uint16_t *ac
 
 static void stm32_setcursor(FAR struct stm32_dev_s *priv, uint16_t col, uint16_t row)
 {
-  if (priv->type = LCD_TYPE_ILI9919)
+  if (priv->type == LCD_TYPE_ILI9919)
     {
       stm32_writereg(priv, LCD_REG_78, col); /* GRAM horizontal address */
       stm32_writereg(priv, LCD_REG_79, row); /* GRAM vertical address */
diff --git a/nuttx/configs/shenzhou/src/up_w25.c b/nuttx/configs/shenzhou/src/up_w25.c
index aa547f6fe4..01936997f3 100644
--- a/nuttx/configs/shenzhou/src/up_w25.c
+++ b/nuttx/configs/shenzhou/src/up_w25.c
@@ -96,23 +96,23 @@ int stm32_w25initialize(int minor)
 #ifdef HAVE_W25
   FAR struct spi_dev_s *spi;
   FAR struct mtd_dev_s *mtd;
-#ifndef CONFIG_FS_NXFFS
-  uint8_t devname[12];
+#ifdef CONFIG_FS_NXFFS
+  char devname[12];
 #endif
   int ret;
 
   /* Get the SPI port */
 
-  spi = up_spiinitialize(2);
+  spi = up_spiinitialize(1);
   if (!spi)
     {
       fdbg("ERROR: Failed to initialize SPI port 2\n");
       return -ENODEV;
     }
 
-  /* Now bind the SPI interface to the SST 25 SPI FLASH driver */
+  /* Now bind the SPI interface to the W25 SPI FLASH driver */
 
-  mtd = sst25_initialize(spi);
+  mtd = w25_initialize(spi);
   if (!mtd)
     {
       fdbg("ERROR: Failed to bind SPI port 2 to the SST 25 FLASH driver\n");
@@ -140,7 +140,7 @@ int stm32_w25initialize(int minor)
 
   /* Mount the file system at /mnt/w25 */
 
-  snprintf(devname, 12, "/mnt/w25%c", a + minor);
+  snprintf(devname, 12, "/mnt/w25%c", 'a' + minor);
   ret = mount(NULL, devname, "nxffs", 0, NULL);
   if (ret < 0)
     {
diff --git a/nuttx/drivers/mtd/w25.c b/nuttx/drivers/mtd/w25.c
index 0d7028fec1..bd6680fdf4 100644
--- a/nuttx/drivers/mtd/w25.c
+++ b/nuttx/drivers/mtd/w25.c
@@ -693,7 +693,7 @@ static void w25_pagewrite(struct w25_dev_s *priv, FAR const uint8_t *buffer,
   uint8_t status;
 
   fvdbg("address: %08lx nwords: %d\n", (long)address, (int)nbytes);
-  DEBUGASSERT(priv && buffer && ((uintptr_t)buffer & 0xff) == 0 &&
+  DEBUGASSERT(priv && buffer && (address & 0xff) == 0 &&
              (nbytes & 0xff) == 0);
 
   for (; nbytes > 0; nbytes -= W25_PAGE_SIZE)
@@ -955,36 +955,27 @@ static int w25_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblocks
 static ssize_t w25_bread(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblocks,
                            FAR uint8_t *buffer)
 {
-#ifdef CONFIG_W25_SECTOR512
   ssize_t nbytes;
 
   fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* On this device, we can handle the block read just like the byte-oriented read */
 
+#ifdef CONFIG_W25_SECTOR512
   nbytes = w25_read(dev, startblock << W25_SECTOR512_SHIFT, nblocks << W25_SECTOR512_SHIFT, buffer);
   if (nbytes > 0)
     {
-      return nbytes >> W25_SECTOR512_SHIFT;
+      nbytes >>= W25_SECTOR512_SHIFT;
     }
-
-  return (int)nbytes;
 #else
-  FAR struct w25_dev_s *priv = (FAR struct w25_dev_s *)dev;
-  ssize_t nbytes;
-
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
-
-  /* On this device, we can handle the block read just like the byte-oriented read */
-
   nbytes = w25_read(dev, startblock << W25_SECTOR_SHIFT, nblocks << W25_SECTOR_SHIFT, buffer);
   if (nbytes > 0)
     {
-      return nbytes >> W25_SECTOR_SHIFT;
+      nbytes >>= W25_SECTOR_SHIFT;
     }
-
-  return (int)nbytes;
 #endif
+
+  return nbytes;
 }
 
 /************************************************************************************
diff --git a/nuttx/fs/nxffs/Kconfig b/nuttx/fs/nxffs/Kconfig
index b233e85ea0..9f4ef82318 100644
--- a/nuttx/fs/nxffs/Kconfig
+++ b/nuttx/fs/nxffs/Kconfig
@@ -12,31 +12,31 @@ config FS_NXFFS
 
 if FS_NXFFS
 config NXFFS_ERASEDSTATE
-	bool "FLASH erased state"
-	default n
+	hex "FLASH erased state"
+	default 0xff
 	---help---	
 		The erased state of FLASH. 
 		This must have one of the values of 0xff or 0x00.
 		Default: 0xff.
 
 config NXFFS_PACKTHRESHOLD
-	bool "Re-packing threshold"
-	default n
+	int "Re-packing threshold"
+	default 32
 	---help---
 		When packing flash file data,
 		don't both with file chunks smaller than this number of data bytes.
 		Default: 32.
 
 config NXFFS_MAXNAMLEN
-	bool "Maximum file name length"
-	default n
+	int "Maximum file name length"
+	default 255
 	---help---	
 		The maximum size of an NXFFS file name.
 		Default: 255.
 
 config NXFFS_TAILTHRESHOLD
-	bool "Tail threshold"
-	default n
+	int "Tail threshold"
+	default 8192
 	---help---	
 		clean-up can either mean
 		packing files together toward the end of the file or, if file are

From 1e368791267c48b0e6c672ad3ed2ba9521740a70 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Fri, 5 Oct 2012 23:01:51 +0000
Subject: [PATCH 16/43] Add buildroot support for binutils-2.22 and gcc-4.6.3;
 all buildroot tools are not called abc-nuttx-elf instead of abc-elf

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5213 42af7a65-404d-4744-a932-0658087f49c3
---
 misc/buildroot/ChangeLog                      |   5 +-
 misc/buildroot/Config.in                      |   3 +-
 misc/buildroot/configs/arm-defconfig          |   2 +-
 .../configs/arm7tdmi-defconfig-4.2.4          |   2 +-
 .../configs/arm7tdmi-defconfig-4.3.3          |   2 +-
 .../buildroot/configs/arm920t-defconfig-4.2.4 |   2 +-
 .../buildroot/configs/arm920t-defconfig-4.3.3 |   2 +-
 .../buildroot/configs/arm926t-defconfig-4.2.4 |   2 +-
 .../buildroot/configs/arm926t-defconfig-4.3.3 |   2 +-
 .../configs/arm926t-defconfig-nxflat          |   2 +-
 misc/buildroot/configs/avr-defconfig-4.3.3    |   2 +-
 misc/buildroot/configs/avr-defconfig-4.5.2    |   2 +-
 misc/buildroot/configs/bfin-defconfig-4.2.4   |   2 +-
 .../configs/cortexm3-defconfig-4.3.3          |   2 +-
 .../configs/cortexm3-defconfig-nxflat         |   2 +-
 .../configs/cortexm3-eabi-defconfig-4.6.3     | 123 ++++
 misc/buildroot/configs/h8300_defconfig        |   2 +-
 misc/buildroot/configs/i486-defconfig-4.3.3   |   2 +-
 misc/buildroot/configs/m32c-defconfig-4.2.4   |   2 +-
 misc/buildroot/configs/m32c-defconfig-4.3.3   |   2 +-
 misc/buildroot/configs/m68hc11-config         |   2 +-
 misc/buildroot/configs/m68hc12-config-3.4.6   |   2 +-
 misc/buildroot/configs/m68hc12-config-4.3.3   |   2 +-
 misc/buildroot/configs/m68k-defconfig         |   2 +-
 misc/buildroot/configs/m9s12x-config-3.3.6    |   2 +-
 misc/buildroot/configs/sh-defconfig           |   2 +-
 .../toolchain/binutils/2.22/120-sh-conf.patch |  29 +
 .../2.22/300-001_ld_makefile_patch.patch      |  24 +
 .../2.22/300-012_check_ldrunpath_length.patch |  21 +
 .../binutils/2.22/999-ppc-textrels.patch      |  80 +++
 misc/buildroot/toolchain/binutils/Config.in   |   5 +
 .../4.6.3/305-libmudflap-susv3-legacy.patch   |  49 ++
 .../gcc/4.6.3/810-arm-softfloat-libgcc.patch  |  38 +
 .../gcc/4.6.3/820-arm-unbreak-armv4t.patch    |  14 +
 .../gcc/4.6.3/900-nuttx-nolibstdc.patch       |  13 +
 ...werpc-link-with-math-lib.patch.conditional | 125 ++++
 misc/buildroot/toolchain/gcc/Config.in        |   6 +
 misc/buildroot/toolchain/gdb/Config.in        |   5 +
 misc/buildroot/toolchain/gdb/gdb.mk           |   2 +
 nuttx/Documentation/NuttX.html                |  34 +-
 nuttx/Documentation/NuttXLinks.html           |   1 +
 nuttx/Documentation/NuttXNxFlat.html          |   4 +-
 nuttx/Documentation/NuttXRelated.html         |   2 +-
 nuttx/Documentation/NuttxPortingGuide.html    |  18 +-
 nuttx/Documentation/UsbTrace.html             | 664 +++++++++---------
 nuttx/configs/Kconfig                         |  26 +-
 nuttx/configs/README.txt                      |  24 +-
 nuttx/configs/amber/hello/Make.defs           |   2 +-
 nuttx/configs/c5471evm/httpd/Make.defs        |   2 +-
 nuttx/configs/c5471evm/nettest/Make.defs      |   2 +-
 nuttx/configs/c5471evm/nsh/Make.defs          |   2 +-
 nuttx/configs/c5471evm/ostest/Make.defs       |   2 +-
 .../configs/compal_e88/nsh_highram/Make.defs  |   2 +-
 .../compal_e99/nsh_compalram/Make.defs        |   2 +-
 .../configs/compal_e99/nsh_highram/Make.defs  |   2 +-
 nuttx/configs/demo9s12ne64/ostest/Make.defs   |   2 +-
 nuttx/configs/ea3131/README.txt               |   2 +-
 nuttx/configs/ea3131/nsh/Make.defs            |   2 +-
 nuttx/configs/ea3131/ostest/Make.defs         |   2 +-
 nuttx/configs/ea3131/pgnsh/Make.defs          |   2 +-
 nuttx/configs/ea3131/usbserial/Make.defs      |   2 +-
 nuttx/configs/ea3131/usbstorage/Make.defs     |   2 +-
 nuttx/configs/ea3152/README.txt               |   2 +-
 nuttx/configs/ea3152/ostest/Make.defs         |   2 +-
 nuttx/configs/eagle100/README.txt             |   2 +-
 nuttx/configs/eagle100/httpd/Make.defs        |   6 +-
 nuttx/configs/eagle100/nettest/Make.defs      |   6 +-
 nuttx/configs/eagle100/nsh/Make.defs          |   6 +-
 nuttx/configs/eagle100/nxflat/Make.defs       |   6 +-
 nuttx/configs/eagle100/ostest/Make.defs       |   6 +-
 nuttx/configs/eagle100/thttpd/Make.defs       |   6 +-
 nuttx/configs/ekk-lm3s9b96/nsh/Make.defs      |   4 +-
 nuttx/configs/ekk-lm3s9b96/ostest/Make.defs   |   4 +-
 nuttx/configs/fire-stm32v2/nsh/Make.defs      |   6 +-
 nuttx/configs/hymini-stm32v/buttons/Make.defs |   4 +-
 nuttx/configs/hymini-stm32v/nsh/Make.defs     |   4 +-
 nuttx/configs/hymini-stm32v/nsh2/Make.defs    |   4 +-
 nuttx/configs/hymini-stm32v/nx/Make.defs      |   4 +-
 nuttx/configs/hymini-stm32v/nxlines/Make.defs |   4 +-
 .../configs/hymini-stm32v/usbserial/Make.defs |   4 +-
 .../hymini-stm32v/usbstorage/Make.defs        |   4 +-
 nuttx/configs/kwikstik-k40/ostest/Make.defs   |   4 +-
 nuttx/configs/lincoln60/nsh/Make.defs         |   4 +-
 nuttx/configs/lincoln60/ostest/Make.defs      |   4 +-
 nuttx/configs/lm3s6432-s2e/nsh/Make.defs      |   4 +-
 nuttx/configs/lm3s6432-s2e/ostest/Make.defs   |   4 +-
 nuttx/configs/lm3s6965-ek/nsh/Make.defs       |   4 +-
 nuttx/configs/lm3s6965-ek/nx/Make.defs        |   4 +-
 nuttx/configs/lm3s6965-ek/ostest/Make.defs    |   4 +-
 nuttx/configs/lm3s8962-ek/nsh/Make.defs       |   4 +-
 nuttx/configs/lm3s8962-ek/nx/Make.defs        |   4 +-
 nuttx/configs/lm3s8962-ek/ostest/Make.defs    |   4 +-
 nuttx/configs/lpc4330-xplorer/nsh/Make.defs   |   6 +-
 .../configs/lpc4330-xplorer/ostest/Make.defs  |   6 +-
 .../lpcxpresso-lpc1768/dhcpd/Make.defs        |   4 +-
 .../configs/lpcxpresso-lpc1768/nsh/Make.defs  |   4 +-
 nuttx/configs/lpcxpresso-lpc1768/nx/Make.defs |   4 +-
 .../lpcxpresso-lpc1768/ostest/Make.defs       |   4 +-
 .../lpcxpresso-lpc1768/thttpd/Make.defs       |   4 +-
 .../lpcxpresso-lpc1768/usbstorage/Make.defs   |   4 +-
 nuttx/configs/m68332evb/Make.defs             |   2 +-
 nuttx/configs/m68332evb/doc/m68k-defconfig    |   2 +-
 nuttx/configs/mbed/hidkbd/Make.defs           |   4 +-
 nuttx/configs/mbed/nsh/Make.defs              |   4 +-
 nuttx/configs/mcu123-lpc214x/README.txt       |   2 +-
 .../mcu123-lpc214x/composite/Make.defs        |   6 +-
 nuttx/configs/mcu123-lpc214x/nsh/Make.defs    |   8 +-
 nuttx/configs/mcu123-lpc214x/ostest/Make.defs |   8 +-
 .../mcu123-lpc214x/usbserial/Make.defs        |   8 +-
 .../mcu123-lpc214x/usbstorage/Make.defs       |   8 +-
 nuttx/configs/micropendous3/README.txt        |   2 +-
 nuttx/configs/micropendous3/hello/Make.defs   |   2 +-
 nuttx/configs/mx1ads/ostest/Make.defs         |   2 +-
 nuttx/configs/ne64badge/ostest/Make.defs      |   2 +-
 nuttx/configs/ntosd-dm320/nettest/Make.defs   |   2 +-
 nuttx/configs/ntosd-dm320/nsh/Make.defs       |   2 +-
 nuttx/configs/ntosd-dm320/ostest/Make.defs    |   2 +-
 nuttx/configs/ntosd-dm320/poll/Make.defs      |   2 +-
 nuttx/configs/ntosd-dm320/thttpd/Make.defs    |   2 +-
 nuttx/configs/ntosd-dm320/udp/Make.defs       |   2 +-
 nuttx/configs/ntosd-dm320/uip/Make.defs       |   2 +-
 nuttx/configs/nucleus2g/nsh/Make.defs         |   4 +-
 nuttx/configs/nucleus2g/ostest/Make.defs      |   4 +-
 nuttx/configs/nucleus2g/usbserial/Make.defs   |   4 +-
 nuttx/configs/nucleus2g/usbstorage/Make.defs  |   4 +-
 nuttx/configs/olimex-lpc1766stk/README.txt    |   2 +-
 .../configs/olimex-lpc1766stk/ftpc/Make.defs  |   4 +-
 .../olimex-lpc1766stk/hidkbd/Make.defs        |   4 +-
 .../olimex-lpc1766stk/nettest/Make.defs       |   4 +-
 nuttx/configs/olimex-lpc1766stk/nsh/Make.defs |   4 +-
 nuttx/configs/olimex-lpc1766stk/nx/Make.defs  |   4 +-
 .../olimex-lpc1766stk/ostest/Make.defs        |   4 +-
 .../olimex-lpc1766stk/slip-httpd/Make.defs    |   4 +-
 .../olimex-lpc1766stk/thttpd/Make.defs        |   4 +-
 .../olimex-lpc1766stk/usbserial/Make.defs     |   4 +-
 .../olimex-lpc1766stk/usbstorage/Make.defs    |   4 +-
 .../configs/olimex-lpc1766stk/wlan/Make.defs  |   4 +-
 nuttx/configs/olimex-lpc2378/nsh/Make.defs    |   4 +-
 nuttx/configs/olimex-lpc2378/ostest/Make.defs |   4 +-
 nuttx/configs/olimex-stm32-p107/nsh/Make.defs |   4 +-
 .../olimex-stm32-p107/ostest/Make.defs        |   4 +-
 nuttx/configs/olimex-strp711/README.txt       |   6 +-
 .../configs/olimex-strp711/nettest/Make.defs  |   8 +-
 nuttx/configs/olimex-strp711/nsh/Make.defs    |   8 +-
 nuttx/configs/olimex-strp711/ostest/Make.defs |   8 +-
 nuttx/configs/qemu-i486/nsh/Make.defs         |   2 +-
 nuttx/configs/qemu-i486/ostest/Make.defs      |   2 +-
 nuttx/configs/sam3u-ek/knsh/Make.defs         |   4 +-
 nuttx/configs/sam3u-ek/nsh/Make.defs          |   4 +-
 nuttx/configs/sam3u-ek/nx/Make.defs           |   4 +-
 nuttx/configs/sam3u-ek/ostest/Make.defs       |   4 +-
 nuttx/configs/sam3u-ek/touchscreen/Make.defs  |   4 +-
 nuttx/configs/shenzhou/nsh/Make.defs          |   6 +-
 nuttx/configs/shenzhou/nxwm/Make.defs         |   6 +-
 nuttx/configs/skp16c26/README.txt             | 224 +++---
 nuttx/configs/skp16c26/ostest/Make.defs       |   2 +-
 nuttx/configs/stm3210e-eval/RIDE/Make.defs    |   4 +-
 nuttx/configs/stm3210e-eval/buttons/Make.defs |   4 +-
 .../configs/stm3210e-eval/composite/Make.defs |   4 +-
 nuttx/configs/stm3210e-eval/nsh/Make.defs     |   4 +-
 nuttx/configs/stm3210e-eval/nsh2/Make.defs    |   4 +-
 nuttx/configs/stm3210e-eval/nx/Make.defs      |   4 +-
 .../configs/stm3210e-eval/nxconsole/Make.defs |   4 +-
 nuttx/configs/stm3210e-eval/nxlines/Make.defs |   4 +-
 nuttx/configs/stm3210e-eval/nxtext/Make.defs  |   4 +-
 nuttx/configs/stm3210e-eval/ostest/Make.defs  |   4 +-
 nuttx/configs/stm3210e-eval/pm/Make.defs      |   4 +-
 .../configs/stm3210e-eval/usbserial/Make.defs |   4 +-
 .../stm3210e-eval/usbstorage/Make.defs        |   4 +-
 nuttx/configs/stm3220g-eval/dhcpd/Make.defs   |   6 +-
 nuttx/configs/stm3220g-eval/nettest/Make.defs |   6 +-
 nuttx/configs/stm3220g-eval/nsh/Make.defs     |   6 +-
 nuttx/configs/stm3220g-eval/nsh2/Make.defs    |   6 +-
 nuttx/configs/stm3220g-eval/nxwm/Make.defs    |   6 +-
 nuttx/configs/stm3220g-eval/ostest/Make.defs  |   6 +-
 nuttx/configs/stm3220g-eval/telnetd/Make.defs |   6 +-
 nuttx/configs/stm3240g-eval/dhcpd/Make.defs   |   6 +-
 .../configs/stm3240g-eval/discover/Make.defs  |   6 +-
 nuttx/configs/stm3240g-eval/nettest/Make.defs |   6 +-
 nuttx/configs/stm3240g-eval/nsh/Make.defs     |   6 +-
 nuttx/configs/stm3240g-eval/nsh2/Make.defs    |   6 +-
 .../configs/stm3240g-eval/nxconsole/Make.defs |   6 +-
 nuttx/configs/stm3240g-eval/nxwm/Make.defs    |   6 +-
 nuttx/configs/stm3240g-eval/ostest/Make.defs  |   6 +-
 nuttx/configs/stm3240g-eval/telnetd/Make.defs |   6 +-
 .../configs/stm3240g-eval/webserver/Make.defs |   6 +-
 nuttx/configs/stm3240g-eval/xmlrpc/Make.defs  |   6 +-
 nuttx/configs/stm32f4discovery/nsh/Make.defs  |   6 +-
 .../stm32f4discovery/nxlines/Make.defs        |   6 +-
 .../configs/stm32f4discovery/ostest/Make.defs |   6 +-
 nuttx/configs/stm32f4discovery/pm/Make.defs   |   6 +-
 nuttx/configs/teensy/hello/Make.defs          |   2 +-
 nuttx/configs/teensy/nsh/Make.defs            |   2 +-
 nuttx/configs/teensy/usbstorage/Make.defs     |   2 +-
 nuttx/configs/twr-k60n512/nsh/Make.defs       |   4 +-
 nuttx/configs/twr-k60n512/ostest/Make.defs    |   4 +-
 nuttx/configs/us7032evb1/nsh/Make.defs        |   2 +-
 nuttx/configs/us7032evb1/ostest/Make.defs     |   2 +-
 nuttx/configs/vsn/nsh/Make.defs               |   4 +-
 199 files changed, 1372 insertions(+), 833 deletions(-)
 create mode 100644 misc/buildroot/configs/cortexm3-eabi-defconfig-4.6.3
 create mode 100755 misc/buildroot/toolchain/binutils/2.22/120-sh-conf.patch
 create mode 100755 misc/buildroot/toolchain/binutils/2.22/300-001_ld_makefile_patch.patch
 create mode 100755 misc/buildroot/toolchain/binutils/2.22/300-012_check_ldrunpath_length.patch
 create mode 100755 misc/buildroot/toolchain/binutils/2.22/999-ppc-textrels.patch
 create mode 100755 misc/buildroot/toolchain/gcc/4.6.3/305-libmudflap-susv3-legacy.patch
 create mode 100755 misc/buildroot/toolchain/gcc/4.6.3/810-arm-softfloat-libgcc.patch
 create mode 100755 misc/buildroot/toolchain/gcc/4.6.3/820-arm-unbreak-armv4t.patch
 create mode 100755 misc/buildroot/toolchain/gcc/4.6.3/900-nuttx-nolibstdc.patch
 create mode 100755 misc/buildroot/toolchain/gcc/4.6.3/powerpc-link-with-math-lib.patch.conditional

diff --git a/misc/buildroot/ChangeLog b/misc/buildroot/ChangeLog
index 9c22edf036..0d896872f0 100644
--- a/misc/buildroot/ChangeLog
+++ b/misc/buildroot/ChangeLog
@@ -115,5 +115,8 @@ buildroot-1.11 2011-xx-xx <gnutt@nuttx.org>
 	  - there is some assembler error when compiling gcc for arm, gcc bugzilla
 	    43999
 	  - you can't build nuttx for cortex m3/m4 because of a missing instruction
-	    in ethe assembler, binutils bugzilla 12296
+	    in the assembler, binutils bugzilla 12296
+	* Add support for binutils 2.22 and GCC 4.6.3.
+	* Change name of all tools from xxx-elf to xxx-nuttx-elf
+	* Added an ARM EABI GCC 4.6.3 configuration (tool name is arm-nuttx-eabi-).
 
diff --git a/misc/buildroot/Config.in b/misc/buildroot/Config.in
index d5c5fbfe7b..fe33b158de 100644
--- a/misc/buildroot/Config.in
+++ b/misc/buildroot/Config.in
@@ -343,7 +343,8 @@ config BR2_GNU_BUILD_SUFFIX
 
 config BR2_GNU_TARGET_SUFFIX
 	string "GNU target suffix"
-	default "elf"
+	default "nuttx-elf" if !BR2_ARM_EABI
+	default "nuttx-eabi" if BR2_ARM_EABI
 	help
 	  The string used to pass to configure scripts via the
 	  --target= option.  Just specify the suffix here, the leading
diff --git a/misc/buildroot/configs/arm-defconfig b/misc/buildroot/configs/arm-defconfig
index bcdab8c899..81a8508fe8 100644
--- a/misc/buildroot/configs/arm-defconfig
+++ b/misc/buildroot/configs/arm-defconfig
@@ -58,7 +58,7 @@ BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
-BR2_GNU_TARGET_SUFFIX="elf"
+BR2_GNU_TARGET_SUFFIX="nuttx-elf"
 # BR2_PREFER_IMA is not set
 
 #
diff --git a/misc/buildroot/configs/arm7tdmi-defconfig-4.2.4 b/misc/buildroot/configs/arm7tdmi-defconfig-4.2.4
index 00f05bc9c0..093cc16671 100644
--- a/misc/buildroot/configs/arm7tdmi-defconfig-4.2.4
+++ b/misc/buildroot/configs/arm7tdmi-defconfig-4.2.4
@@ -60,7 +60,7 @@ BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
-BR2_GNU_TARGET_SUFFIX="elf"
+BR2_GNU_TARGET_SUFFIX="nuttx-elf"
 # BR2_PREFER_IMA is not set
 
 #
diff --git a/misc/buildroot/configs/arm7tdmi-defconfig-4.3.3 b/misc/buildroot/configs/arm7tdmi-defconfig-4.3.3
index 9207ad3e24..7e97a77d67 100644
--- a/misc/buildroot/configs/arm7tdmi-defconfig-4.3.3
+++ b/misc/buildroot/configs/arm7tdmi-defconfig-4.3.3
@@ -60,7 +60,7 @@ BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
-BR2_GNU_TARGET_SUFFIX="elf"
+BR2_GNU_TARGET_SUFFIX="nuttx-elf"
 # BR2_PREFER_IMA is not set
 
 #
diff --git a/misc/buildroot/configs/arm920t-defconfig-4.2.4 b/misc/buildroot/configs/arm920t-defconfig-4.2.4
index 4abf368130..ae933fcec5 100644
--- a/misc/buildroot/configs/arm920t-defconfig-4.2.4
+++ b/misc/buildroot/configs/arm920t-defconfig-4.2.4
@@ -60,7 +60,7 @@ BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
-BR2_GNU_TARGET_SUFFIX="elf"
+BR2_GNU_TARGET_SUFFIX="nuttx-elf"
 # BR2_PREFER_IMA is not set
 
 #
diff --git a/misc/buildroot/configs/arm920t-defconfig-4.3.3 b/misc/buildroot/configs/arm920t-defconfig-4.3.3
index f6080a03cb..7f9f6b03f2 100644
--- a/misc/buildroot/configs/arm920t-defconfig-4.3.3
+++ b/misc/buildroot/configs/arm920t-defconfig-4.3.3
@@ -61,7 +61,7 @@ BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
-BR2_GNU_TARGET_SUFFIX="elf"
+BR2_GNU_TARGET_SUFFIX="nuttx-elf"
 # BR2_PREFER_IMA is not set
 
 #
diff --git a/misc/buildroot/configs/arm926t-defconfig-4.2.4 b/misc/buildroot/configs/arm926t-defconfig-4.2.4
index 1c5ae784d7..26b266f0e0 100644
--- a/misc/buildroot/configs/arm926t-defconfig-4.2.4
+++ b/misc/buildroot/configs/arm926t-defconfig-4.2.4
@@ -60,7 +60,7 @@ BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
-BR2_GNU_TARGET_SUFFIX="elf"
+BR2_GNU_TARGET_SUFFIX="nuttx-elf"
 # BR2_PREFER_IMA is not set
 
 #
diff --git a/misc/buildroot/configs/arm926t-defconfig-4.3.3 b/misc/buildroot/configs/arm926t-defconfig-4.3.3
index 3d3d7d9f71..b72a124512 100644
--- a/misc/buildroot/configs/arm926t-defconfig-4.3.3
+++ b/misc/buildroot/configs/arm926t-defconfig-4.3.3
@@ -60,7 +60,7 @@ BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="arm-elf"
-BR2_GNU_TARGET_SUFFIX="elf"
+BR2_GNU_TARGET_SUFFIX="nuttx-elf"
 # BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
 
diff --git a/misc/buildroot/configs/arm926t-defconfig-nxflat b/misc/buildroot/configs/arm926t-defconfig-nxflat
index f0ddd17bc8..d449ef4aba 100644
--- a/misc/buildroot/configs/arm926t-defconfig-nxflat
+++ b/misc/buildroot/configs/arm926t-defconfig-nxflat
@@ -60,7 +60,7 @@ BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="arm-elf"
-BR2_GNU_TARGET_SUFFIX="elf"
+BR2_GNU_TARGET_SUFFIX="nuttx-elf"
 # BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
 
diff --git a/misc/buildroot/configs/avr-defconfig-4.3.3 b/misc/buildroot/configs/avr-defconfig-4.3.3
index a597e5e3b3..a2ea9feb1e 100644
--- a/misc/buildroot/configs/avr-defconfig-4.3.3
+++ b/misc/buildroot/configs/avr-defconfig-4.3.3
@@ -41,7 +41,7 @@ BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
-BR2_GNU_TARGET_SUFFIX="elf"
+BR2_GNU_TARGET_SUFFIX="nuttx-elf"
 # BR2_PREFER_IMA is not set
 
 #
diff --git a/misc/buildroot/configs/avr-defconfig-4.5.2 b/misc/buildroot/configs/avr-defconfig-4.5.2
index e0ebe05596..465376fd02 100644
--- a/misc/buildroot/configs/avr-defconfig-4.5.2
+++ b/misc/buildroot/configs/avr-defconfig-4.5.2
@@ -41,7 +41,7 @@ BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
-BR2_GNU_TARGET_SUFFIX="elf"
+BR2_GNU_TARGET_SUFFIX="nuttx-elf"
 # BR2_PREFER_IMA is not set
 
 #
diff --git a/misc/buildroot/configs/bfin-defconfig-4.2.4 b/misc/buildroot/configs/bfin-defconfig-4.2.4
index a88b9f2696..9cae0a8d9c 100644
--- a/misc/buildroot/configs/bfin-defconfig-4.2.4
+++ b/misc/buildroot/configs/bfin-defconfig-4.2.4
@@ -40,7 +40,7 @@ BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
-BR2_GNU_TARGET_SUFFIX="elf"
+BR2_GNU_TARGET_SUFFIX="nuttx-elf"
 # BR2_PREFER_IMA is not set
 
 #
diff --git a/misc/buildroot/configs/cortexm3-defconfig-4.3.3 b/misc/buildroot/configs/cortexm3-defconfig-4.3.3
index 36a441c693..664000a168 100644
--- a/misc/buildroot/configs/cortexm3-defconfig-4.3.3
+++ b/misc/buildroot/configs/cortexm3-defconfig-4.3.3
@@ -60,7 +60,7 @@ BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
-BR2_GNU_TARGET_SUFFIX="elf"
+BR2_GNU_TARGET_SUFFIX="nuttx-elf"
 # BR2_PREFER_IMA is not set
 
 #
diff --git a/misc/buildroot/configs/cortexm3-defconfig-nxflat b/misc/buildroot/configs/cortexm3-defconfig-nxflat
index ac247703ac..263126d1fa 100644
--- a/misc/buildroot/configs/cortexm3-defconfig-nxflat
+++ b/misc/buildroot/configs/cortexm3-defconfig-nxflat
@@ -60,7 +60,7 @@ BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
-BR2_GNU_TARGET_SUFFIX="elf"
+BR2_GNU_TARGET_SUFFIX="nuttx-elf"
 # BR2_PREFER_IMA is not set
 
 #
diff --git a/misc/buildroot/configs/cortexm3-eabi-defconfig-4.6.3 b/misc/buildroot/configs/cortexm3-eabi-defconfig-4.6.3
new file mode 100644
index 0000000000..7839f667b7
--- /dev/null
+++ b/misc/buildroot/configs/cortexm3-eabi-defconfig-4.6.3
@@ -0,0 +1,123 @@
+#
+# Automatically generated make config: don't edit
+#
+BR2_HAVE_DOT_CONFIG=y
+# BR2_alpha is not set
+BR2_arm=y
+# BR2_armeb is not set
+# BR2_avr is not set
+# BR2_avr32 is not set
+# BR2_bfin is not set
+# BR2_cris is not set
+# BR2_i386 is not set
+# BR2_m32c is not set
+# BR2_m68k is not set
+# BR2_m68hc11 is not set
+# BR2_m68hc12 is not set
+# BR2_m9s12x is not set
+# BR2_mips is not set
+# BR2_mipsel is not set
+# BR2_nios2 is not set
+# BR2_powerpc is not set
+# BR2_sh is not set
+# BR2_sh64 is not set
+# BR2_h8300 is not set
+# BR2_sparc is not set
+# BR2_x86_64 is not set
+# BR2_generic_arm is not set
+# BR2_arm610 is not set
+# BR2_arm7tdmi is not set
+# BR2_arm710 is not set
+# BR2_arm720t is not set
+# BR2_arm740t is not set
+# BR2_arm920t is not set
+# BR2_arm922t is not set
+# BR2_arm926t is not set
+# BR2_arm1136jf_s is not set
+BR2_cortex_m3=y
+# BR2_sa110 is not set
+# BR2_sa1100 is not set
+# BR2_xscale is not set
+# BR2_iwmmxt is not set
+# BR2_ARM_OABI is not set
+BR2_ARM_EABI=y
+BR2_ARCH="arm"
+BR2_GCC_TARGET_TUNE="cortex-m3"
+BR2_GCC_TARGET_ARCH="armv7-m"
+BR2_GCC_TARGET_ABI="aapcs-linux"
+BR2_ENDIAN="LITTLE"
+
+#
+# Build options
+#
+BR2_WGET="wget --passive-ftp"
+BR2_SVN="svn co"
+BR2_ZCAT="zcat"
+BR2_BZCAT="bzcat"
+BR2_TAR_OPTIONS=""
+BR2_DL_DIR="$(BASE_DIR)/../archives"
+BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
+BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
+BR2_TOPDIR_PREFIX=""
+BR2_TOPDIR_SUFFIX=""
+BR2_GNU_BUILD_SUFFIX="pc-elf"
+BR2_GNU_TARGET_SUFFIX="nuttx-eabi"
+# BR2_PREFER_IMA is not set
+
+#
+# Toolchain Options
+#
+
+#
+# Binutils Options
+#
+# BR2_BINUTILS_VERSION_2_17 is not set
+# BR2_BINUTILS_VERSION_2_18 is not set
+# BR2_BINUTILS_VERSION_2_19 is not set
+# BR2_BINUTILS_VERSION_2_19_1 is not set
+# BR2_BINUTILS_VERSION_2_21_1 is not set
+BR2_BINUTILS_VERSION_2_22=y
+BR2_BINUTILS_VERSION="2.22"
+BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
+
+#
+# GCC Options
+#
+BR2_PACKAGE_GCC=y
+# BR2_GCC_VERSION_3_3_6 is not set
+# BR2_GCC_VERSION_3_4_6 is not set
+# BR2_GCC_VERSION_4_2_4 is not set
+# BR2_GCC_VERSION_4_3_3 is not set
+# BR2_GCC_VERSION_4_5_2 is not set
+BR2_GCC_VERSION_4_6_3=y
+BR2_GCC_SUPPORTS_SYSROOT=y
+BR2_GCC_VERSION="4.6.3"
+# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
+BR2_EXTRA_GCC_CONFIG_OPTIONS=""
+BR2_INSTALL_LIBSTDCPP=y
+# BR2_INSTALL_LIBGCJ is not set
+# BR2_INSTALL_OBJC is not set
+# BR2_INSTALL_FORTRAN is not set
+
+#
+# Gdb Options
+#
+# BR2_PACKAGE_GDB is not set
+# BR2_PACKAGE_GDB_SERVER is not set
+# BR2_PACKAGE_GDB_HOST is not set
+
+#
+# NuttX Binary Support
+#
+BR2_PACKAGE_NXFLAT=y
+BR2_PACKAGE_GENROMFS=y
+
+#
+# Common Toolchain Options
+#
+# BR2_PACKAGE_SSTRIP_TARGET is not set
+# BR2_PACKAGE_SSTRIP_HOST is not set
+# BR2_ENABLE_MULTILIB is not set
+BR2_LARGEFILE=y
+BR2_SOFT_FLOAT=y
+BR2_TARGET_OPTIMIZATION="-Os -pipe"
diff --git a/misc/buildroot/configs/h8300_defconfig b/misc/buildroot/configs/h8300_defconfig
index 127b04de3f..df7e91b107 100644
--- a/misc/buildroot/configs/h8300_defconfig
+++ b/misc/buildroot/configs/h8300_defconfig
@@ -40,7 +40,7 @@ BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
-BR2_GNU_TARGET_SUFFIX="elf"
+BR2_GNU_TARGET_SUFFIX="nuttx-elf"
 # BR2_PREFER_IMA is not set
 
 #
diff --git a/misc/buildroot/configs/i486-defconfig-4.3.3 b/misc/buildroot/configs/i486-defconfig-4.3.3
index c99130521f..ca79c85187 100644
--- a/misc/buildroot/configs/i486-defconfig-4.3.3
+++ b/misc/buildroot/configs/i486-defconfig-4.3.3
@@ -47,7 +47,7 @@ BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
-BR2_GNU_TARGET_SUFFIX="elf"
+BR2_GNU_TARGET_SUFFIX="nuttx-elf"
 # BR2_PREFER_IMA is not set
 
 #
diff --git a/misc/buildroot/configs/m32c-defconfig-4.2.4 b/misc/buildroot/configs/m32c-defconfig-4.2.4
index cf6b51bde5..2942cf830d 100644
--- a/misc/buildroot/configs/m32c-defconfig-4.2.4
+++ b/misc/buildroot/configs/m32c-defconfig-4.2.4
@@ -40,7 +40,7 @@ BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
-BR2_GNU_TARGET_SUFFIX="elf"
+BR2_GNU_TARGET_SUFFIX="nuttx-elf"
 # BR2_PREFER_IMA is not set
 
 #
diff --git a/misc/buildroot/configs/m32c-defconfig-4.3.3 b/misc/buildroot/configs/m32c-defconfig-4.3.3
index ef7fa4d008..35f307b75a 100644
--- a/misc/buildroot/configs/m32c-defconfig-4.3.3
+++ b/misc/buildroot/configs/m32c-defconfig-4.3.3
@@ -40,7 +40,7 @@ BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
-BR2_GNU_TARGET_SUFFIX="elf"
+BR2_GNU_TARGET_SUFFIX="nuttx-elf"
 # BR2_PREFER_IMA is not set
 
 #
diff --git a/misc/buildroot/configs/m68hc11-config b/misc/buildroot/configs/m68hc11-config
index 9496beb665..5d546f146c 100644
--- a/misc/buildroot/configs/m68hc11-config
+++ b/misc/buildroot/configs/m68hc11-config
@@ -40,7 +40,7 @@ BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
-BR2_GNU_TARGET_SUFFIX="elf"
+BR2_GNU_TARGET_SUFFIX="nuttx-elf"
 # BR2_PREFER_IMA is not set
 
 #
diff --git a/misc/buildroot/configs/m68hc12-config-3.4.6 b/misc/buildroot/configs/m68hc12-config-3.4.6
index 3277e09899..eb2dca5f04 100644
--- a/misc/buildroot/configs/m68hc12-config-3.4.6
+++ b/misc/buildroot/configs/m68hc12-config-3.4.6
@@ -40,7 +40,7 @@ BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
-BR2_GNU_TARGET_SUFFIX="elf"
+BR2_GNU_TARGET_SUFFIX="nuttx-elf"
 # BR2_PREFER_IMA is not set
 
 #
diff --git a/misc/buildroot/configs/m68hc12-config-4.3.3 b/misc/buildroot/configs/m68hc12-config-4.3.3
index e889e273d3..300194f364 100644
--- a/misc/buildroot/configs/m68hc12-config-4.3.3
+++ b/misc/buildroot/configs/m68hc12-config-4.3.3
@@ -40,7 +40,7 @@ BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
-BR2_GNU_TARGET_SUFFIX="elf"
+BR2_GNU_TARGET_SUFFIX="nuttx-elf"
 # BR2_PREFER_IMA is not set
 
 #
diff --git a/misc/buildroot/configs/m68k-defconfig b/misc/buildroot/configs/m68k-defconfig
index 2de7207552..33b9786337 100644
--- a/misc/buildroot/configs/m68k-defconfig
+++ b/misc/buildroot/configs/m68k-defconfig
@@ -40,7 +40,7 @@ BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
-BR2_GNU_TARGET_SUFFIX="elf"
+BR2_GNU_TARGET_SUFFIX="nuttx-elf"
 # BR2_PREFER_IMA is not set
 
 #
diff --git a/misc/buildroot/configs/m9s12x-config-3.3.6 b/misc/buildroot/configs/m9s12x-config-3.3.6
index ab75d010d8..d317ee7d8e 100644
--- a/misc/buildroot/configs/m9s12x-config-3.3.6
+++ b/misc/buildroot/configs/m9s12x-config-3.3.6
@@ -41,7 +41,7 @@ BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
-BR2_GNU_TARGET_SUFFIX="elf"
+BR2_GNU_TARGET_SUFFIX="nuttx-elf"
 # BR2_PREFER_IMA is not set
 
 #
diff --git a/misc/buildroot/configs/sh-defconfig b/misc/buildroot/configs/sh-defconfig
index 5fc95a5ff9..1700faf24d 100644
--- a/misc/buildroot/configs/sh-defconfig
+++ b/misc/buildroot/configs/sh-defconfig
@@ -47,7 +47,7 @@ BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
-BR2_GNU_TARGET_SUFFIX="elf"
+BR2_GNU_TARGET_SUFFIX="nuttx-elf"
 # BR2_PREFER_IMA is not set
 
 #
diff --git a/misc/buildroot/toolchain/binutils/2.22/120-sh-conf.patch b/misc/buildroot/toolchain/binutils/2.22/120-sh-conf.patch
new file mode 100755
index 0000000000..ea3d1b6068
--- /dev/null
+++ b/misc/buildroot/toolchain/binutils/2.22/120-sh-conf.patch
@@ -0,0 +1,29 @@
+r10231 | lethal | 2005-05-02 09:58:00 -0400 (Mon, 02 May 2005) | 13 lines
+
+Likewise, binutils has no idea about any of these new targets either, so we 
+fix that up too.. now we're able to actually build a real toolchain for 
+sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more 
+inept targets than that one, really. Go look, I promise).
+
+--- a/configure
++++ b/configure
+@@ -1495,7 +1495,7 @@
+   mips*-*-*)
+     noconfigdirs="$noconfigdirs gprof"
+     ;;
+-  sh-*-* | sh64-*-*)
++  sh*-*-* | sh64-*-*)
+     case "${target}" in
+       sh*-*-elf)
+          ;;
+--- a/configure.ac
++++ b/configure.ac
+@@ -712,7 +712,7 @@
+   mips*-*-*)
+     noconfigdirs="$noconfigdirs gprof"
+     ;;
+-  sh-*-* | sh64-*-*)
++  sh*-*-* | sh64-*-*)
+     case "${target}" in
+       sh*-*-elf)
+          ;;
diff --git a/misc/buildroot/toolchain/binutils/2.22/300-001_ld_makefile_patch.patch b/misc/buildroot/toolchain/binutils/2.22/300-001_ld_makefile_patch.patch
new file mode 100755
index 0000000000..5cb0f614d8
--- /dev/null
+++ b/misc/buildroot/toolchain/binutils/2.22/300-001_ld_makefile_patch.patch
@@ -0,0 +1,24 @@
+diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.am binutils-2.17.50.0.17/ld/Makefile.am
+--- binutils-2.17.50.0.17.oorig/ld/Makefile.am	2007-06-18 19:29:29.000000000 +0200
++++ binutils-2.17.50.0.17/ld/Makefile.am	2007-06-25 10:00:36.000000000 +0200
+@@ -18,7 +18,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ 
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.in binutils-2.17.50.0.17/ld/Makefile.in
+--- binutils-2.17.50.0.17.oorig/ld/Makefile.in	2007-06-18 19:29:29.000000000 +0200
++++ binutils-2.17.50.0.17/ld/Makefile.in	2007-06-25 10:00:36.000000000 +0200
+@@ -287,7 +287,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include
diff --git a/misc/buildroot/toolchain/binutils/2.22/300-012_check_ldrunpath_length.patch b/misc/buildroot/toolchain/binutils/2.22/300-012_check_ldrunpath_length.patch
new file mode 100755
index 0000000000..df783109bb
--- /dev/null
+++ b/misc/buildroot/toolchain/binutils/2.22/300-012_check_ldrunpath_length.patch
@@ -0,0 +1,21 @@
+diff -Nura binutils-2.21.orig/ld/emultempl/elf32.em binutils-2.21/ld/emultempl/elf32.em
+--- binutils-2.21.orig/ld/emultempl/elf32.em	2010-10-29 09:10:36.000000000 -0300
++++ binutils-2.21/ld/emultempl/elf32.em	2010-12-10 09:26:56.746102724 -0300
+@@ -1270,6 +1270,8 @@
+ 	      && command_line.rpath == NULL)
+ 	    {
+ 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
++	      if ((lib_path) && (strlen (lib_path) == 0))
++	      	lib_path = NULL;
+ 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
+ 						      force))
+ 		break;
+@@ -1497,6 +1499,8 @@
+   rpath = command_line.rpath;
+   if (rpath == NULL)
+     rpath = (const char *) getenv ("LD_RUN_PATH");
++  if ((rpath) && (strlen (rpath) == 0))
++  	rpath = NULL;
+ 
+   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
+     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
diff --git a/misc/buildroot/toolchain/binutils/2.22/999-ppc-textrels.patch b/misc/buildroot/toolchain/binutils/2.22/999-ppc-textrels.patch
new file mode 100755
index 0000000000..c1efacf249
--- /dev/null
+++ b/misc/buildroot/toolchain/binutils/2.22/999-ppc-textrels.patch
@@ -0,0 +1,80 @@
+http://bugs.gentoo.org/392645
+http://sourceware.org/bugzilla/show_bug.cgi?id=13470
+
+2011-12-03  Alan Modra  <amodra@gmail.com>
+
+	PR ld/13470
+	* elf32-ppc.c (ppc_elf_copy_indirect_symbol): Revert substantive
+	change in 2011-07-01 commit.  Comment.
+	* elf64-ppc.c (ppc64_elf_copy_indirect_symbol): Likewise.
+
+===================================================================
+RCS file: /cvs/src/src/bfd/elf32-ppc.c,v
+retrieving revision 1.302.2.1
+retrieving revision 1.302.2.2
+diff -u -r1.302.2.1 -r1.302.2.2
+--- src/bfd/elf32-ppc.c	2011/11/15 11:36:52	1.302.2.1
++++ src/bfd/elf32-ppc.c	2011/12/03 00:58:01	1.302.2.2
+@@ -2987,10 +2987,6 @@
+   edir->elf.needs_plt |= eind->elf.needs_plt;
+   edir->elf.pointer_equality_needed |= eind->elf.pointer_equality_needed;
+ 
+-  /* If we were called to copy over info for a weak sym, that's all.  */
+-  if (eind->elf.root.type != bfd_link_hash_indirect)
+-    return;
+-
+   if (eind->dyn_relocs != NULL)
+     {
+       if (edir->dyn_relocs != NULL)
+@@ -3022,6 +3018,16 @@
+       eind->dyn_relocs = NULL;
+     }
+ 
++  /* If we were called to copy over info for a weak sym, that's all.
++     You might think dyn_relocs need not be copied over;  After all,
++     both syms will be dynamic or both non-dynamic so we're just
++     moving reloc accounting around.  However, ELIMINATE_COPY_RELOCS 
++     code in ppc_elf_adjust_dynamic_symbol needs to check for
++     dyn_relocs in read-only sections, and it does so on what is the
++     DIR sym here.  */
++  if (eind->elf.root.type != bfd_link_hash_indirect)
++    return;
++
+   /* Copy over the GOT refcount entries that we may have already seen to
+      the symbol which just became indirect.  */
+   edir->elf.got.refcount += eind->elf.got.refcount;
+===================================================================
+RCS file: /cvs/src/src/bfd/elf64-ppc.c,v
+retrieving revision 1.363.2.4
+retrieving revision 1.363.2.5
+diff -u -r1.363.2.4 -r1.363.2.5
+--- src/bfd/elf64-ppc.c	2011/11/08 13:46:36	1.363.2.4
++++ src/bfd/elf64-ppc.c	2011/12/03 00:58:02	1.363.2.5
+@@ -4435,10 +4435,6 @@
+   edir->elf.ref_regular_nonweak |= eind->elf.ref_regular_nonweak;
+   edir->elf.needs_plt |= eind->elf.needs_plt;
+ 
+-  /* If we were called to copy over info for a weak sym, that's all.  */
+-  if (eind->elf.root.type != bfd_link_hash_indirect)
+-    return;
+-
+   /* Copy over any dynamic relocs we may have on the indirect sym.  */
+   if (eind->dyn_relocs != NULL)
+     {
+@@ -4471,6 +4467,16 @@
+       eind->dyn_relocs = NULL;
+     }
+ 
++  /* If we were called to copy over info for a weak sym, that's all.
++     You might think dyn_relocs need not be copied over;  After all,
++     both syms will be dynamic or both non-dynamic so we're just
++     moving reloc accounting around.  However, ELIMINATE_COPY_RELOCS 
++     code in ppc64_elf_adjust_dynamic_symbol needs to check for
++     dyn_relocs in read-only sections, and it does so on what is the
++     DIR sym here.  */
++  if (eind->elf.root.type != bfd_link_hash_indirect)
++    return;
++
+   /* Copy over got entries that we may have already seen to the
+      symbol which just became indirect.  */
+   if (eind->elf.got.glist != NULL)
diff --git a/misc/buildroot/toolchain/binutils/Config.in b/misc/buildroot/toolchain/binutils/Config.in
index d1e674ba54..028ac04121 100644
--- a/misc/buildroot/toolchain/binutils/Config.in
+++ b/misc/buildroot/toolchain/binutils/Config.in
@@ -30,6 +30,10 @@ choice
 	config BR2_BINUTILS_VERSION_2_21_1
 		depends !BR2_avr32 && !BR2_nios2 && !BR2_m9s12x
 		bool "binutils 2.21.1"
+
+	config BR2_BINUTILS_VERSION_2_22
+		depends !BR2_avr32 && !BR2_nios2 && !BR2_m9s12x
+		bool "binutils 2.22"
 endchoice
 
 config BR2_BINUTILS_VERSION
@@ -39,6 +43,7 @@ config BR2_BINUTILS_VERSION
 	default "2.19"            if BR2_BINUTILS_VERSION_2_19
 	default "2.19.1"          if BR2_BINUTILS_VERSION_2_19_1
 	default "2.21.1"          if BR2_BINUTILS_VERSION_2_21_1
+	default "2.22"            if BR2_BINUTILS_VERSION_2_22
 
 config BR2_EXTRA_BINUTILS_CONFIG_OPTIONS
 	string "Additional binutils options"
diff --git a/misc/buildroot/toolchain/gcc/4.6.3/305-libmudflap-susv3-legacy.patch b/misc/buildroot/toolchain/gcc/4.6.3/305-libmudflap-susv3-legacy.patch
new file mode 100755
index 0000000000..374b1f8659
--- /dev/null
+++ b/misc/buildroot/toolchain/gcc/4.6.3/305-libmudflap-susv3-legacy.patch
@@ -0,0 +1,49 @@
+Index: gcc-4.2/libmudflap/mf-hooks2.c
+===================================================================
+--- gcc-4.2/libmudflap/mf-hooks2.c	(revision 119834)
++++ gcc-4.2/libmudflap/mf-hooks2.c	(working copy)
+@@ -427,7 +427,7 @@
+ {
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
+-  bzero (s, n);
++  memset (s, 0, n);
+ }
+ 
+ 
+@@ -437,7 +437,7 @@
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
+   MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
+-  bcopy (src, dest, n);
++  memmove (dest, src, n);
+ }
+ 
+ 
+@@ -447,7 +447,7 @@
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
+   MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
+-  return bcmp (s1, s2, n);
++  return n == 0 ? 0 : memcmp (s1, s2, n);
+ }
+ 
+ 
+@@ -456,7 +456,7 @@
+   size_t n = strlen (s);
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
+-  return index (s, c);
++  return strchr (s, c);
+ }
+ 
+ 
+@@ -465,7 +465,7 @@
+   size_t n = strlen (s);
+   TRACE ("%s\n", __PRETTY_FUNCTION__);
+   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
+-  return rindex (s, c);
++  return strrchr (s, c);
+ }
+ 
+ /* XXX:  stpcpy, memccpy */
diff --git a/misc/buildroot/toolchain/gcc/4.6.3/810-arm-softfloat-libgcc.patch b/misc/buildroot/toolchain/gcc/4.6.3/810-arm-softfloat-libgcc.patch
new file mode 100755
index 0000000000..e6a30a3f00
--- /dev/null
+++ b/misc/buildroot/toolchain/gcc/4.6.3/810-arm-softfloat-libgcc.patch
@@ -0,0 +1,38 @@
+[PATCH] add the correct symbols to libgcc for uclibc arm softfloat
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ gcc/config/arm/linux-elf.h |    2 +-
+ gcc/config/arm/t-linux     |    6 +++++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+Index: gcc-4.4.0/gcc/config/arm/t-linux
+===================================================================
+--- gcc-4.4.0.orig/gcc/config/arm/t-linux
++++ gcc-4.4.0/gcc/config/arm/t-linux
+@@ -4,7 +4,11 @@
+ 
+ LIB1ASMSRC = arm/lib1funcs.asm
+ LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
+-	_arm_addsubdf3 _arm_addsubsf3
++	_arm_addsubdf3 _arm_addsubsf3 \
++	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
++	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
++	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
++	_arm_fixsfsi _arm_fixunssfsi
+ 
+ # MULTILIB_OPTIONS = mhard-float/msoft-float
+ # MULTILIB_DIRNAMES = hard-float soft-float
+Index: gcc-4.4.0/gcc/config/arm/linux-elf.h
+===================================================================
+--- gcc-4.4.0.orig/gcc/config/arm/linux-elf.h
++++ gcc-4.4.0/gcc/config/arm/linux-elf.h
+@@ -60,7 +60,7 @@
+    %{shared:-lc} \
+    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
+ 
+-#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
++#define LIBGCC_SPEC "-lgcc"
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
diff --git a/misc/buildroot/toolchain/gcc/4.6.3/820-arm-unbreak-armv4t.patch b/misc/buildroot/toolchain/gcc/4.6.3/820-arm-unbreak-armv4t.patch
new file mode 100755
index 0000000000..8651afcd86
--- /dev/null
+++ b/misc/buildroot/toolchain/gcc/4.6.3/820-arm-unbreak-armv4t.patch
@@ -0,0 +1,14 @@
+http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
+
+diff -Nura gcc-4.5.1.orig/gcc/config/arm/linux-eabi.h gcc-4.5.1/gcc/config/arm/linux-eabi.h
+--- gcc-4.5.1.orig/gcc/config/arm/linux-eabi.h	2009-10-30 17:03:09.000000000 -0300
++++ gcc-4.5.1/gcc/config/arm/linux-eabi.h	2010-11-02 15:38:25.792208500 -0300
+@@ -44,7 +44,7 @@
+    The ARM10TDMI core is the default for armv5t, so set
+    SUBTARGET_CPU_DEFAULT to achieve this.  */
+ #undef  SUBTARGET_CPU_DEFAULT
+-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
+ 
+ /* TARGET_BIG_ENDIAN_DEFAULT is set in
+    config.gcc for big endian configurations.  */
diff --git a/misc/buildroot/toolchain/gcc/4.6.3/900-nuttx-nolibstdc.patch b/misc/buildroot/toolchain/gcc/4.6.3/900-nuttx-nolibstdc.patch
new file mode 100755
index 0000000000..5628646a6b
--- /dev/null
+++ b/misc/buildroot/toolchain/gcc/4.6.3/900-nuttx-nolibstdc.patch
@@ -0,0 +1,13 @@
+--- gcc-4.5.2/configure.orig	2011-04-28 17:25:37.091035400 -0600
++++ gcc-4.5.2/configure	2011-04-28 17:26:26.868332200 -0600
+@@ -3741,6 +3741,10 @@
+     ;;
+ esac
+ 
++# If we are building against NuttX, then don't attempt to build libstdc++
++# (should be conditioned on --with-nuttx)
++noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3"
++
+ # If we aren't building newlib, then don't build libgloss, since libgloss
+ # depends upon some newlib header files.
+ case "${noconfigdirs}" in
diff --git a/misc/buildroot/toolchain/gcc/4.6.3/powerpc-link-with-math-lib.patch.conditional b/misc/buildroot/toolchain/gcc/4.6.3/powerpc-link-with-math-lib.patch.conditional
new file mode 100755
index 0000000000..7e75e87f23
--- /dev/null
+++ b/misc/buildroot/toolchain/gcc/4.6.3/powerpc-link-with-math-lib.patch.conditional
@@ -0,0 +1,125 @@
+http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html
+
+On glibc the libc.so carries a copy of the math function copysignl() but
+on uClibc math functions like copysignl() live in libm. Since libgcc_s
+contains unresolved symbols, any attempt to link against libgcc_s
+without explicitely specifying -lm fails, resulting in a broken
+bootstrap of the compiler.
+
+Forward port to gcc 4.5.1 by Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura gcc-4.5.1.orig/gcc/config/t-slibgcc-elf-ver gcc-4.5.1/gcc/config/t-slibgcc-elf-ver
+--- gcc-4.5.1.orig/gcc/config/t-slibgcc-elf-ver	2010-11-03 14:35:08.644904042 -0300
++++ gcc-4.5.1/gcc/config/t-slibgcc-elf-ver	2010-11-03 14:35:56.332904024 -0300
+@@ -27,7 +27,7 @@
+ SHLIB_OBJS = @shlib_objs@
+ SHLIB_DIR = @multilib_dir@
+ SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@
+-SHLIB_LC = -lc
++SHLIB_LC = @libgcc_libm@ -lc
+ SHLIB_MAKE_SOLINK = $(LN_S) $(SHLIB_SONAME) $(SHLIB_DIR)/$(SHLIB_SOLINK)
+ SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_SONAME) \
+ 	$$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
+diff -Nura gcc-4.5.1.orig/libgcc/Makefile.in gcc-4.5.1/libgcc/Makefile.in
+--- gcc-4.5.1.orig/libgcc/Makefile.in	2010-11-03 14:32:44.272904042 -0300
++++ gcc-4.5.1/libgcc/Makefile.in	2010-11-03 14:37:03.893904042 -0300
+@@ -39,6 +39,7 @@
+ decimal_float = @decimal_float@
+ enable_decimal_float = @enable_decimal_float@
+ fixed_point = @fixed_point@
++LIBGCC_LIBM = @LIBGCC_LIBM@
+ 
+ host_noncanonical = @host_noncanonical@
+ 
+@@ -798,9 +799,10 @@
+ 		@multilib_dir@,$(MULTIDIR),$(subst \
+ 		@shlib_objs@,$(objects),$(subst \
+ 		@shlib_base_name@,libgcc_s,$(subst \
++		@libgcc_libm@,$(LIBGCC_LIBM),$(subst \
+ 		@shlib_map_file@,$(mapfile),$(subst \
+ 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \
+-		@shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))
++		@shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))))
+ 
+ libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts)
+ 	# @multilib_flags@ is still needed because this may use
+diff -Nura gcc-4.5.1.orig/libgcc/configure gcc-4.5.1/libgcc/configure
+--- gcc-4.5.1.orig/libgcc/configure	2010-11-03 14:32:44.283904042 -0300
++++ gcc-4.5.1/libgcc/configure	2010-11-03 14:39:48.685904042 -0300
+@@ -557,6 +557,7 @@
+ extra_parts
+ tmake_file
+ set_use_emutls
++LIBGCC_LIBM
+ set_have_cc_tls
+ vis_hide
+ fixed_point
+@@ -3847,6 +3848,37 @@
+   set_use_emutls="-DUSE_EMUTLS"
+ fi
+ 
++# On powerpc libgcc_s references copysignl which is a libm function but
++# glibc apparently also provides it via libc as opposed to uClibc where
++# it lives in libm.
++echo "$as_me:$LINENO: checking for library containing copysignl" >&5
++echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6
++if test "${libgcc_cv_copysignl_lib+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++    echo '#include <features.h>' > conftest.c
++    echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
++    libgcc_cv_copysignl_lib="-lc"
++    if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }
++    then
++       libgcc_cv_copysignl_lib="-lm"
++    fi
++    rm -f conftest.*
++
++fi
++echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5
++echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6
++
++case /${libgcc_cv_copysignl_lib}/ in
++  /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
++  *) LIBGCC_LIBM= ;;
++esac
+ 
+ # Conditionalize the makefile for this target machine.
+ tmake_file_=
+diff -Nura gcc-4.5.1.orig/libgcc/configure.ac gcc-4.5.1/libgcc/configure.ac
+--- gcc-4.5.1.orig/libgcc/configure.ac	2010-11-03 14:32:44.735904042 -0300
++++ gcc-4.5.1/libgcc/configure.ac	2010-11-03 14:42:11.278904045 -0300
+@@ -238,6 +238,27 @@
+ fi
+ AC_SUBST(set_have_cc_tls)
+ 
++# On powerpc libgcc_s references copysignl which is a libm function but
++# glibc apparently also provides it via libc as opposed to uClibc where
++# it lives in libm.
++AC_CACHE_CHECK
++  libgcc_cv_copysignl_lib,
++    echo '#include <features.h>' > conftest.c
++    echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
++    libgcc_cv_copysignl_lib="-lc"
++    if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD)
++    then
++       libgcc_cv_copysignl_lib="-lm"
++    fi
++    rm -f conftest.*
++  ])
++
++case /${libgcc_cv_copysignl_lib}/ in
++  /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
++  *) LIBGCC_LIBM= ;;
++esac
++AC_SUBST(LIBGCC_LIBM)
++
+ # See if we have emulated thread-local storage.
+ GCC_CHECK_EMUTLS
+ set_use_emutls=
diff --git a/misc/buildroot/toolchain/gcc/Config.in b/misc/buildroot/toolchain/gcc/Config.in
index d2b4b69fe7..822cfd4b93 100644
--- a/misc/buildroot/toolchain/gcc/Config.in
+++ b/misc/buildroot/toolchain/gcc/Config.in
@@ -41,6 +41,11 @@ choice
 		select BR2_GCC_SUPPORTS_SYSROOT
 		bool "gcc 4.5.2"
 
+	config BR2_GCC_VERSION_4_6_3
+		depends on !BR2_avr32 && !BR2_nios2 && !BR2_m9s12x
+		select BR2_GCC_SUPPORTS_SYSROOT
+		bool "gcc 4.6.3"
+
 endchoice
 
 config BR2_GCC_SUPPORTS_SYSROOT
@@ -54,6 +59,7 @@ config BR2_GCC_VERSION
 	default "4.2.4"     if BR2_GCC_VERSION_4_2_4
 	default "4.3.3"     if BR2_GCC_VERSION_4_3_3
 	default "4.5.2"     if BR2_GCC_VERSION_4_5_2
+	default "4.6.3"     if BR2_GCC_VERSION_4_6_3
 
 config BR2_GCC_USE_SJLJ_EXCEPTIONS
 	bool "Enable setjmp/longjmp exceptions?"
diff --git a/misc/buildroot/toolchain/gdb/Config.in b/misc/buildroot/toolchain/gdb/Config.in
index fbea5b143c..ebe8578a92 100644
--- a/misc/buildroot/toolchain/gdb/Config.in
+++ b/misc/buildroot/toolchain/gdb/Config.in
@@ -40,9 +40,14 @@ choice
 		bool "gdb 6.8"
 		depends on !BR2_avr32
 
+	config BR2_GDB_VERSION_7_4
+		config BR2_GDB_VERSION_7_4
+		depends on !BR2_bfin
+
 endchoice
 
 config BR2_GDB_VERSION
 	string
 	default "6.3"      if BR2_GDB_VERSION_6_3
 	default "6.8"      if BR2_GDB_VERSION_6_8
+	default "7.4.1"    if BR2_GDB_VERSION_7_4
diff --git a/misc/buildroot/toolchain/gdb/gdb.mk b/misc/buildroot/toolchain/gdb/gdb.mk
index aa9e126bc0..0f0f7e89b7 100644
--- a/misc/buildroot/toolchain/gdb/gdb.mk
+++ b/misc/buildroot/toolchain/gdb/gdb.mk
@@ -36,7 +36,9 @@ ifeq ($(GDB_VERSION),snapshot)
 		tar jtf $(DL_DIR)/$(GDB_SOURCE) | head -1 | cut -d"/" -f1)
 	ln -sf $(TOOL_BUILD_DIR)/$(shell tar jtf $(DL_DIR)/$(GDB_SOURCE) | head -1 | cut -d"/" -f1) $(GDB_DIR)
 endif
+ifneq ($(wildcard toolchain/gdb/$(GDB_VERSION)),)
 	toolchain/patch-kernel.sh $(GDB_DIR) toolchain/gdb/$(GDB_VERSION) \*.patch
+endif
 	$(CONFIG_UPDATE) $(GDB_DIR)
 	touch $(GDB_DIR)/.unpacked
 
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html
index ec6a8be24d..f22ab418c9 100644
--- a/nuttx/Documentation/NuttX.html
+++ b/nuttx/Documentation/NuttX.html
@@ -1309,7 +1309,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
       <b>TI TMS320C5471</b> (also called <b>C5471</b> or <b>TMS320DA180</b> or <b>DA180</b>).
       NuttX operates on the ARM7 of this dual core processor.
       This port uses the <a href="http://www.spectrumdigital.com/">Spectrum Digital</a>
-      evaluation board with a GNU arm-elf toolchain* under Linux or Cygwin.
+      evaluation board with a GNU arm-nuttx-elf toolchain* under Linux or Cygwin.
     </p>
     <ul>
       <p>
@@ -1352,7 +1352,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
       <b>NXP LPC214x</b>.
       Support is provided for the NXP LPC214x family of processors.  In particular,
       support is provided for the mcu123.com lpc214x evaluation board (LPC2148).
-      This port also used the GNU arm-elf toolchain* under Linux or Cygwin.
+      This port also used the GNU arm-nuttx-elf toolchain* under Linux or Cygwin.
     </p>
     <ul>
       <p>
@@ -1386,7 +1386,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
       Support is provided for the NXP LPC2378 MCU.  In particular,
       support is provided for the Olimex-LPC2378 development board.
       This port was contributed by Rommel Marcelo is was first released in NuttX-5.3.
-      This port also used the GNU arm-elf toolchain* under Linux or Cygwin.
+      This port also used the GNU arm-nuttx-elf toolchain* under Linux or Cygwin.
     </p>
     <ul>
       <p>
@@ -1413,7 +1413,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
       <b>STMicro STR71x</b>.
       Support is provided for the STMicro STR71x family of processors.  In particular,
       support is provided for the Olimex STR-P711 evaluation board.
-      This port also used the GNU arm-elf toolchain* under Linux or Cygwin.
+      This port also used the GNU arm-nuttx-elf toolchain* under Linux or Cygwin.
     </p>
     <ul>
       <p>
@@ -1450,7 +1450,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
   <td>
     <p>
       <b>Freescale MC9328MX1</b> or <b>i.MX1</b>.
-      This port uses the Freescale MX1ADS development board with a GNU arm-elf toolchain*
+      This port uses the Freescale MX1ADS development board with a GNU arm-nuttx-elf toolchain*
       under either Linux or Cygwin.
     </p>
     <ul>
@@ -1476,7 +1476,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
       NuttX operates on the ARM9 of this dual core processor.
       This port uses the
       <a href="http://wiki.neurostechnology.com/index.php/Developer_Welcome">Neuros OSD</a>
-      with a GNU arm-elf toolchain* under Linux or Cygwin.
+      with a GNU arm-nuttx-elf toolchain* under Linux or Cygwin.
       The port was performed using the OSD v1.0, development board.
     </p>
     <ul>
@@ -1498,7 +1498,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
   <td>
     <b>NXP <a href="http://ics.nxp.com/products/lpc3000/lpc313x.lpc314x.lpc315x/">LPC3131</a></b>.
     The port for the NXP LPC3131 on the <a href="http://www.embeddedartists.com/products/kits/lpc3131_kit.php">Embedded Artists EA3131</a> 
-    development board was first released in NuttX-5.1 with a GNU arm-elf or arm-eabi toolchain* under Linux or Cygwin
+    development board was first released in NuttX-5.1 with a GNU arm-nuttx-elf or arm-eabi toolchain* under Linux or Cygwin
     (but was not functional until NuttX-5.2).
     </p>
     <ul>
@@ -1571,7 +1571,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
     <p>
       <b>Luminary/TI Stellaris LM3S6918</b>.
       This port uses the <a href=" http://www.micromint.com/">Micromint</a> Eagle-100 development
-      board with a GNU arm-elf toolchain* under either Linux or Cygwin.
+      board with a GNU arm-nuttx-elf toolchain* under either Linux or Cygwin.
     </p>
     <ul>
       <p>
@@ -1601,7 +1601,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
   <td>
     <p>
       <b>Luminary/TI Stellaris LM3S6965</b>.
-      This port uses the Stellaris LM3S6965 Ethernet Evalution Kit with a GNU arm-elf toolchain*
+      This port uses the Stellaris LM3S6965 Ethernet Evalution Kit with a GNU arm-nuttx-elf toolchain*
       under either Linux or Cygwin.
     </p>
     <ul>
@@ -1635,7 +1635,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
   <td>
     <p>
       <b>Luminary/TI Stellaris LM3S8962</b>.
-      This port uses the Stellaris EKC-LM3S8962 Ethernet+CAN Evalution Kit with a GNU arm-elf toolchain*
+      This port uses the Stellaris EKC-LM3S8962 Ethernet+CAN Evalution Kit with a GNU arm-nuttx-elf toolchain*
       under either Linux or Cygwin.
       Contributed by Larry Arnold.
     </p>
@@ -1733,7 +1733,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
       </li>
     </ol>
     <p>
-      These ports uses a GNU arm-elf toolchain* under either Linux or Cygwin (with native Windows GNU
+      These ports uses a GNU arm-nuttx-elf toolchain* under either Linux or Cygwin (with native Windows GNU
       tools or Cygwin-based GNU tools).
     </p>
     <ul>
@@ -1842,7 +1842,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
       <b>Atmel AT91SAM3U</b>.
       This port uses the <a href="http://www.atmel.com/">Atmel</a> SAM3U-EK
       development board that features the AT91SAM3U4E MCU.
-      This port uses a GNU arm-elf or arm-eabi toolchain* under either Linux or Cygwin (with native Windows GNU
+      This port uses a GNU arm-nuttx-elf or arm-eabi toolchain* under either Linux or Cygwin (with native Windows GNU
       tools or Cygwin-based GNU tools).
     </p>
     <ul>
@@ -1905,7 +1905,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
     <p>
       The Nucleus 2G board, the mbed board, and the LPCXpresso all feature the NXP LPC1768 MCU;
       the Olimex LPC1766-STK board features an LPC1766.
-      All use a GNU arm-elf or arm-eabi toolchain* under either Linux or Cygwin (with native Windows GNU tools or Cygwin-based GNU tools).
+      All use a GNU arm-nuttx-elf or arm-eabi toolchain* under either Linux or Cygwin (with native Windows GNU tools or Cygwin-based GNU tools).
     </p>
     <ul>
       <p>
@@ -2386,7 +2386,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
       </li>
     </ul>
     <p>
-      Both use a GNU arm-elf toolchain* under Linux or Cygwin.
+      Both use a GNU arm-nuttx-elf toolchain* under Linux or Cygwin.
       The NuttX <a href="http://sourceforge.net/projects/nuttx/files/buildroot/">buildroot</a> provides a properly patched GCC 3.4.4 toolchain that is highly optimized for the m9s12x family.
     </p>
     <ul>
@@ -2696,10 +2696,10 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
         <b>STATUS:</b>
         Initial source files released in nuttx-0.4.2.
         At this point, the port has not been integrated;    the target cannot be built
-        because the GNU <code>m16c-elf-ld</code> link fails with  the following message:
+        because the GNU <code>m16c-nuttx-elf-ld</code> link fails with  the following message:
       </p>
       <ul>
-      <code>m32c-elf-ld: BFD (GNU Binutils) 2.19 assertion fail /home/Owner/projects/nuttx/buildroot/toolchain_build_m32c/binutils-2.19/bfd/elf32-m32c.c:482</code>
+      <code>m32c-nuttx-elf-ld: BFD (GNU Binutils) 2.19 assertion fail /home/Owner/projects/nuttx/buildroot/toolchain_build_m32c/binutils-2.19/bfd/elf32-m32c.c:482</code>
       </ul>
       <p>Where the reference line is:</p>
       <ul><pre>
@@ -3583,7 +3583,7 @@ buildroot-1.10 2011-05-06 &lt;gnutt@nuttx.org&gt;
       i486 ELF binaries.  But that will not work under Cygwin!  The Cygwin
       toolchain (and probably MinGW), build DOS MZ format executables (i.e.,
       .exe files).  That is probably not usable for most NuttX targets.
-      Instead, you should use this i486-elf-gcc to generate true ELF binaries
+      Instead, you should use this i486-nuttx-elf-gcc to generate true ELF binaries
       under Cygwin.
     * Makefile - Alter copy arguments to avoid permissions problems when
       copying NuttX header files.
diff --git a/nuttx/Documentation/NuttXLinks.html b/nuttx/Documentation/NuttXLinks.html
index 7196ea3ea3..b69a354fad 100644
--- a/nuttx/Documentation/NuttXLinks.html
+++ b/nuttx/Documentation/NuttXLinks.html
@@ -22,6 +22,7 @@
       <li><a href="http://sourceforge.net/projects/nuttx/develop" target="_top">SourceForge</a></li>
       <li><a href="http://freshmeat.net/projects/nuttx/" target="_top">FreshMeat</a></li>
       <li><a href="http://tech.groups.yahoo.com/group/nuttx/" target="_top">Forum</a></li>
+      <li><a href="https://www.ohloh.net/p/nuttx" target="_top">Ohloh</a></li>
       <li><a href="http://www.oschina.net/p/nuttx" target="_top">OSChina</a></li>
       <li><a href="http://sourceforge.net/projects/nuttx/files/" target="_top">Downloads</a></li>
       <li><a href="http://www.nx-engineering.com/nuttx-wiki/" target="_top">Wiki</a></li>
diff --git a/nuttx/Documentation/NuttXNxFlat.html b/nuttx/Documentation/NuttXNxFlat.html
index 6f78fffcd2..73be5d7b34 100644
--- a/nuttx/Documentation/NuttXNxFlat.html
+++ b/nuttx/Documentation/NuttXNxFlat.html
@@ -443,7 +443,7 @@ cat ../syscall/syscall.csv ../lib/lib.csv | sort >tmp.csv
   <tr>
     <td><br></td>
     <td><br></td>
-    <td><code>abc-elf-ld -r -d -warn-common -o $@ $^</code></td>
+    <td><code>abc-nuttx-elf-ld -r -d -warn-common -o $@ $^</code></td>
   </tr>
   <tr>
     <th>Target 2</th>
@@ -464,7 +464,7 @@ cat ../syscall/syscall.csv ../lib/lib.csv | sort >tmp.csv
     <td><br></td>
     <td><br></td>
     <td>
-      <code>abc-elf-ld -r -d -warn-common -T binfmt/libnxflat/gnu-nxflat.ld -no-check-sections -o $@ hello.o hello-thunk.o</code>
+      <code>abc-nuttx-elf-ld -r -d -warn-common -T binfmt/libnxflat/gnu-nxflat.ld -no-check-sections -o $@ hello.o hello-thunk.o</code>
     </td>
   </tr>
   <tr>
diff --git a/nuttx/Documentation/NuttXRelated.html b/nuttx/Documentation/NuttXRelated.html
index 978eb1d441..9d26a98957 100644
--- a/nuttx/Documentation/NuttXRelated.html
+++ b/nuttx/Documentation/NuttXRelated.html
@@ -41,7 +41,7 @@
       <li><a href="http://osmocom.org/" target="top">Osmocom-BB</a></li>
       <li><a href="https://pixhawk.ethz.ch/px4/" target="top">PX4 Autopilot</a></li>
       <li><a href="http://rgmp.sourceforge.net/wiki/index.php/Main_Page" target="top">RGMP</a></li>
-      <li><a href="http://code.google.com/p/tmr/" target="top">Top Multi-Rotor (TMR)</a></li>
+      <li><a href="http://sourceforge.net/projects/tmr-fc/" target="top">Top Multi-Rotor (TMR)</a></li>
   </tr>
   <tr>
     <td align="center" valign="top" width="22">
diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html
index e13c3be621..21ae44144d 100644
--- a/nuttx/Documentation/NuttxPortingGuide.html
+++ b/nuttx/Documentation/NuttxPortingGuide.html
@@ -768,7 +768,7 @@
     This is a port to the Spectrum Digital C5471 evaluation board.  The
     C5471 is a dual core processor from TI with an ARM7TDMI general purpose
     processor and a c54 DSP.  It is also known as TMS320DA180 or just DA180.
-    NuttX runs on the ARM core and is built with with a GNU arm-elf toolchain
+    NuttX runs on the ARM core and is built with with a GNU arm-nuttx-elf toolchain
     under Linux or Cygwin. This port is complete and verified.
   </li>
 
@@ -780,14 +780,14 @@
 
   <li><code>configs/ea3131</code>:
     Embedded Artists EA3131 Development bard.  This board is based on the 
-    an NXP LPC3131 MCU. This OS is built with the arm-elf toolchain.
+    an NXP LPC3131 MCU. This OS is built with the arm-nuttx-elf toolchain.
     STATUS:  This port is complete and mature.
   </li>
 
   <li><code>configs/eagle100</code>:
     Micromint Eagle-100 Development board.  This board is based on the 
     an ARM Cortex-M3 MCU, the Luminary LM3S6918. This OS is built with the
-    arm-elf toolchain.  STATUS:  This port is complete and mature.
+    arm-nuttx-elf toolchain.  STATUS:  This port is complete and mature.
   </li>
 
   <li><code>configs/ez80f0910200kitg</code>
@@ -805,7 +805,7 @@
   <li><code>configs/lm3s6965-ek</code>:
     Stellaris LM3S6965 Evaluation Kit.  This board is based on the 
     an ARM Cortex-M3 MCU, the Luminary/TI LM3S6965. This OS is built with the
-    arm-elf toolchain.  STATUS:  This port is complete and mature.
+    arm-nuttx-elf toolchain.  STATUS:  This port is complete and mature.
   </li>
 
   <li><code>configs/lm3s8962-ek</code>:
@@ -827,13 +827,13 @@
   <li><code>configs/mbed</code>:
     The configurations in this directory support the mbed board (http://mbed.org)
     that features the NXP LPC1768 microcontroller. This OS is also built
-    with the arm-elf toolchain.  STATUS:  Contributed.
+    with the arm-nuttx-elf toolchain.  STATUS:  Contributed.
   </li>
 
   <li><code>configs/mcu123-lpc214x</code>:
     This port is for the NXP LPC2148 as provided on the mcu123.com
     lpc214x development board.
-    This OS is also built with the arm-elf toolchain* under Linux or Cygwin.
+    This OS is also built with the arm-nuttx-elf toolchain* under Linux or Cygwin.
     The port supports serial, timer0, spi, and usb.
   </li>
 
@@ -858,7 +858,7 @@
   </li>
 
   <li><code>configs/ntosd-dm320</code>:
-    This port uses the Neuros OSD with a GNU arm-elf toolchain* under Linux or Cygwin.
+    This port uses the Neuros OSD with a GNU arm-nuttx-elf toolchain* under Linux or Cygwin.
     See <a href="http://wiki.neurostechnology.com/index.php/Developer_Welcome">Neuros Wiki</a>
     for further information.
     NuttX operates on the ARM9EJS of this dual core processor.
@@ -878,12 +878,12 @@
   </li>
 
   <li><code>configs/olimex-lpc2378</code>:
-    This port uses the Olimex-lpc2378 board and a GNU arm-elf toolchain under
+    This port uses the Olimex-lpc2378 board and a GNU arm-nuttx-elf toolchain under
     Linux or Cygwin.  STATUS: ostest and NSH configurations available.
   </li>
 
   <li><code>configs/olimex-strp711</code>:
-    This port uses the Olimex STR-P711 board arm-elf toolchain* under Linux or Cygwin.
+    This port uses the Olimex STR-P711 board arm-nuttx-elf toolchain* under Linux or Cygwin.
     See the <a href="http://www.olimex.com/dev/str-p711.html">Olimex</a> web site
     for further information.
     STATUS: Configurations for the basic OS test and NSH are complete and verified.
diff --git a/nuttx/Documentation/UsbTrace.html b/nuttx/Documentation/UsbTrace.html
index ec48e260dd..e85377756e 100644
--- a/nuttx/Documentation/UsbTrace.html
+++ b/nuttx/Documentation/UsbTrace.html
@@ -1,332 +1,332 @@
-<html>
-<head>
-<title>NuttX USB Trace Capability</title>
-</head>
-
-<body background="backgd.gif">
-<hr><hr>
-<table width ="100%">
-  <tr align="center" bgcolor="#e4e4e4">
-    <td>
-      <h1><big><font color="#3c34ec"><i>NuttX USB Device Trace</i></font></big></h1>
-      <p>Last Updated: March 20, 2011</p>
-    </td>
-  </tr>
-</table>
-<hr><hr>
-<p><b>USB Device Tracing Controls</b>.
-  The NuttX USB device subsystem supports a fairly sophisticated tracing facility.
-  The basic trace cabability is controlled by these NuttX configuration settings:
-</p>
-<ul>
-  <li><code>CONFIG_USBDEV_TRACE</code>: Enables USB tracing</li>
-  <li><code>CONFIG_USBDEV_TRACE_NRECORDS</code>: Number of trace entries to remember</li>
-</ul>
-<p><b>Trace IDs</b>.
-  The trace facility works like this:
-  When enabled, USB events that occur in either the USB device driver or in the USB class driver are logged.
-  These events are described in <code>include/nuttx/usb/usbdev_trace.h</code>.
-  The logged events are identified by a set of event IDs:
-</p>
-<ul><table>
-  <tr>
-    <td><code>TRACE_INIT_ID</code></td>
-    <td>Initialization events</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_EP_ID</code></td>
-    <td>Endpoint API calls</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_DEV_ID</code></td>
-    <td>USB device API calls</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_CLASS_ID</code></td>
-    <td>USB class driver API calls</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_CLASSAPI_ID</code></td>
-    <td>Other class driver system API calls</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_CLASSSTATE_ID</code></td>
-    <td>Track class driver state changes</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_INTENTRY_ID</code></td>
-    <td>Interrupt handler entry</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_INTDECODE_ID</code></td>
-    <td>Decoded interrupt event</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_INTEXIT_ID</code></td>
-    <td>Interrupt handler exit</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_OUTREQQUEUED_ID</code></td>
-    <td>Request queued for OUT endpoint</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_INREQQUEUED_ID</code></td>
-    <td>Request queued for IN endpoint</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_READ_ID</code></td>
-    <td>Read (OUT) action</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_WRITE_ID</code></td>
-    <td>Write (IN) action</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_COMPLETE_ID</code></td>
-    <td>Request completed</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_DEVERROR_ID</code></td>
-    <td>USB controller driver error event</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_CLSERROR_ID</code></td>
-    <td>USB class driver error event</td>
-  </tr>
-</table></ul>
-<p><b>Logged Events</b>.
-  Each logged event is 32-bits in size and includes
-</p>
-<ol>
-  <li>8-bits of the trace ID (values associated with the above)</li>
-  <li>8-bits of additional trace ID data, and</li>
-  <li>16-bits of additonal data.</li>
-</ol>
-<p><b>8-bit Trace Data</b>
-  The 8-bit trace data depends on the specific event ID.  As examples,
-</p>
-<ul>
-  <li>
-    For the USB serial and mass storage class, the 8-bit event data is provided in <code>include/nuttx/usb/usbdev_trace.h</code>. 
-  </li>
-  <li>
-    For the USB device driver, that 8-bit event data is provided within the USB device driver itself.
-    So, for example, the 8-bit event data for the LPC1768 USB device driver is found in <code>arch/arm/src/lpc17xx/lpc17_usbdev.c</code>.
-  </li>
-</ul>
-<p><b>16-bit Trace Data</b>.
-  The 16-bit trace data provided additional context data relevant to the specific logged event.
-</p>
-<p><b>Trace Control Interfaces</b>.
-  Logging of each of these kinds events can be enabled or disabled using the interfaces described in <code>include/nuttx/usb/usbdev_trace.h</code>.
-</p>
-<p><b>Enabling USB Device Tracing</b>.
-  USB device tracing will be configured if <code>CONFIG_USBDEV</code> and either of the following are set in the NuttX configuration file:
-</p>
-<ul>
-  <li><code>CONFIG_USBDEV_TRACE</code>, or</li>
-  <li><code>CONFIG_DEBUG and CONFIG_DEBUG_USB</code></li>
-</ul>
-<p><b>Log Data Sink</b>.
-  The logged data itself may go to either (1) an internal circular buffer, or (2) may be provided on the console.
-  If <code>CONFIG_USBDEV_TRACE</code> is defined, then the trace data will go to the circular buffer.
-  The size of the circular buffer is determined by <code>CONFIG_USBDEV_TRACE_NRECORDS</code>.
-  Otherwise, the trace data goes to console.
-<p>
-<p><b>Example</b>.
-  Here is an example of USB trace output using <code>apps/examples/usbserial</code> for an LPC1768 platform with the following NuttX configuration settings:
-</p>
-<ul>
-  <li><code>CONFIG_DEBUG</code>, <code>CONFIG_DEBUG_VERBOSE</code>, <code>CONFIG_USB</code>
-  <li><code>CONFIG_EXAMPLES_USBSERIAL_TRACEINIT</code>, <code>CONFIG_EXAMPLES_USBSERIAL_TRACECLASS</code>,
-    <code>CONFIG_EXAMPLES_USBSERIAL_TRACETRANSFERS</code>, <code>CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER</code>,
-    <code>CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS</code>
-</ul>
-<p>Console Output:</p>
-<ul><table>
-  <tr>
-    <td align="center">&nbsp;</td>
-    <td align="left"><code>ABDE</code></td>
-  </tr>
-  <tr>
-    <td align="center">&nbsp;</td>
-    <td align="left"><code>usbserial_main: Registering USB serial driver</code></td>
-  </tr>
-  <tr>
-    <td align="center">&nbsp;</td>
-    <td align="left"><code>uart_register: Registering /dev/ttyUSB0</code></td>
-  </tr>
-  <tr>
-    <td align="center">&nbsp;</td>
-    <td align="left"><code>usbserial_main: Successfully registered the serial driver</code></td>
-  </tr>
-  <tr>
-    <td align="center">1</td>
-    <td align="left"><code>Class API call 1: 0000</code></td>
-  </tr>
-  <tr>
-    <td align="center">2</td>
-    <td align="left"><code>Class error: 19:0000</code></td>
-  </tr>
-  <tr>
-    <td align="center">&nbsp;</td>
-    <td align="left"><code>usbserial_main: ERROR: Failed to open /dev/ttyUSB0 for reading: 107</code></td>
-  </tr>
-  <tr>
-    <td align="center">&nbsp;</td>
-    <td align="left"><code>usbserial_main: Not connected. Wait and try again.</code></td>
-  </tr>
-  <tr>
-    <td align="center">3</td>
-    <td align="left"><code>Interrupt 1 entry: 0039</code></td>
-  </tr>
-  <tr>
-    <td align="center">4</td>
-    <td align="left"><code>Interrupt decode 7: 0019</code></td>
-  </tr>
-  <tr>
-    <td align="center">5</td>
-    <td align="left"><code>Interrupt decode 32: 0019</code></td>
-  </tr>
-  <tr>
-    <td align="center">6</td>
-    <td align="left"><code>Interrupt decode 6: 0019</code></td>
-  </tr>
-  <tr>
-    <td align="center">7</td>
-    <td align="left"><code>Class disconnect(): 0000</code></td>
-  </tr>
-  <tr>
-    <td align="center">8</td>
-    <td align="left"><code>Device pullup(): 0001</code></td>
-  </tr>
-  <tr>
-    <td align="center">9</td>
-    <td align="left"><code>Interrupt 1 exit: 0000</code></td>
-  </tr>
-</table></ul>
-<p>
-  The numbered items are USB USB trace output.
-  You can look in the file <code>drivers/usbdev/usbdev_trprintf.c</code> to see examctly how each output line is formatted.
-  Here is how each line should be interpreted:
-</p>
-<ul><table>
-  <tr>
-    <th align="center">&nbsp</th>
-    <td align="left">USB EVENT ID</td>
-    <td align="right">8-bit<br>EVENT<br>DATA</td>
-    <td align="left">MEANING</td>
-    <td align="left">16-bit<br>EVENT<br>DATA</td>
-  </tr>
-  <tr>
-    <td align="center">1</td>
-    <td align="left"><code>TRACE_CLASSAPI_ID</code><sup>1</sup></td>
-    <td align="right">1</td>
-    <td align="left"><code>USBSER_TRACECLASSAPI_SETUP</code><sup>1</sup></td>
-    <td align="left">0000</td>
-  </tr>
-  <tr>
-    <td align="center">2</td>
-    <td align="left"><code>TRACE_CLSERROR_ID</code><sup>1</sup></td>
-    <td align="right">19</td>
-    <td align="left"><code>USBSER_TRACEERR_SETUPNOTCONNECTED</code><sup>1</sup></td>
-    <td align="left">0000</td>
-  </tr>
-  <tr>
-    <td align="center">3</td>
-    <td align="left"><code>TRACE_INTENTRY_ID</code><sup>1</sup></td>
-    <td align="right">1</td>
-    <td align="left"><code>LPC17_TRACEINTID_USB</code><sup>2</sup></td>
-    <td align="left">0039</td>
-  </tr>
-  <tr>
-    <td align="center">4</td>
-    <td align="left"><code>TRACE_INTDECODE_ID</code><sup>2</sup></td>
-    <td align="right">7</td>
-    <td align="left"><code>LPC17_TRACEINTID_DEVSTAT</code><sup>2</sup></td>
-    <td align="left">0019</td>
-  </tr>
-  <tr>
-    <td align="center">5</td>
-    <td align="left"><code>TRACE_INTDECODE_ID</code><sup>2</sup></td>
-    <td align="right">32</td>
-    <td align="left"><code>LPC17_TRACEINTID_SUSPENDCHG</code><sup>2</sup></td>
-    <td align="left">0019</td>
-  </tr>
-  <tr>
-    <td align="center">6</td>
-    <td align="left"><code>TRACE_INTDECODE_ID</code><sup>2</sup></td>
-    <td align="right">6</td>
-    <td align="left"><code>LPC17_TRACEINTID_DEVRESET</code><sup>2</sup></td>
-    <td align="left">0019</td>
-  </tr>
-  <tr>
-    <td align="center">7</td>
-    <td align="left"><code>TRACE_CLASS_ID</code><sup>1</sup></td>
-    <td align="right">3</td>
-    <td align="left"><code>(See TRACE_CLASSDISCONNECT</code><sup>1</sup>)</td>
-    <td align="left">0000</td>
-  </tr>
-  <tr>
-    <td align="center">8</td>
-    <td align="left"><code>TRACE_DEV_ID</code><sup>1</sup></td>
-    <td align="right">6</td>
-    <td align="left"><code>(See TRACE_DEVPULLUP</code><sup>1</sup>)</td>
-    <td align="left">0001</td>
-  </tr>
-  <tr>
-    <td align="center">9</td>
-    <td align="left"><code>TRACE_INTEXIT_ID</code><sup>1</sup></td>
-    <td align="right">1</td>
-    <td align="left"><code>LPC17_TRACEINTID_USB</code><sup>2</sup></td>
-    <td align="left">0000</td>
-  </tr>
-</table>
-<p><small><b>NOTES</b>:<br>
-  <sup>1</sup>See <code>include/nuttx/usb/usbdev_trace.h</code><br>
-  <sup>2</sup><code>See arch/arm/src/lpc17xx/lpc17_usbdev.c</code>
-</small></p>
-</ul>
-<p>
-  In the above example you can see that:
-</p>
-<ul>
-  <li><b>1</b>.
-    The serial class USB setup method was called for the USB serial class.
-    This is the corresponds to the following logic in <code>drivers/usbdev/pl2303.c</code>:
-    <ul><pre>
-static int pl2303_setup(FAR struct uart_dev_s *dev)
-{
-  ...
-  usbtrace(PL2303_CLASSAPI_SETUP, 0);
-  ...
-</pre></ul>
-  </li>
-  <li><b>2</b>.
-    An error occurred while processing the setup command because no configuration has yet been selected by the host.
-    This corresponds to the following logic in <code>drivers/usbdev/pl2303.c</code>:
-    <ul><pre>
-static int pl2303_setup(FAR struct uart_dev_s *dev)
-{
-  ...
-  /* Check if we have been configured */
-
-  if (priv->config == PL2303_CONFIGIDNONE)
-    {
-      usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_SETUPNOTCONNECTED), 0);
-      return -ENOTCONN;
-    }
-  ...
-</pre></ul>
-  <li><b>3-6</b>.
-    Here is a USB interrupt that suspends and resets the device.
-  </li>
-  <li><b>7-8</b>.
-    During the interrupt processing the serial class is disconnected
-  </li>
-  <li><b>9</b>.
-    And the interrupt returns
-  </li>
-</ul>
-</body>
-</html>
+<html>
+<head>
+<title>NuttX USB Trace Capability</title>
+</head>
+
+<body background="backgd.gif">
+<hr><hr>
+<table width ="100%">
+  <tr align="center" bgcolor="#e4e4e4">
+    <td>
+      <h1><big><font color="#3c34ec"><i>NuttX USB Device Trace</i></font></big></h1>
+      <p>Last Updated: March 20, 2011</p>
+    </td>
+  </tr>
+</table>
+<hr><hr>
+<p><b>USB Device Tracing Controls</b>.
+  The NuttX USB device subsystem supports a fairly sophisticated tracing facility.
+  The basic trace cabability is controlled by these NuttX configuration settings:
+</p>
+<ul>
+  <li><code>CONFIG_USBDEV_TRACE</code>: Enables USB tracing</li>
+  <li><code>CONFIG_USBDEV_TRACE_NRECORDS</code>: Number of trace entries to remember</li>
+</ul>
+<p><b>Trace IDs</b>.
+  The trace facility works like this:
+  When enabled, USB events that occur in either the USB device driver or in the USB class driver are logged.
+  These events are described in <code>include/nuttx/usb/usbdev_trace.h</code>.
+  The logged events are identified by a set of event IDs:
+</p>
+<ul><table>
+  <tr>
+    <td><code>TRACE_INIT_ID</code></td>
+    <td>Initialization events</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_EP_ID</code></td>
+    <td>Endpoint API calls</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_DEV_ID</code></td>
+    <td>USB device API calls</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_CLASS_ID</code></td>
+    <td>USB class driver API calls</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_CLASSAPI_ID</code></td>
+    <td>Other class driver system API calls</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_CLASSSTATE_ID</code></td>
+    <td>Track class driver state changes</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_INTENTRY_ID</code></td>
+    <td>Interrupt handler entry</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_INTDECODE_ID</code></td>
+    <td>Decoded interrupt event</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_INTEXIT_ID</code></td>
+    <td>Interrupt handler exit</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_OUTREQQUEUED_ID</code></td>
+    <td>Request queued for OUT endpoint</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_INREQQUEUED_ID</code></td>
+    <td>Request queued for IN endpoint</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_READ_ID</code></td>
+    <td>Read (OUT) action</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_WRITE_ID</code></td>
+    <td>Write (IN) action</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_COMPLETE_ID</code></td>
+    <td>Request completed</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_DEVERROR_ID</code></td>
+    <td>USB controller driver error event</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_CLSERROR_ID</code></td>
+    <td>USB class driver error event</td>
+  </tr>
+</table></ul>
+<p><b>Logged Events</b>.
+  Each logged event is 32-bits in size and includes
+</p>
+<ol>
+  <li>8-bits of the trace ID (values associated with the above)</li>
+  <li>8-bits of additional trace ID data, and</li>
+  <li>16-bits of additonal data.</li>
+</ol>
+<p><b>8-bit Trace Data</b>
+  The 8-bit trace data depends on the specific event ID.  As examples,
+</p>
+<ul>
+  <li>
+    For the USB serial and mass storage class, the 8-bit event data is provided in <code>include/nuttx/usb/usbdev_trace.h</code>. 
+  </li>
+  <li>
+    For the USB device driver, that 8-bit event data is provided within the USB device driver itself.
+    So, for example, the 8-bit event data for the LPC1768 USB device driver is found in <code>arch/arm/src/lpc17xx/lpc17_usbdev.c</code>.
+  </li>
+</ul>
+<p><b>16-bit Trace Data</b>.
+  The 16-bit trace data provided additional context data relevant to the specific logged event.
+</p>
+<p><b>Trace Control Interfaces</b>.
+  Logging of each of these kinds events can be enabled or disabled using the interfaces described in <code>include/nuttx/usb/usbdev_trace.h</code>.
+</p>
+<p><b>Enabling USB Device Tracing</b>.
+  USB device tracing will be configured if <code>CONFIG_USBDEV</code> and either of the following are set in the NuttX configuration file:
+</p>
+<ul>
+  <li><code>CONFIG_USBDEV_TRACE</code>, or</li>
+  <li><code>CONFIG_DEBUG and CONFIG_DEBUG_USB</code></li>
+</ul>
+<p><b>Log Data Sink</b>.
+  The logged data itself may go to either (1) an internal circular buffer, or (2) may be provided on the console.
+  If <code>CONFIG_USBDEV_TRACE</code> is defined, then the trace data will go to the circular buffer.
+  The size of the circular buffer is determined by <code>CONFIG_USBDEV_TRACE_NRECORDS</code>.
+  Otherwise, the trace data goes to console.
+<p>
+<p><b>Example</b>.
+  Here is an example of USB trace output using <code>apps/examples/usbserial</code> for an LPC1768 platform with the following NuttX configuration settings:
+</p>
+<ul>
+  <li><code>CONFIG_DEBUG</code>, <code>CONFIG_DEBUG_VERBOSE</code>, <code>CONFIG_USB</code>
+  <li><code>CONFIG_EXAMPLES_USBSERIAL_TRACEINIT</code>, <code>CONFIG_EXAMPLES_USBSERIAL_TRACECLASS</code>,
+    <code>CONFIG_EXAMPLES_USBSERIAL_TRACETRANSFERS</code>, <code>CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER</code>,
+    <code>CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS</code>
+</ul>
+<p>Console Output:</p>
+<ul><table>
+  <tr>
+    <td align="center">&nbsp;</td>
+    <td align="left"><code>ABDE</code></td>
+  </tr>
+  <tr>
+    <td align="center">&nbsp;</td>
+    <td align="left"><code>usbserial_main: Registering USB serial driver</code></td>
+  </tr>
+  <tr>
+    <td align="center">&nbsp;</td>
+    <td align="left"><code>uart_register: Registering /dev/ttyUSB0</code></td>
+  </tr>
+  <tr>
+    <td align="center">&nbsp;</td>
+    <td align="left"><code>usbserial_main: Successfully registered the serial driver</code></td>
+  </tr>
+  <tr>
+    <td align="center">1</td>
+    <td align="left"><code>Class API call 1: 0000</code></td>
+  </tr>
+  <tr>
+    <td align="center">2</td>
+    <td align="left"><code>Class error: 19:0000</code></td>
+  </tr>
+  <tr>
+    <td align="center">&nbsp;</td>
+    <td align="left"><code>usbserial_main: ERROR: Failed to open /dev/ttyUSB0 for reading: 107</code></td>
+  </tr>
+  <tr>
+    <td align="center">&nbsp;</td>
+    <td align="left"><code>usbserial_main: Not connected. Wait and try again.</code></td>
+  </tr>
+  <tr>
+    <td align="center">3</td>
+    <td align="left"><code>Interrupt 1 entry: 0039</code></td>
+  </tr>
+  <tr>
+    <td align="center">4</td>
+    <td align="left"><code>Interrupt decode 7: 0019</code></td>
+  </tr>
+  <tr>
+    <td align="center">5</td>
+    <td align="left"><code>Interrupt decode 32: 0019</code></td>
+  </tr>
+  <tr>
+    <td align="center">6</td>
+    <td align="left"><code>Interrupt decode 6: 0019</code></td>
+  </tr>
+  <tr>
+    <td align="center">7</td>
+    <td align="left"><code>Class disconnect(): 0000</code></td>
+  </tr>
+  <tr>
+    <td align="center">8</td>
+    <td align="left"><code>Device pullup(): 0001</code></td>
+  </tr>
+  <tr>
+    <td align="center">9</td>
+    <td align="left"><code>Interrupt 1 exit: 0000</code></td>
+  </tr>
+</table></ul>
+<p>
+  The numbered items are USB USB trace output.
+  You can look in the file <code>drivers/usbdev/usbdev_trprintf.c</code> to see examctly how each output line is formatted.
+  Here is how each line should be interpreted:
+</p>
+<ul><table>
+  <tr>
+    <th align="center">&nbsp</th>
+    <td align="left">USB EVENT ID</td>
+    <td align="right">8-bit<br>EVENT<br>DATA</td>
+    <td align="left">MEANING</td>
+    <td align="left">16-bit<br>EVENT<br>DATA</td>
+  </tr>
+  <tr>
+    <td align="center">1</td>
+    <td align="left"><code>TRACE_CLASSAPI_ID</code><sup>1</sup></td>
+    <td align="right">1</td>
+    <td align="left"><code>USBSER_TRACECLASSAPI_SETUP</code><sup>1</sup></td>
+    <td align="left">0000</td>
+  </tr>
+  <tr>
+    <td align="center">2</td>
+    <td align="left"><code>TRACE_CLSERROR_ID</code><sup>1</sup></td>
+    <td align="right">19</td>
+    <td align="left"><code>USBSER_TRACEERR_SETUPNOTCONNECTED</code><sup>1</sup></td>
+    <td align="left">0000</td>
+  </tr>
+  <tr>
+    <td align="center">3</td>
+    <td align="left"><code>TRACE_INTENTRY_ID</code><sup>1</sup></td>
+    <td align="right">1</td>
+    <td align="left"><code>LPC17_TRACEINTID_USB</code><sup>2</sup></td>
+    <td align="left">0039</td>
+  </tr>
+  <tr>
+    <td align="center">4</td>
+    <td align="left"><code>TRACE_INTDECODE_ID</code><sup>2</sup></td>
+    <td align="right">7</td>
+    <td align="left"><code>LPC17_TRACEINTID_DEVSTAT</code><sup>2</sup></td>
+    <td align="left">0019</td>
+  </tr>
+  <tr>
+    <td align="center">5</td>
+    <td align="left"><code>TRACE_INTDECODE_ID</code><sup>2</sup></td>
+    <td align="right">32</td>
+    <td align="left"><code>LPC17_TRACEINTID_SUSPENDCHG</code><sup>2</sup></td>
+    <td align="left">0019</td>
+  </tr>
+  <tr>
+    <td align="center">6</td>
+    <td align="left"><code>TRACE_INTDECODE_ID</code><sup>2</sup></td>
+    <td align="right">6</td>
+    <td align="left"><code>LPC17_TRACEINTID_DEVRESET</code><sup>2</sup></td>
+    <td align="left">0019</td>
+  </tr>
+  <tr>
+    <td align="center">7</td>
+    <td align="left"><code>TRACE_CLASS_ID</code><sup>1</sup></td>
+    <td align="right">3</td>
+    <td align="left"><code>(See TRACE_CLASSDISCONNECT</code><sup>1</sup>)</td>
+    <td align="left">0000</td>
+  </tr>
+  <tr>
+    <td align="center">8</td>
+    <td align="left"><code>TRACE_DEV_ID</code><sup>1</sup></td>
+    <td align="right">6</td>
+    <td align="left"><code>(See TRACE_DEVPULLUP</code><sup>1</sup>)</td>
+    <td align="left">0001</td>
+  </tr>
+  <tr>
+    <td align="center">9</td>
+    <td align="left"><code>TRACE_INTEXIT_ID</code><sup>1</sup></td>
+    <td align="right">1</td>
+    <td align="left"><code>LPC17_TRACEINTID_USB</code><sup>2</sup></td>
+    <td align="left">0000</td>
+  </tr>
+</table>
+<p><small><b>NOTES</b>:<br>
+  <sup>1</sup>See <code>include/nuttx/usb/usbdev_trace.h</code><br>
+  <sup>2</sup><code>See arch/arm/src/lpc17xx/lpc17_usbdev.c</code>
+</small></p>
+</ul>
+<p>
+  In the above example you can see that:
+</p>
+<ul>
+  <li><b>1</b>.
+    The serial class USB setup method was called for the USB serial class.
+    This is the corresponds to the following logic in <code>drivers/usbdev/pl2303.c</code>:
+    <ul><pre>
+static int pl2303_setup(FAR struct uart_dev_s *dev)
+{
+  ...
+  usbtrace(PL2303_CLASSAPI_SETUP, 0);
+  ...
+</pre></ul>
+  </li>
+  <li><b>2</b>.
+    An error occurred while processing the setup command because no configuration has yet been selected by the host.
+    This corresponds to the following logic in <code>drivers/usbdev/pl2303.c</code>:
+    <ul><pre>
+static int pl2303_setup(FAR struct uart_dev_s *dev)
+{
+  ...
+  /* Check if we have been configured */
+
+  if (priv->config == PL2303_CONFIGIDNONE)
+    {
+      usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_SETUPNOTCONNECTED), 0);
+      return -ENOTCONN;
+    }
+  ...
+</pre></ul>
+  <li><b>3-6</b>.
+    Here is a USB interrupt that suspends and resets the device.
+  </li>
+  <li><b>7-8</b>.
+    During the interrupt processing the serial class is disconnected
+  </li>
+  <li><b>9</b>.
+    And the interrupt returns
+  </li>
+</ul>
+</body>
+</html>
diff --git a/nuttx/configs/Kconfig b/nuttx/configs/Kconfig
index 752a5b0983..600e74ef44 100644
--- a/nuttx/configs/Kconfig
+++ b/nuttx/configs/Kconfig
@@ -42,7 +42,7 @@ config ARCH_BOARD_C5471EVM
 		This is a port to the Spectrum Digital C5471 evaluation board.  The
 		TMS320C5471 is a dual core processor from TI with an ARM7TDMI general
 		purpose processor and a c54 DSP.  It is also known as TMS320DA180 or just DA180. 
-		NuttX runs on the ARM core and is built with a GNU arm-elf toolchain*.
+		NuttX runs on the ARM core and is built with a GNU arm-nuttx-elf toolchain*.
 		This port is complete and verified.
 
 config ARCH_BOARD_COMPALE88
@@ -80,7 +80,7 @@ config ARCH_BOARD_EA3131
 	select ARCH_HAVE_BUTTONS
 	---help---
 		Embedded Artists EA3131 Development board.  This board is based on the 
-		an NXP LPC3131 MCU. This OS is built with the arm-elf toolchain*.
+		an NXP LPC3131 MCU. This OS is built with the arm-nuttx-elf toolchain*.
 		STATUS:  This port is complete and mature.
 
 config ARCH_BOARD_EA3152
@@ -90,7 +90,7 @@ config ARCH_BOARD_EA3152
 	select ARCH_HAVE_BUTTONS
 	---help---
 		Embedded Artists EA3152 Development board.  This board is based on the 
-		an NXP LPC3152 MCU. This OS is built with the arm-elf toolchain*.
+		an NXP LPC3152 MCU. This OS is built with the arm-nuttx-elf toolchain*.
 		STATUS:  This port is has not be exercised well, but since it is
 		a simple derivative of the ea3131, it should be fully functional.
 
@@ -101,7 +101,7 @@ config ARCH_BOARD_EAGLE100
 	---help---
 		Micromint Eagle-100 Development board.  This board is based on the 
 		an ARM Cortex-M3 MCU, the Luminary LM3S6918. This OS is built with the
-		arm-elf toolchain*.  STATUS:  This port is complete and mature.
+		arm-nuttx-elf toolchain*.  STATUS:  This port is complete and mature.
 
 config ARCH_BOARD_EKK_LM3S9B96
 	bool "TI/Stellaris EKK-LM3S9B96"
@@ -184,7 +184,7 @@ config ARCH_BOARD_LM3S6965EK
 	---help---
 		Stellaris LM3S6965 Evaluation Kit.  This board is based on the 
 		an ARM Cortex-M3 MCU, the Luminary/TI LM3S6965. This OS is built with the
-		arm-elf toolchain*.  STATUS:  This port is complete and mature.
+		arm-nuttx-elf toolchain*.  STATUS:  This port is complete and mature.
 
 config ARCH_BOARD_LM3S8962EK
 	bool "Stellaris LMS38962 Evaluation Kit"
@@ -215,7 +215,7 @@ config ARCH_BOARD_M68332EVB
 	depends on ARCH_M68332
 	---help---
 		This is a work in progress for the venerable m68322evb board from
-		Motorola. This OS is also built with the arm-elf toolchain.  STATUS:
+		Motorola. This OS is also built with the arm-nuttx-elf toolchain.  STATUS:
 		This port was never completed.
 
 config ARCH_BOARD_MBED
@@ -225,7 +225,7 @@ config ARCH_BOARD_MBED
 	---help---
 		The configurations in this directory support the mbed board (http://mbed.org)
 		that features the NXP LPC1768 microcontroller. This OS is also built
-		with the arm-elf toolchain*.  STATUS:  Contributed.
+		with the arm-nuttx-elf toolchain*.  STATUS:  Contributed.
 
 config ARCH_BOARD_MCU123
 	bool "mcu123.com LPC2148 Development Board"
@@ -233,7 +233,7 @@ config ARCH_BOARD_MCU123
 	select ARCH_HAVE_LEDS
 	---help---
 		This port is for the NXP LPC2148 as provided on the mcu123.com
-		lpc214x development board. This OS is also built with the arm-elf
+		lpc214x development board. This OS is also built with the arm-nuttx-elf
 		toolchain*.  The port supports serial, timer0, spi, and usb.
 
 config ARCH_BOARD_MICROPENDOUS3
@@ -270,7 +270,7 @@ config ARCH_BOARD_NTOSD_DM320
 	depends on ARCH_CHIP_DM320
 	select ARCH_HAVE_LEDS
 	---help---
-		This port uses the Neuros OSD v1.0 Dev Board with a GNU arm-elf
+		This port uses the Neuros OSD v1.0 Dev Board with a GNU arm-nuttx-elf
 		toolchain*: see
 
 			http://wiki.neurostechnology.com/index.php/OSD_1.0_Developer_Home
@@ -316,7 +316,7 @@ config ARCH_BOARD_OLIMEXLPC2378
 	depends on ARCH_CHIP_LPC2378
 	select ARCH_HAVE_LEDS
 	---help---
-		This port uses the Olimex-lpc2378 board and a GNU arm-elf toolchain* under
+		This port uses the Olimex-lpc2378 board and a GNU arm-nuttx-elf toolchain* under
 		Linux or Cygwin.  STATUS: ostest and NSH configurations available.
 		This port for the NXP LPC2378 was contributed by Rommel Marcelo.
 
@@ -326,7 +326,7 @@ config ARCH_BOARD_OLIMEX_STRP711
 	select ARCH_HAVE_LEDS
 	select ARCH_HAVE_BUTTONS
 	---help---
-		This port uses the Olimex STR-P711 board and a GNU arm-elf toolchain* under
+		This port uses the Olimex STR-P711 board and a GNU arm-nuttx-elf toolchain* under
 		Linux or Cygwin. See the http://www.olimex.com/dev/str-p711.html" for
 		further information.  STATUS: Configurations for the basic OS test and NSH
 		are complete and verified.
@@ -335,7 +335,7 @@ config ARCH_BOARD_OLIMEX_STM32P107
 	bool "Olimex STM32 P107 board"
 	depends on ARCH_CHIP_STM32F107VC
 	---help---
-		This port uses the Olimex STM32 P107 board and a GNU arm-elf toolchain* under
+		This port uses the Olimex STM32 P107 board and a GNU arm-nuttx-elf toolchain* under
 		Linux or Cygwin. See the http://www.olimex.com for further information. This
 		board features the STMicro STM32F107VC MCU
 
@@ -411,7 +411,7 @@ config ARCH_BOARD_SHENZHOU
 	select ARCH_HAVE_BUTTONS
 	select ARCH_HAVE_IRQBUTTONS
 	---help---
-		This port uses the Shenzhou STM32 F107 board and a GNU arm-elf toolchain* under
+		This port uses the Shenzhou STM32 F107 board and a GNU arm-nuttx-elf toolchain* under
 		Linux or Cygwin. See the http://www.armjishu.com for further information. This
 		board features the STMicro STM32F107VC MCU
 
diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt
index 5bbec874f7..e6bde645d1 100644
--- a/nuttx/configs/README.txt
+++ b/nuttx/configs/README.txt
@@ -1524,7 +1524,7 @@ configs/c5471evm
   This is a port to the Spectrum Digital C5471 evaluation board.  The
   TMS320C5471 is a dual core processor from TI with an ARM7TDMI general
   purpose processor and a c54 DSP.  It is also known as TMS320DA180 or just DA180. 
-  NuttX runs on the ARM core and is built with a GNU arm-elf toolchain*.
+  NuttX runs on the ARM core and is built with a GNU arm-nuttx-elf toolchain*.
   This port is complete and verified.
 
 configs/compal_e88 and compal_e99
@@ -1540,19 +1540,19 @@ configs/demo9s12ne64
 
 configs/ea3131
   Embedded Artists EA3131 Development board.  This board is based on the 
-  an NXP LPC3131 MCU. This OS is built with the arm-elf toolchain*.
+  an NXP LPC3131 MCU. This OS is built with the arm-nuttx-elf toolchain*.
   STATUS:  This port is complete and mature.
 
 configs/ea3152
   Embedded Artists EA3152 Development board.  This board is based on the 
-  an NXP LPC3152 MCU. This OS is built with the arm-elf toolchain*.
+  an NXP LPC3152 MCU. This OS is built with the arm-nuttx-elf toolchain*.
   STATUS:  This port is has not be exercised well, but since it is
   a simple derivative of the ea3131, it should be fully functional.
 
 configs/eagle100
   Micromint Eagle-100 Development board.  This board is based on the 
   an ARM Cortex-M3 MCU, the Luminary LM3S6918. This OS is built with the
-  arm-elf toolchain*.  STATUS:  This port is complete and mature.
+  arm-nuttx-elf toolchain*.  STATUS:  This port is complete and mature.
 
 configs/ekk-lm3s9b96
   TI/Stellaris EKK-LM3S9B96 board.  This board is based on the 
@@ -1591,7 +1591,7 @@ configs/lm3s6432-s2e
 configs/lm3s6965-ek
   Stellaris LM3S6965 Evaluation Kit.  This board is based on the 
   an ARM Cortex-M3 MCU, the Luminary/TI LM3S6965. This OS is built with the
-  arm-elf toolchain*.  STATUS:  This port is complete and mature.
+  arm-nuttx-elf toolchain*.  STATUS:  This port is complete and mature.
 
 configs/lm3s8962-ek
   Stellaris LMS38962 Evaluation Kit.
@@ -1607,17 +1607,17 @@ configs/lpc4330-xplorer
 
 configs/m68322evb
   This is a work in progress for the venerable m68322evb board from
-  Motorola. This OS is also built with the arm-elf toolchain*.  STATUS:
+  Motorola. This OS is also built with the arm-nuttx-elf toolchain*.  STATUS:
   This port was never completed.
 
 configs/mbed
   The configurations in this directory support the mbed board (http://mbed.org)
   that features the NXP LPC1768 microcontroller. This OS is also built
-  with the arm-elf toolchain*.  STATUS:  Contributed.
+  with the arm-nuttx-elf toolchain*.  STATUS:  Contributed.
 
 configs/mcu123-lpc214x
   This port is for the NXP LPC2148 as provided on the mcu123.com
-  lpc214x development board. This OS is also built with the arm-elf
+  lpc214x development board. This OS is also built with the arm-nuttx-elf
   toolchain*.  The port supports serial, timer0, spi, and usb.
 
 configs/micropendous3
@@ -1642,7 +1642,7 @@ configs/ne64badge
   not yet been fully tested.
 
 configs/ntosd-dm320
-  This port uses the Neuros OSD v1.0 Dev Board with a GNU arm-elf
+  This port uses the Neuros OSD v1.0 Dev Board with a GNU arm-nuttx-elf
   toolchain*: see
 
     http://wiki.neurostechnology.com/index.php/OSD_1.0_Developer_Home
@@ -1666,18 +1666,18 @@ configs/olimex-lpc1766stk
   Linux or Cygwin.  STATUS: Complete and mature.
 
 configs/olimex-lpc2378
-  This port uses the Olimex-lpc2378 board and a GNU arm-elf toolchain* under
+  This port uses the Olimex-lpc2378 board and a GNU arm-nuttx-elf toolchain* under
   Linux or Cygwin.  STATUS: ostest and NSH configurations available.
   This port for the NXP LPC2378 was contributed by Rommel Marcelo.
 
 configs/olimex-stm32-p107
-  This port uses the Olimex STM32-P107 board (STM32F107VC) and a GNU arm-elf
+  This port uses the Olimex STM32-P107 board (STM32F107VC) and a GNU arm-nuttx-elf
   toolchain* under Linux or Cygwin. See the https://www.olimex.com/dev/stm32-p107.html
   for further information.  Contributed by Max Holtzberg.  STATUS: Configurations
   for the basic OS test and NSH are available and verified.
 
 configs/olimex-strp711
-  This port uses the Olimex STR-P711 board and a GNU arm-elf toolchain* under
+  This port uses the Olimex STR-P711 board and a GNU arm-nuttx-elf toolchain* under
   Linux or Cygwin. See the http://www.olimex.com/dev/str-p711.html" for
   further information.  STATUS: Configurations for the basic OS test and NSH
   are complete and verified.
diff --git a/nuttx/configs/amber/hello/Make.defs b/nuttx/configs/amber/hello/Make.defs
index 4474e1621d..66f3ff7993 100644
--- a/nuttx/configs/amber/hello/Make.defs
+++ b/nuttx/configs/amber/hello/Make.defs
@@ -57,7 +57,7 @@ endif
 
 ifeq ($(CONFIG_AVR_BUILDROOT),y)
   # NuttX buildroot GCC toolchain under Linux or Cygwin
-  CROSSDEV = avr-elf-
+  CROSSDEV = avr-nuttx-elf-
   MAXOPTIMIZATION = -O2
   ARCHCPUFLAGS = -mmcu=atmega128
   LDFLAGS += -nostartfiles -nodefaultlibs
diff --git a/nuttx/configs/c5471evm/httpd/Make.defs b/nuttx/configs/c5471evm/httpd/Make.defs
index 6ff007708f..ffc267530d 100644
--- a/nuttx/configs/c5471evm/httpd/Make.defs
+++ b/nuttx/configs/c5471evm/httpd/Make.defs
@@ -36,7 +36,7 @@
 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CPP			= $(CROSSDEV)gcc -E
 LD			= $(CROSSDEV)ld
diff --git a/nuttx/configs/c5471evm/nettest/Make.defs b/nuttx/configs/c5471evm/nettest/Make.defs
index d66bb564fb..e784c11194 100644
--- a/nuttx/configs/c5471evm/nettest/Make.defs
+++ b/nuttx/configs/c5471evm/nettest/Make.defs
@@ -36,7 +36,7 @@
 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CPP			= $(CROSSDEV)gcc -E
 LD			= $(CROSSDEV)ld
diff --git a/nuttx/configs/c5471evm/nsh/Make.defs b/nuttx/configs/c5471evm/nsh/Make.defs
index 2ffb69ffd3..d9e569158b 100644
--- a/nuttx/configs/c5471evm/nsh/Make.defs
+++ b/nuttx/configs/c5471evm/nsh/Make.defs
@@ -36,7 +36,7 @@
 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CPP			= $(CROSSDEV)gcc -E
 LD			= $(CROSSDEV)ld
diff --git a/nuttx/configs/c5471evm/ostest/Make.defs b/nuttx/configs/c5471evm/ostest/Make.defs
index 04d6e09713..9cbfc1d1d5 100644
--- a/nuttx/configs/c5471evm/ostest/Make.defs
+++ b/nuttx/configs/c5471evm/ostest/Make.defs
@@ -36,7 +36,7 @@
 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CPP			= $(CROSSDEV)gcc -E
 LD			= $(CROSSDEV)ld
diff --git a/nuttx/configs/compal_e88/nsh_highram/Make.defs b/nuttx/configs/compal_e88/nsh_highram/Make.defs
index b3c04930db..e99d5635d0 100644
--- a/nuttx/configs/compal_e88/nsh_highram/Make.defs
+++ b/nuttx/configs/compal_e88/nsh_highram/Make.defs
@@ -45,7 +45,7 @@ EXTRA_LIBS		= $(OSMODIR)/src/target/firmware/comm/libcomm.a \
 			# ^^^ Stupid hack! Why do I have to put it twice???
 endif
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CPP			= $(CROSSDEV)gcc -E
 LD			= $(CROSSDEV)ld
diff --git a/nuttx/configs/compal_e99/nsh_compalram/Make.defs b/nuttx/configs/compal_e99/nsh_compalram/Make.defs
index cec8bdd1fb..4759fc76a4 100644
--- a/nuttx/configs/compal_e99/nsh_compalram/Make.defs
+++ b/nuttx/configs/compal_e99/nsh_compalram/Make.defs
@@ -45,7 +45,7 @@ EXTRA_LIBS		= $(OSMODIR)/src/target/firmware/comm/libcomm.a \
 			# ^^^ Stupid hack! Why do I have to put it twice???
 endif
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CPP			= $(CROSSDEV)gcc -E
 LD			= $(CROSSDEV)ld
diff --git a/nuttx/configs/compal_e99/nsh_highram/Make.defs b/nuttx/configs/compal_e99/nsh_highram/Make.defs
index b3c04930db..e99d5635d0 100644
--- a/nuttx/configs/compal_e99/nsh_highram/Make.defs
+++ b/nuttx/configs/compal_e99/nsh_highram/Make.defs
@@ -45,7 +45,7 @@ EXTRA_LIBS		= $(OSMODIR)/src/target/firmware/comm/libcomm.a \
 			# ^^^ Stupid hack! Why do I have to put it twice???
 endif
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CPP			= $(CROSSDEV)gcc -E
 LD			= $(CROSSDEV)ld
diff --git a/nuttx/configs/demo9s12ne64/ostest/Make.defs b/nuttx/configs/demo9s12ne64/ostest/Make.defs
index 9ad5036c3f..727ebb5614 100644
--- a/nuttx/configs/demo9s12ne64/ostest/Make.defs
+++ b/nuttx/configs/demo9s12ne64/ostest/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/tools/Config.mk
 # Setup for the selected toolchain
 # NuttX buildroot under Linux or Cygwin
 
-CROSSDEV = m9s12x-elf-
+CROSSDEV = m9s12x-nuttx-elf-
 MAXOPTIMIZATION = -Os
 WINTOOL = n
 
diff --git a/nuttx/configs/ea3131/README.txt b/nuttx/configs/ea3131/README.txt
index c237345d14..a99011ec5b 100644
--- a/nuttx/configs/ea3131/README.txt
+++ b/nuttx/configs/ea3131/README.txt
@@ -265,7 +265,7 @@ Using OpenOCD and GDB
   Once the OpenOCD daemon has been started, you can connect to it via
   GDB using the following GDB command:
 
-   arm-elf-gdb
+   arm-nuttx-elf-gdb
    (gdb) target remote localhost:3333
 
   And you can load the NuttX ELF file:
diff --git a/nuttx/configs/ea3131/nsh/Make.defs b/nuttx/configs/ea3131/nsh/Make.defs
index 9ef28c3636..cd49f56af7 100644
--- a/nuttx/configs/ea3131/nsh/Make.defs
+++ b/nuttx/configs/ea3131/nsh/Make.defs
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_LPC31_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC31_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/ea3131/ostest/Make.defs b/nuttx/configs/ea3131/ostest/Make.defs
index 3528b80b5d..f07f4d4529 100644
--- a/nuttx/configs/ea3131/ostest/Make.defs
+++ b/nuttx/configs/ea3131/ostest/Make.defs
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_LPC31_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC31_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/ea3131/pgnsh/Make.defs b/nuttx/configs/ea3131/pgnsh/Make.defs
index 7dace9854a..1097a8d728 100644
--- a/nuttx/configs/ea3131/pgnsh/Make.defs
+++ b/nuttx/configs/ea3131/pgnsh/Make.defs
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_LPC31_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC31_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/ea3131/usbserial/Make.defs b/nuttx/configs/ea3131/usbserial/Make.defs
index eb0da53f55..3fe5f8f931 100644
--- a/nuttx/configs/ea3131/usbserial/Make.defs
+++ b/nuttx/configs/ea3131/usbserial/Make.defs
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_LPC31_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC31_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/ea3131/usbstorage/Make.defs b/nuttx/configs/ea3131/usbstorage/Make.defs
index fc679e24ca..de351b2567 100644
--- a/nuttx/configs/ea3131/usbstorage/Make.defs
+++ b/nuttx/configs/ea3131/usbstorage/Make.defs
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_LPC31_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC31_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/ea3152/README.txt b/nuttx/configs/ea3152/README.txt
index 90be2a2201..5b6eb17a93 100644
--- a/nuttx/configs/ea3152/README.txt
+++ b/nuttx/configs/ea3152/README.txt
@@ -264,7 +264,7 @@ Using OpenOCD and GDB
   Once the OpenOCD daemon has been started, you can connect to it via
   GDB using the following GDB command:
 
-   arm-elf-gdb
+   arm-nuttx-elf-gdb
    (gdb) target remote localhost:3333
 
   And you can load the NuttX ELF file:
diff --git a/nuttx/configs/ea3152/ostest/Make.defs b/nuttx/configs/ea3152/ostest/Make.defs
index 8872b60e41..9bb350e36c 100644
--- a/nuttx/configs/ea3152/ostest/Make.defs
+++ b/nuttx/configs/ea3152/ostest/Make.defs
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_LPC31_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC31_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/eagle100/README.txt b/nuttx/configs/eagle100/README.txt
index e03a92d5c6..47c4f89df0 100644
--- a/nuttx/configs/eagle100/README.txt
+++ b/nuttx/configs/eagle100/README.txt
@@ -36,7 +36,7 @@ GNU Toolchain Options
      make                         # Will build for the devkitARM 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
+     make CROSSDEV=arm-nuttx-elf- # Will build for the NuttX buildroot toolchain
 
   Of course, hard coding this CROSS_COMPILE value in Make.defs file will save
   some repetitive typing.
diff --git a/nuttx/configs/eagle100/httpd/Make.defs b/nuttx/configs/eagle100/httpd/Make.defs
index 1b6dc01cf0..8d3cc9c25f 100644
--- a/nuttx/configs/eagle100/httpd/Make.defs
+++ b/nuttx/configs/eagle100/httpd/Make.defs
@@ -40,7 +40,7 @@ include ${TOPDIR}/tools/Config.mk
 #   make                         -- Will build for the devkitARM 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
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
 CROSSDEV		= arm-eabi-
 CC			= $(CROSSDEV)gcc
@@ -55,7 +55,7 @@ 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 ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHCPUFLAGS		= -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
@@ -106,7 +106,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/eagle100/nettest/Make.defs b/nuttx/configs/eagle100/nettest/Make.defs
index ef761182f3..ca50492828 100644
--- a/nuttx/configs/eagle100/nettest/Make.defs
+++ b/nuttx/configs/eagle100/nettest/Make.defs
@@ -40,7 +40,7 @@ include ${TOPDIR}/tools/Config.mk
 #   make                         -- Will build for the devkitARM 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
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
 CROSSDEV		= arm-eabi-
 CC			= $(CROSSDEV)gcc
@@ -55,7 +55,7 @@ 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 ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHCPUFLAGS		= -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
@@ -106,7 +106,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/eagle100/nsh/Make.defs b/nuttx/configs/eagle100/nsh/Make.defs
index 4f024e2636..4992994951 100644
--- a/nuttx/configs/eagle100/nsh/Make.defs
+++ b/nuttx/configs/eagle100/nsh/Make.defs
@@ -40,7 +40,7 @@ include ${TOPDIR}/tools/Config.mk
 #   make                         -- Will build for the devkitARM 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
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
 CROSSDEV		= arm-eabi-
 CC			= $(CROSSDEV)gcc
@@ -55,7 +55,7 @@ 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 ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHCPUFLAGS		= -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
@@ -106,7 +106,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/eagle100/nxflat/Make.defs b/nuttx/configs/eagle100/nxflat/Make.defs
index d3107f1126..d735c3942a 100644
--- a/nuttx/configs/eagle100/nxflat/Make.defs
+++ b/nuttx/configs/eagle100/nxflat/Make.defs
@@ -40,7 +40,7 @@ include ${TOPDIR}/tools/Config.mk
 #   make                         -- Will build for the devkitARM 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
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
 CROSSDEV		= arm-eabi-
 CC			= $(CROSSDEV)gcc
@@ -58,7 +58,7 @@ LDNXFLAT		= ldnxflat
 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 ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHCPUFLAGS		= -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
@@ -109,7 +109,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/eagle100/ostest/Make.defs b/nuttx/configs/eagle100/ostest/Make.defs
index 7dd98c21af..641fcbaba2 100644
--- a/nuttx/configs/eagle100/ostest/Make.defs
+++ b/nuttx/configs/eagle100/ostest/Make.defs
@@ -40,7 +40,7 @@ include ${TOPDIR}/tools/Config.mk
 #   make                         -- Will build for the devkitARM 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
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
 CROSSDEV		= arm-eabi-
 CC			= $(CROSSDEV)gcc
@@ -55,7 +55,7 @@ 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 ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHCPUFLAGS		= -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
@@ -106,7 +106,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/eagle100/thttpd/Make.defs b/nuttx/configs/eagle100/thttpd/Make.defs
index a864867e72..999db3a591 100644
--- a/nuttx/configs/eagle100/thttpd/Make.defs
+++ b/nuttx/configs/eagle100/thttpd/Make.defs
@@ -40,7 +40,7 @@ include ${TOPDIR}/tools/Config.mk
 #   make                         -- Will build for the devkitARM 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
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
 CROSSDEV		= arm-eabi-
 CC			= $(CROSSDEV)gcc
@@ -58,7 +58,7 @@ LDNXFLAT		= ldnxflat
 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 ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHCPUFLAGS		= -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
@@ -109,7 +109,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/ekk-lm3s9b96/nsh/Make.defs b/nuttx/configs/ekk-lm3s9b96/nsh/Make.defs
index a4223e5137..1be7fc8f0b 100644
--- a/nuttx/configs/ekk-lm3s9b96/nsh/Make.defs
+++ b/nuttx/configs/ekk-lm3s9b96/nsh/Make.defs
@@ -59,7 +59,7 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -121,7 +121,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/ekk-lm3s9b96/ostest/Make.defs b/nuttx/configs/ekk-lm3s9b96/ostest/Make.defs
index 2da0c421a6..e0fae20f0f 100644
--- a/nuttx/configs/ekk-lm3s9b96/ostest/Make.defs
+++ b/nuttx/configs/ekk-lm3s9b96/ostest/Make.defs
@@ -59,7 +59,7 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -121,7 +121,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/fire-stm32v2/nsh/Make.defs b/nuttx/configs/fire-stm32v2/nsh/Make.defs
index 567e820639..aaf0e8980c 100644
--- a/nuttx/configs/fire-stm32v2/nsh/Make.defs
+++ b/nuttx/configs/fire-stm32v2/nsh/Make.defs
@@ -82,8 +82,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -153,7 +153,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/hymini-stm32v/buttons/Make.defs b/nuttx/configs/hymini-stm32v/buttons/Make.defs
index f78c3aed35..bcc1f6845f 100644
--- a/nuttx/configs/hymini-stm32v/buttons/Make.defs
+++ b/nuttx/configs/hymini-stm32v/buttons/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/hymini-stm32v/nsh/Make.defs b/nuttx/configs/hymini-stm32v/nsh/Make.defs
index 91aa063835..fae6edc080 100644
--- a/nuttx/configs/hymini-stm32v/nsh/Make.defs
+++ b/nuttx/configs/hymini-stm32v/nsh/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/hymini-stm32v/nsh2/Make.defs b/nuttx/configs/hymini-stm32v/nsh2/Make.defs
index f5c9d11c69..1cf89238ea 100644
--- a/nuttx/configs/hymini-stm32v/nsh2/Make.defs
+++ b/nuttx/configs/hymini-stm32v/nsh2/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/hymini-stm32v/nx/Make.defs b/nuttx/configs/hymini-stm32v/nx/Make.defs
index ac140b3543..8ebded0944 100644
--- a/nuttx/configs/hymini-stm32v/nx/Make.defs
+++ b/nuttx/configs/hymini-stm32v/nx/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/hymini-stm32v/nxlines/Make.defs b/nuttx/configs/hymini-stm32v/nxlines/Make.defs
index 897af1fcd8..15521d6212 100644
--- a/nuttx/configs/hymini-stm32v/nxlines/Make.defs
+++ b/nuttx/configs/hymini-stm32v/nxlines/Make.defs
@@ -73,7 +73,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -134,7 +134,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/hymini-stm32v/usbserial/Make.defs b/nuttx/configs/hymini-stm32v/usbserial/Make.defs
index 29be9190fe..b58c4c1fe1 100644
--- a/nuttx/configs/hymini-stm32v/usbserial/Make.defs
+++ b/nuttx/configs/hymini-stm32v/usbserial/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/hymini-stm32v/usbstorage/Make.defs b/nuttx/configs/hymini-stm32v/usbstorage/Make.defs
index 3e89daa6d2..f3264ab937 100644
--- a/nuttx/configs/hymini-stm32v/usbstorage/Make.defs
+++ b/nuttx/configs/hymini-stm32v/usbstorage/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/kwikstik-k40/ostest/Make.defs b/nuttx/configs/kwikstik-k40/ostest/Make.defs
index 0f03b6c19d..43a5dd01e0 100644
--- a/nuttx/configs/kwikstik-k40/ostest/Make.defs
+++ b/nuttx/configs/kwikstik-k40/ostest/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_KINETIS_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_KINETIS_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft -mlong-calls
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/lincoln60/nsh/Make.defs b/nuttx/configs/lincoln60/nsh/Make.defs
index cca519da40..9750a0e87c 100644
--- a/nuttx/configs/lincoln60/nsh/Make.defs
+++ b/nuttx/configs/lincoln60/nsh/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/lincoln60/ostest/Make.defs b/nuttx/configs/lincoln60/ostest/Make.defs
index 29ef7c3277..c90939429b 100644
--- a/nuttx/configs/lincoln60/ostest/Make.defs
+++ b/nuttx/configs/lincoln60/ostest/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/lm3s6432-s2e/nsh/Make.defs b/nuttx/configs/lm3s6432-s2e/nsh/Make.defs
index 3bac1a4dbf..ef39674b2a 100644
--- a/nuttx/configs/lm3s6432-s2e/nsh/Make.defs
+++ b/nuttx/configs/lm3s6432-s2e/nsh/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/lm3s6432-s2e/ostest/Make.defs b/nuttx/configs/lm3s6432-s2e/ostest/Make.defs
index 7d528cdf0f..6036891832 100644
--- a/nuttx/configs/lm3s6432-s2e/ostest/Make.defs
+++ b/nuttx/configs/lm3s6432-s2e/ostest/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/lm3s6965-ek/nsh/Make.defs b/nuttx/configs/lm3s6965-ek/nsh/Make.defs
index 52a3c7bd1b..17df0ebf7b 100644
--- a/nuttx/configs/lm3s6965-ek/nsh/Make.defs
+++ b/nuttx/configs/lm3s6965-ek/nsh/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/lm3s6965-ek/nx/Make.defs b/nuttx/configs/lm3s6965-ek/nx/Make.defs
index 21b60450f6..5ab0cfd260 100644
--- a/nuttx/configs/lm3s6965-ek/nx/Make.defs
+++ b/nuttx/configs/lm3s6965-ek/nx/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/lm3s6965-ek/ostest/Make.defs b/nuttx/configs/lm3s6965-ek/ostest/Make.defs
index a834a57ef0..5e49273a0c 100644
--- a/nuttx/configs/lm3s6965-ek/ostest/Make.defs
+++ b/nuttx/configs/lm3s6965-ek/ostest/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/lm3s8962-ek/nsh/Make.defs b/nuttx/configs/lm3s8962-ek/nsh/Make.defs
index c37875c642..cc7bce1e5c 100644
--- a/nuttx/configs/lm3s8962-ek/nsh/Make.defs
+++ b/nuttx/configs/lm3s8962-ek/nsh/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/lm3s8962-ek/nx/Make.defs b/nuttx/configs/lm3s8962-ek/nx/Make.defs
index be150074cc..b97aaa31ec 100644
--- a/nuttx/configs/lm3s8962-ek/nx/Make.defs
+++ b/nuttx/configs/lm3s8962-ek/nx/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/lm3s8962-ek/ostest/Make.defs b/nuttx/configs/lm3s8962-ek/ostest/Make.defs
index 43bcfcddde..4b4863d7cb 100644
--- a/nuttx/configs/lm3s8962-ek/ostest/Make.defs
+++ b/nuttx/configs/lm3s8962-ek/ostest/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/lpc4330-xplorer/nsh/Make.defs b/nuttx/configs/lpc4330-xplorer/nsh/Make.defs
index 341671a977..960fb2a41a 100644
--- a/nuttx/configs/lpc4330-xplorer/nsh/Make.defs
+++ b/nuttx/configs/lpc4330-xplorer/nsh/Make.defs
@@ -93,8 +93,8 @@ ifeq ($(CONFIG_LPC43_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC43_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m4 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -176,7 +176,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/lpc4330-xplorer/ostest/Make.defs b/nuttx/configs/lpc4330-xplorer/ostest/Make.defs
index 341671a977..960fb2a41a 100644
--- a/nuttx/configs/lpc4330-xplorer/ostest/Make.defs
+++ b/nuttx/configs/lpc4330-xplorer/ostest/Make.defs
@@ -93,8 +93,8 @@ ifeq ($(CONFIG_LPC43_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC43_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m4 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -176,7 +176,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/Make.defs
index 8ece92ca9c..804e20ecd1 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/Make.defs
+++ b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/lpcxpresso-lpc1768/nsh/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/nsh/Make.defs
index 21d84b4940..8c6ad9ab85 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/nsh/Make.defs
+++ b/nuttx/configs/lpcxpresso-lpc1768/nsh/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/lpcxpresso-lpc1768/nx/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/nx/Make.defs
index 9a7d190692..a535fd03d0 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/nx/Make.defs
+++ b/nuttx/configs/lpcxpresso-lpc1768/nx/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/lpcxpresso-lpc1768/ostest/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/ostest/Make.defs
index 1dd92adb73..1b38f2d6b0 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/ostest/Make.defs
+++ b/nuttx/configs/lpcxpresso-lpc1768/ostest/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs
index fc40cce07d..810d6d7da8 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs
+++ b/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -137,7 +137,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/Make.defs
index d63e11efe1..5342dde5b0 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/Make.defs
+++ b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/m68332evb/Make.defs b/nuttx/configs/m68332evb/Make.defs
index fdae944f01..fb85cf8272 100644
--- a/nuttx/configs/m68332evb/Make.defs
+++ b/nuttx/configs/m68332evb/Make.defs
@@ -50,7 +50,7 @@ ARCHDEFINES		=
 ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
 ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/ld.script
 
-CROSSDEV		= m68k-elf-
+CROSSDEV		= m68k-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CPP			= $(CROSSDEV)gcc -E
 LD			= $(CROSSDEV)ld
diff --git a/nuttx/configs/m68332evb/doc/m68k-defconfig b/nuttx/configs/m68332evb/doc/m68k-defconfig
index cbe3c11cd5..60f2e4cbd6 100644
--- a/nuttx/configs/m68332evb/doc/m68k-defconfig
+++ b/nuttx/configs/m68332evb/doc/m68k-defconfig
@@ -34,7 +34,7 @@ BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
 BR2_NUTTX_DIR="$(TOPDIR)/../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
-BR2_GNU_BUILD_SUFFIX="m68k-elf"
+BR2_GNU_BUILD_SUFFIX="m68k-nuttx-elf"
 BR2_GNU_TARGET_SUFFIX="elf"
 # BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
diff --git a/nuttx/configs/mbed/hidkbd/Make.defs b/nuttx/configs/mbed/hidkbd/Make.defs
index f033c685e4..262571e452 100644
--- a/nuttx/configs/mbed/hidkbd/Make.defs
+++ b/nuttx/configs/mbed/hidkbd/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/mbed/nsh/Make.defs b/nuttx/configs/mbed/nsh/Make.defs
index 468952aa25..40c4c94f31 100644
--- a/nuttx/configs/mbed/nsh/Make.defs
+++ b/nuttx/configs/mbed/nsh/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/mcu123-lpc214x/README.txt b/nuttx/configs/mcu123-lpc214x/README.txt
index 8236798cc8..b819abf368 100644
--- a/nuttx/configs/mcu123-lpc214x/README.txt
+++ b/nuttx/configs/mcu123-lpc214x/README.txt
@@ -42,7 +42,7 @@ GNU Toolchain Options
      make                         # 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
+     make CROSSDEV=arm-nuttx-elf- # Will build for the NuttX buildroot toolchain
 
   Of course, hard coding this CROSS_COMPILE value in Make.defs file will save
   some repetitive typing.
diff --git a/nuttx/configs/mcu123-lpc214x/composite/Make.defs b/nuttx/configs/mcu123-lpc214x/composite/Make.defs
index 0173a21c6d..f2f0ee8e88 100644
--- a/nuttx/configs/mcu123-lpc214x/composite/Make.defs
+++ b/nuttx/configs/mcu123-lpc214x/composite/Make.defs
@@ -40,7 +40,7 @@ include ${TOPDIR}/tools/Config.mk
 #   make                         -- Will build for the CodeSourcery 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
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
 CROSSDEV		= arm-none-eabi-
 CC			= $(CROSSDEV)gcc
@@ -63,7 +63,7 @@ OBJCOPYARGS		= -R .note -R .note.gnu.build-id -R .comment
 endif
 endif
 
-ifeq ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES	= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
@@ -118,7 +118,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/mcu123-lpc214x/nsh/Make.defs b/nuttx/configs/mcu123-lpc214x/nsh/Make.defs
index daa7a34665..de09916e5f 100644
--- a/nuttx/configs/mcu123-lpc214x/nsh/Make.defs
+++ b/nuttx/configs/mcu123-lpc214x/nsh/Make.defs
@@ -40,9 +40,9 @@ include ${TOPDIR}/tools/Config.mk
 #   make                         -- 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
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CXX			= $(CROSSDEV)g++
 CPP			= $(CROSSDEV)gcc -E
@@ -63,7 +63,7 @@ OBJCOPYARGS		= -R .note -R .note.gnu.build-id -R .comment
 endif
 endif
 
-ifeq ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES	= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
@@ -118,7 +118,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/mcu123-lpc214x/ostest/Make.defs b/nuttx/configs/mcu123-lpc214x/ostest/Make.defs
index d807c7bbd2..bc72ca9bdc 100644
--- a/nuttx/configs/mcu123-lpc214x/ostest/Make.defs
+++ b/nuttx/configs/mcu123-lpc214x/ostest/Make.defs
@@ -40,9 +40,9 @@ include ${TOPDIR}/tools/Config.mk
 #   make                         -- 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
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CXX			= $(CROSSDEV)g++
 CPP			= $(CROSSDEV)gcc -E
@@ -63,7 +63,7 @@ OBJCOPYARGS		= -R .note -R .note.gnu.build-id -R .comment
 endif
 endif
 
-ifeq ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES	= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
@@ -118,7 +118,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/mcu123-lpc214x/usbserial/Make.defs b/nuttx/configs/mcu123-lpc214x/usbserial/Make.defs
index 22edf3bab6..106224ef12 100644
--- a/nuttx/configs/mcu123-lpc214x/usbserial/Make.defs
+++ b/nuttx/configs/mcu123-lpc214x/usbserial/Make.defs
@@ -40,9 +40,9 @@ include ${TOPDIR}/tools/Config.mk
 #   make                         -- 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
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CXX			= $(CROSSDEV)g++
 CPP			= $(CROSSDEV)gcc -E
@@ -63,7 +63,7 @@ OBJCOPYARGS		= -R .note -R .note.gnu.build-id -R .comment
 endif
 endif
 
-ifeq ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES	= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
@@ -118,7 +118,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/mcu123-lpc214x/usbstorage/Make.defs b/nuttx/configs/mcu123-lpc214x/usbstorage/Make.defs
index 732a6733ba..bf1b9cab45 100644
--- a/nuttx/configs/mcu123-lpc214x/usbstorage/Make.defs
+++ b/nuttx/configs/mcu123-lpc214x/usbstorage/Make.defs
@@ -40,9 +40,9 @@ include ${TOPDIR}/tools/Config.mk
 #   make                         -- 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
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CXX			= $(CROSSDEV)g++
 CPP			= $(CROSSDEV)gcc -E
@@ -63,7 +63,7 @@ OBJCOPYARGS		= -R .note -R .note.gnu.build-id -R .comment
 endif
 endif
 
-ifeq ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES	= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
@@ -118,7 +118,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/micropendous3/README.txt b/nuttx/configs/micropendous3/README.txt
index e7b2041aa5..c05f1ddd5b 100644
--- a/nuttx/configs/micropendous3/README.txt
+++ b/nuttx/configs/micropendous3/README.txt
@@ -523,7 +523,7 @@ Where <subdir> is one of the following:
 
     FLASH/SRAM Requirements (as of 6/16/2011):
 
-      $ avr-elf-size nuttx
+      $ avr-nuttx-elf-size nuttx
        text    data     bss     dec     hex filename
       24816     978     308   26102    65f6 nuttx
 
diff --git a/nuttx/configs/micropendous3/hello/Make.defs b/nuttx/configs/micropendous3/hello/Make.defs
index 058f166905..178f355567 100644
--- a/nuttx/configs/micropendous3/hello/Make.defs
+++ b/nuttx/configs/micropendous3/hello/Make.defs
@@ -57,7 +57,7 @@ endif
 
 ifeq ($(CONFIG_AVR_BUILDROOT),y)
   # NuttX buildroot GCC toolchain under Linux or Cygwin
-  CROSSDEV = avr-elf-
+  CROSSDEV = avr-nuttx-elf-
   MAXOPTIMIZATION = -O2
   ARCHCPUFLAGS = -mmcu=at90usb647
   LDFLAGS += -nostartfiles -nodefaultlibs
diff --git a/nuttx/configs/mx1ads/ostest/Make.defs b/nuttx/configs/mx1ads/ostest/Make.defs
index c80af5c62d..71e053b0aa 100644
--- a/nuttx/configs/mx1ads/ostest/Make.defs
+++ b/nuttx/configs/mx1ads/ostest/Make.defs
@@ -36,7 +36,7 @@
 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CXX			= $(CROSSDEV)g++
 CPP			= $(CROSSDEV)gcc -E
diff --git a/nuttx/configs/ne64badge/ostest/Make.defs b/nuttx/configs/ne64badge/ostest/Make.defs
index 4dc164d153..9521a0a660 100644
--- a/nuttx/configs/ne64badge/ostest/Make.defs
+++ b/nuttx/configs/ne64badge/ostest/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/tools/Config.mk
 # Setup for the selected toolchain
 # NuttX buildroot under Linux or Cygwin
 
-CROSSDEV = m9s12x-elf-
+CROSSDEV = m9s12x-nuttx-elf-
 MAXOPTIMIZATION = -Os
 WINTOOL = n
 
diff --git a/nuttx/configs/ntosd-dm320/nettest/Make.defs b/nuttx/configs/ntosd-dm320/nettest/Make.defs
index b3d49bc731..30d369c2ac 100644
--- a/nuttx/configs/ntosd-dm320/nettest/Make.defs
+++ b/nuttx/configs/ntosd-dm320/nettest/Make.defs
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_DM320_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_DM320_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/ntosd-dm320/nsh/Make.defs b/nuttx/configs/ntosd-dm320/nsh/Make.defs
index 6a590a442a..14038f7562 100644
--- a/nuttx/configs/ntosd-dm320/nsh/Make.defs
+++ b/nuttx/configs/ntosd-dm320/nsh/Make.defs
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_DM320_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_DM320_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/ntosd-dm320/ostest/Make.defs b/nuttx/configs/ntosd-dm320/ostest/Make.defs
index dda36c8feb..4618c42467 100644
--- a/nuttx/configs/ntosd-dm320/ostest/Make.defs
+++ b/nuttx/configs/ntosd-dm320/ostest/Make.defs
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_DM320_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_DM320_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/ntosd-dm320/poll/Make.defs b/nuttx/configs/ntosd-dm320/poll/Make.defs
index a3abff2ef2..c06139bd6d 100644
--- a/nuttx/configs/ntosd-dm320/poll/Make.defs
+++ b/nuttx/configs/ntosd-dm320/poll/Make.defs
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_DM320_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_DM320_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/ntosd-dm320/thttpd/Make.defs b/nuttx/configs/ntosd-dm320/thttpd/Make.defs
index 40ecf053f3..075f72eaa2 100644
--- a/nuttx/configs/ntosd-dm320/thttpd/Make.defs
+++ b/nuttx/configs/ntosd-dm320/thttpd/Make.defs
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_DM320_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_DM320_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/ntosd-dm320/udp/Make.defs b/nuttx/configs/ntosd-dm320/udp/Make.defs
index 6122aeb11c..66750f13d6 100644
--- a/nuttx/configs/ntosd-dm320/udp/Make.defs
+++ b/nuttx/configs/ntosd-dm320/udp/Make.defs
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_DM320_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_DM320_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/ntosd-dm320/uip/Make.defs b/nuttx/configs/ntosd-dm320/uip/Make.defs
index 758924a157..d59b96e7c7 100644
--- a/nuttx/configs/ntosd-dm320/uip/Make.defs
+++ b/nuttx/configs/ntosd-dm320/uip/Make.defs
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_DM320_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_DM320_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/nucleus2g/nsh/Make.defs b/nuttx/configs/nucleus2g/nsh/Make.defs
index 65ec1c8f01..3b8f857a6a 100644
--- a/nuttx/configs/nucleus2g/nsh/Make.defs
+++ b/nuttx/configs/nucleus2g/nsh/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/nucleus2g/ostest/Make.defs b/nuttx/configs/nucleus2g/ostest/Make.defs
index 413f401787..aa0e6f8648 100644
--- a/nuttx/configs/nucleus2g/ostest/Make.defs
+++ b/nuttx/configs/nucleus2g/ostest/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/nucleus2g/usbserial/Make.defs b/nuttx/configs/nucleus2g/usbserial/Make.defs
index 5e473323eb..483fd52609 100644
--- a/nuttx/configs/nucleus2g/usbserial/Make.defs
+++ b/nuttx/configs/nucleus2g/usbserial/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/nucleus2g/usbstorage/Make.defs b/nuttx/configs/nucleus2g/usbstorage/Make.defs
index 35487f85be..7a9c1fa6bc 100644
--- a/nuttx/configs/nucleus2g/usbstorage/Make.defs
+++ b/nuttx/configs/nucleus2g/usbstorage/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/olimex-lpc1766stk/README.txt b/nuttx/configs/olimex-lpc1766stk/README.txt
index aaf40f9ff2..a8bea4d0ef 100644
--- a/nuttx/configs/olimex-lpc1766stk/README.txt
+++ b/nuttx/configs/olimex-lpc1766stk/README.txt
@@ -534,7 +534,7 @@ Using OpenOCD and GDB with an FT2232 JTAG emulator
     Once the OpenOCD daemon has been started, you can connect to it via
     GDB using the following GDB command:
 
-      arm-elf-gdb
+      arm-nuttx-elf-gdb
       (gdb) target remote localhost:3333
 
     NOTE:  The name of your GDB program may differ.  For example, with the
diff --git a/nuttx/configs/olimex-lpc1766stk/ftpc/Make.defs b/nuttx/configs/olimex-lpc1766stk/ftpc/Make.defs
index 82cf0a2cd6..5671fdffb5 100644
--- a/nuttx/configs/olimex-lpc1766stk/ftpc/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/ftpc/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -123,7 +123,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/olimex-lpc1766stk/hidkbd/Make.defs b/nuttx/configs/olimex-lpc1766stk/hidkbd/Make.defs
index dd97168142..1e7160c385 100644
--- a/nuttx/configs/olimex-lpc1766stk/hidkbd/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/hidkbd/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/olimex-lpc1766stk/nettest/Make.defs b/nuttx/configs/olimex-lpc1766stk/nettest/Make.defs
index 634d97315e..2502cf97b8 100644
--- a/nuttx/configs/olimex-lpc1766stk/nettest/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/nettest/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/olimex-lpc1766stk/nsh/Make.defs b/nuttx/configs/olimex-lpc1766stk/nsh/Make.defs
index af9750f406..7e62fd7fb2 100644
--- a/nuttx/configs/olimex-lpc1766stk/nsh/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/nsh/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/olimex-lpc1766stk/nx/Make.defs b/nuttx/configs/olimex-lpc1766stk/nx/Make.defs
index 685d827dad..735e2bd0a2 100644
--- a/nuttx/configs/olimex-lpc1766stk/nx/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/nx/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/olimex-lpc1766stk/ostest/Make.defs b/nuttx/configs/olimex-lpc1766stk/ostest/Make.defs
index 84467ae64b..7a9475761a 100644
--- a/nuttx/configs/olimex-lpc1766stk/ostest/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/ostest/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/olimex-lpc1766stk/slip-httpd/Make.defs b/nuttx/configs/olimex-lpc1766stk/slip-httpd/Make.defs
index 61b7f41e74..35d2c6480f 100644
--- a/nuttx/configs/olimex-lpc1766stk/slip-httpd/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/slip-httpd/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -123,7 +123,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs b/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs
index 0e37dbaa32..dbd84c2a6f 100644
--- a/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -123,7 +123,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/olimex-lpc1766stk/usbserial/Make.defs b/nuttx/configs/olimex-lpc1766stk/usbserial/Make.defs
index 7a56eb6223..07cd41d468 100644
--- a/nuttx/configs/olimex-lpc1766stk/usbserial/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/usbserial/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/olimex-lpc1766stk/usbstorage/Make.defs b/nuttx/configs/olimex-lpc1766stk/usbstorage/Make.defs
index 627cdd64e3..76a6927ee3 100644
--- a/nuttx/configs/olimex-lpc1766stk/usbstorage/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/usbstorage/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/olimex-lpc1766stk/wlan/Make.defs b/nuttx/configs/olimex-lpc1766stk/wlan/Make.defs
index 1087fd8ccf..0cc0d7edd3 100644
--- a/nuttx/configs/olimex-lpc1766stk/wlan/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/wlan/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/olimex-lpc2378/nsh/Make.defs b/nuttx/configs/olimex-lpc2378/nsh/Make.defs
index f81cfb448c..2821aa73c2 100644
--- a/nuttx/configs/olimex-lpc2378/nsh/Make.defs
+++ b/nuttx/configs/olimex-lpc2378/nsh/Make.defs
@@ -61,7 +61,7 @@ ifeq ($(CONFIG_OLIMEX_LPC2378_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_OLIMEX_LPC2378_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
@@ -137,7 +137,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG),y)
diff --git a/nuttx/configs/olimex-lpc2378/ostest/Make.defs b/nuttx/configs/olimex-lpc2378/ostest/Make.defs
index d13e5eda09..69be8db5b1 100644
--- a/nuttx/configs/olimex-lpc2378/ostest/Make.defs
+++ b/nuttx/configs/olimex-lpc2378/ostest/Make.defs
@@ -61,7 +61,7 @@ ifeq ($(CONFIG_OLIMEX_LPC2378_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_OLIMEX_LPC2378_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
@@ -137,7 +137,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG),y)
diff --git a/nuttx/configs/olimex-stm32-p107/nsh/Make.defs b/nuttx/configs/olimex-stm32-p107/nsh/Make.defs
index a1a30f8791..0108ef1eec 100644
--- a/nuttx/configs/olimex-stm32-p107/nsh/Make.defs
+++ b/nuttx/configs/olimex-stm32-p107/nsh/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/olimex-stm32-p107/ostest/Make.defs b/nuttx/configs/olimex-stm32-p107/ostest/Make.defs
index 2e8cf87ac5..7cf5e765ff 100644
--- a/nuttx/configs/olimex-stm32-p107/ostest/Make.defs
+++ b/nuttx/configs/olimex-stm32-p107/ostest/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/olimex-strp711/README.txt b/nuttx/configs/olimex-strp711/README.txt
index 955887d7b7..74168dbfa9 100644
--- a/nuttx/configs/olimex-strp711/README.txt
+++ b/nuttx/configs/olimex-strp711/README.txt
@@ -127,7 +127,7 @@ GNU Toolchain Options
      make                         # 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
+     make CROSSDEV=arm-nuttx-elf- # Will build for the NuttX buildroot toolchain
 
   Of course, hard coding this CROSS_COMPILE value in Make.defs file will save
   some repetitive typing.
@@ -267,7 +267,7 @@ GENERAL STEPS:
 
 6. GDB
 
-  start arm-elf-gdb
+  start arm-nuttx-elf-gdb
   type 'file <executable.elf>' to load the executable
   type 'set debug remote 1' to enable tracing of gdb protocol (if required)
   type 'target remote localhost:3333' to connect to the target
@@ -301,7 +301,7 @@ Windows OpenOCD will Olimex JTAG
   Once the OpenOCD daemon has been started, you can connect to it via
   GDB using the following GDB command:
 
-   arm-elf-gdb
+   arm-nuttx-elf-gdb
    (gdb) target remote localhost:3333
 
   And you can load the NuttX ELF file into FLASH:
diff --git a/nuttx/configs/olimex-strp711/nettest/Make.defs b/nuttx/configs/olimex-strp711/nettest/Make.defs
index 9676e54fae..e4b8a9852c 100644
--- a/nuttx/configs/olimex-strp711/nettest/Make.defs
+++ b/nuttx/configs/olimex-strp711/nettest/Make.defs
@@ -40,9 +40,9 @@ include ${TOPDIR}/tools/Config.mk
 #   make                         -- 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
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CXX			= $(CROSSDEV)g++
 CPP			= $(CROSSDEV)gcc -E
@@ -63,7 +63,7 @@ OBJCOPYARGS		= -R .note -R .note.gnu.build-id -R .comment
 endif
 endif
 
-ifeq ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES	= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
@@ -118,7 +118,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/olimex-strp711/nsh/Make.defs b/nuttx/configs/olimex-strp711/nsh/Make.defs
index ad75862fa1..9ef265d0e1 100644
--- a/nuttx/configs/olimex-strp711/nsh/Make.defs
+++ b/nuttx/configs/olimex-strp711/nsh/Make.defs
@@ -40,9 +40,9 @@ include ${TOPDIR}/tools/Config.mk
 #   make                         -- 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
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CXX			= $(CROSSDEV)g++
 CPP			= $(CROSSDEV)gcc -E
@@ -63,7 +63,7 @@ OBJCOPYARGS		= -R .note -R .note.gnu.build-id -R .comment
 endif
 endif
 
-ifeq ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES	= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
@@ -118,7 +118,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/olimex-strp711/ostest/Make.defs b/nuttx/configs/olimex-strp711/ostest/Make.defs
index 38fc7f5f22..f4bb09d991 100644
--- a/nuttx/configs/olimex-strp711/ostest/Make.defs
+++ b/nuttx/configs/olimex-strp711/ostest/Make.defs
@@ -40,9 +40,9 @@ include ${TOPDIR}/tools/Config.mk
 #   make                         -- 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
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CXX			= $(CROSSDEV)g++
 CPP			= $(CROSSDEV)gcc -E
@@ -63,7 +63,7 @@ OBJCOPYARGS		= -R .note -R .note.gnu.build-id -R .comment
 endif
 endif
 
-ifeq ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES	= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
@@ -118,7 +118,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/qemu-i486/nsh/Make.defs b/nuttx/configs/qemu-i486/nsh/Make.defs
index c68d3d34e9..8b5fe61f65 100644
--- a/nuttx/configs/qemu-i486/nsh/Make.defs
+++ b/nuttx/configs/qemu-i486/nsh/Make.defs
@@ -78,7 +78,7 @@ endif
 # Cygwin toolchains don't generate ELF binaries.
 
 ifeq ($(HOSTOS),Cygwin)
-CROSSDEV = i486-elf-
+CROSSDEV = i486-nuttx-elf-
 else
 CROSSDEV =
 endif
diff --git a/nuttx/configs/qemu-i486/ostest/Make.defs b/nuttx/configs/qemu-i486/ostest/Make.defs
index fa7dc7bf84..0a2423456e 100644
--- a/nuttx/configs/qemu-i486/ostest/Make.defs
+++ b/nuttx/configs/qemu-i486/ostest/Make.defs
@@ -78,7 +78,7 @@ endif
 # Cygwin toolchains don't generate ELF binaries.
 
 ifeq ($(HOSTOS),Cygwin)
-CROSSDEV = i486-elf-
+CROSSDEV = i486-nuttx-elf-
 else
 CROSSDEV =
 endif
diff --git a/nuttx/configs/sam3u-ek/knsh/Make.defs b/nuttx/configs/sam3u-ek/knsh/Make.defs
index cce80669a8..bbe8b23c06 100644
--- a/nuttx/configs/sam3u-ek/knsh/Make.defs
+++ b/nuttx/configs/sam3u-ek/knsh/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_SAM3U_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_SAM3U_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/sam3u-ek/nsh/Make.defs b/nuttx/configs/sam3u-ek/nsh/Make.defs
index e4f24326d3..0f236114f0 100644
--- a/nuttx/configs/sam3u-ek/nsh/Make.defs
+++ b/nuttx/configs/sam3u-ek/nsh/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_SAM3U_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_SAM3U_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/sam3u-ek/nx/Make.defs b/nuttx/configs/sam3u-ek/nx/Make.defs
index e98aaf9d69..10cabe5a56 100644
--- a/nuttx/configs/sam3u-ek/nx/Make.defs
+++ b/nuttx/configs/sam3u-ek/nx/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_SAM3U_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_SAM3U_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/sam3u-ek/ostest/Make.defs b/nuttx/configs/sam3u-ek/ostest/Make.defs
index 7d38aedb2c..7689fb2a18 100644
--- a/nuttx/configs/sam3u-ek/ostest/Make.defs
+++ b/nuttx/configs/sam3u-ek/ostest/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_SAM3U_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_SAM3U_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/sam3u-ek/touchscreen/Make.defs b/nuttx/configs/sam3u-ek/touchscreen/Make.defs
index 1dccbc6bc2..2047daf684 100644
--- a/nuttx/configs/sam3u-ek/touchscreen/Make.defs
+++ b/nuttx/configs/sam3u-ek/touchscreen/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_SAM3U_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_SAM3U_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/shenzhou/nsh/Make.defs b/nuttx/configs/shenzhou/nsh/Make.defs
index 847866420a..95495d4c43 100644
--- a/nuttx/configs/shenzhou/nsh/Make.defs
+++ b/nuttx/configs/shenzhou/nsh/Make.defs
@@ -82,8 +82,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -153,7 +153,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/shenzhou/nxwm/Make.defs b/nuttx/configs/shenzhou/nxwm/Make.defs
index 0025282b44..96e0ffd4b2 100644
--- a/nuttx/configs/shenzhou/nxwm/Make.defs
+++ b/nuttx/configs/shenzhou/nxwm/Make.defs
@@ -82,8 +82,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -153,7 +153,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/skp16c26/README.txt b/nuttx/configs/skp16c26/README.txt
index dc94bbf8d4..31332b59b6 100644
--- a/nuttx/configs/skp16c26/README.txt
+++ b/nuttx/configs/skp16c26/README.txt
@@ -1,112 +1,112 @@
-configs/skp16c26/README.txt
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-1. The buildroot package can be used to build an M16C toolchain.  The toolchain
-   buildroot can be downloaded from misc/buildroot in the NuttX SVN.  Insructions
-   for building the toolchain are provided below.
-
-   However, the target cannot be built because the GNU m16c-elf-ld link fails with 
-   the following message:
-
-     m32c-elf-ld: BFD (GNU Binutils) 2.19 assertion fail /home/Owner/projects/nuttx/buildroot/toolchain_build_m32c/binutils-2.19/bfd/elf32-m32c.c:482
-
-   Where the reference line is:
-
-     /* If the symbol is out of range for a 16-bit address,
-        we must have allocated a plt entry.  */
-     BFD_ASSERT (*plt_offset != (bfd_vma) -1);
-
-   No workaround is known at this time.  This is a show stopper for M16C.
-
-2. A supported version of the M16C toolchain is available here: 
-
-     http://www.kpitgnutools.com/index.php
-
-   This download is free but requires registration.  Unfortunately, this v0901 of
-   this toolchain shows the same behavior:
-
-   c:\Hew3\Tools\KPIT Cummins\GNUM16CM32C-ELF\v0901\m32c-elf\bin\m32c-elf-ld.exe: BFD (GNU Binutils) 2.19-GNUM16CM32C_v0901 assertion fail /home/kpit/fsfsrc/binutils-2.19/bfd/elf32-m32c.c:482
-
-It is possible that this error messasge my be telling me -- a very roundabout way --
-that I have exceeded the FLASH region, but I think that unlikely (it is difficult
-to know if the link does not complete gracefully).
-
-BUILDING THE R8C/M16C/M32C GNU TOOLCHAIN USING BUILDROOT
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-NOTE:  See the toolchain issues above -- you may not want to waste your time.
-
-1. CD to the correct directory.
-
-   Change to the directory just above the NuttX installation.  If <nuttx-dir> is
-   where NuttX is installed, then cd to <nuttx-dir>/..
-
-2. Get and Install the buildroot Module
-
-   a. Using a release tarball:
-
-     cd <nuttx-dir>/..
-     Download the appropriate buildroot package.
-     unpack the buildroot package
-     rename the directory to buildroot
-
-   b. Using SVN
-   
-     Check out the misc/buildroot module. SVN checkout instructions:
-
-        svn checkout svn://svn.code.sf.net/p/nuttx/code/trunk/buildroot buildroot
-
-   Make the archive directory:
-  
-     mkdir archive
-
-   The <nuttx-dir>/../buildroot is where the toolchain is built;
-   The <nuttx-dir>/../archive directory is where toolchain sources will be downloaded.
-
-3. Make sure that NuttX is configured
-
-     cd <nuttx-dir>/tools
-     ./configure.sh <nuttx-configuration>
-     
-4. Configure and Make the buildroot
-
-     cd buildroot
-     cp configs/m32c-defconfig-4.2.4 .config
-     make oldconfig
-     make
-
-   This will download the large source packages for the toolchain and build the toolchain.
-   The resulting binaries will be under buildroot/build_m32c.  There will also be a
-   large build directory called toolchain_build_m32c; this directory can be removed once
-   the build completes successfully.
-
-Cygwin GCC BUILD NOTES
-^^^^^^^^^^^^^^^^^^^^^^
-   On Cygwin, the buildroot 'make' command will fail with an error like:
-
-   "...
-      build/genchecksum cc1-dummy > cc1-checksum.c
-      opening cc1-dummy: No such file or directory
-   ..."
-
-   This is caused because on Cygwin, host executables will be generated with the extension .exe
-   and, apparently, the make variable "exeext" is set incorrectly.  A work around after the
-   above occurs is:
-
-      cd toolchain_build_m32c/gcc-4.2.4-initial/gcc	# Go to the directory where error occurred
-      mv cc1-dummy.exe cc1-dummy			# Rename the executable without .exe
-      rm cc1-checksum.c					# Get rid of the bad generated file
-
-   Then resume the buildroot make:
-
-      cd -						# Back to the buildroot make directory
-      make						# Restart the build
-
-   GCC is built twice.  First a initial, "bootstap" GCC is produced in
-   toolchain_build_m32c/gcc-4.2.4-initial, then the final GCC is produced in
-   toolchain_build_m32c/gcc-4.2.4-final.  The above error will occur twice:  Once for
-   the intial GCC build (see above) and once for the final GCC build. For the final GCC
-   build, the workaround is the same except that the directory will be
-   toolchain_build_m32c/gcc-4.2.4-final/gcc.
-
-   
\ No newline at end of file
+configs/skp16c26/README.txt
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+1. The buildroot package can be used to build an M16C toolchain.  The toolchain
+   buildroot can be downloaded from misc/buildroot in the NuttX SVN.  Insructions
+   for building the toolchain are provided below.
+
+   However, the target cannot be built because the GNU m16c-nuttx-elf-ld link fails with 
+   the following message:
+
+     m32c-nuttx-elf-ld: BFD (GNU Binutils) 2.19 assertion fail /home/Owner/projects/nuttx/buildroot/toolchain_build_m32c/binutils-2.19/bfd/elf32-m32c.c:482
+
+   Where the reference line is:
+
+     /* If the symbol is out of range for a 16-bit address,
+        we must have allocated a plt entry.  */
+     BFD_ASSERT (*plt_offset != (bfd_vma) -1);
+
+   No workaround is known at this time.  This is a show stopper for M16C.
+
+2. A supported version of the M16C toolchain is available here: 
+
+     http://www.kpitgnutools.com/index.php
+
+   This download is free but requires registration.  Unfortunately, this v0901 of
+   this toolchain shows the same behavior:
+
+   c:\Hew3\Tools\KPIT Cummins\GNUM16CM32C-ELF\v0901\m32c-elf\bin\m32c-elf-ld.exe: BFD (GNU Binutils) 2.19-GNUM16CM32C_v0901 assertion fail /home/kpit/fsfsrc/binutils-2.19/bfd/elf32-m32c.c:482
+
+It is possible that this error messasge my be telling me -- a very roundabout way --
+that I have exceeded the FLASH region, but I think that unlikely (it is difficult
+to know if the link does not complete gracefully).
+
+BUILDING THE R8C/M16C/M32C GNU TOOLCHAIN USING BUILDROOT
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+NOTE:  See the toolchain issues above -- you may not want to waste your time.
+
+1. CD to the correct directory.
+
+   Change to the directory just above the NuttX installation.  If <nuttx-dir> is
+   where NuttX is installed, then cd to <nuttx-dir>/..
+
+2. Get and Install the buildroot Module
+
+   a. Using a release tarball:
+
+     cd <nuttx-dir>/..
+     Download the appropriate buildroot package.
+     unpack the buildroot package
+     rename the directory to buildroot
+
+   b. Using SVN
+   
+     Check out the misc/buildroot module. SVN checkout instructions:
+
+        svn checkout svn://svn.code.sf.net/p/nuttx/code/trunk/buildroot buildroot
+
+   Make the archive directory:
+  
+     mkdir archive
+
+   The <nuttx-dir>/../buildroot is where the toolchain is built;
+   The <nuttx-dir>/../archive directory is where toolchain sources will be downloaded.
+
+3. Make sure that NuttX is configured
+
+     cd <nuttx-dir>/tools
+     ./configure.sh <nuttx-configuration>
+     
+4. Configure and Make the buildroot
+
+     cd buildroot
+     cp configs/m32c-defconfig-4.2.4 .config
+     make oldconfig
+     make
+
+   This will download the large source packages for the toolchain and build the toolchain.
+   The resulting binaries will be under buildroot/build_m32c.  There will also be a
+   large build directory called toolchain_build_m32c; this directory can be removed once
+   the build completes successfully.
+
+Cygwin GCC BUILD NOTES
+^^^^^^^^^^^^^^^^^^^^^^
+   On Cygwin, the buildroot 'make' command will fail with an error like:
+
+   "...
+      build/genchecksum cc1-dummy > cc1-checksum.c
+      opening cc1-dummy: No such file or directory
+   ..."
+
+   This is caused because on Cygwin, host executables will be generated with the extension .exe
+   and, apparently, the make variable "exeext" is set incorrectly.  A work around after the
+   above occurs is:
+
+      cd toolchain_build_m32c/gcc-4.2.4-initial/gcc	# Go to the directory where error occurred
+      mv cc1-dummy.exe cc1-dummy			# Rename the executable without .exe
+      rm cc1-checksum.c					# Get rid of the bad generated file
+
+   Then resume the buildroot make:
+
+      cd -						# Back to the buildroot make directory
+      make						# Restart the build
+
+   GCC is built twice.  First a initial, "bootstap" GCC is produced in
+   toolchain_build_m32c/gcc-4.2.4-initial, then the final GCC is produced in
+   toolchain_build_m32c/gcc-4.2.4-final.  The above error will occur twice:  Once for
+   the intial GCC build (see above) and once for the final GCC build. For the final GCC
+   build, the workaround is the same except that the directory will be
+   toolchain_build_m32c/gcc-4.2.4-final/gcc.
+
+   
diff --git a/nuttx/configs/skp16c26/ostest/Make.defs b/nuttx/configs/skp16c26/ostest/Make.defs
index 79f0140133..a7444daae3 100644
--- a/nuttx/configs/skp16c26/ostest/Make.defs
+++ b/nuttx/configs/skp16c26/ostest/Make.defs
@@ -36,7 +36,7 @@
 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
 
-CROSSDEV		= m32c-elf-
+CROSSDEV		= m32c-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CPP			= $(CROSSDEV)gcc -E
 LD			= $(CROSSDEV)ld
diff --git a/nuttx/configs/stm3210e-eval/RIDE/Make.defs b/nuttx/configs/stm3210e-eval/RIDE/Make.defs
index f24075038d..dfd0f600b7 100644
--- a/nuttx/configs/stm3210e-eval/RIDE/Make.defs
+++ b/nuttx/configs/stm3210e-eval/RIDE/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3210e-eval/buttons/Make.defs b/nuttx/configs/stm3210e-eval/buttons/Make.defs
index ed7d6e7f00..9f0691bba8 100644
--- a/nuttx/configs/stm3210e-eval/buttons/Make.defs
+++ b/nuttx/configs/stm3210e-eval/buttons/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3210e-eval/composite/Make.defs b/nuttx/configs/stm3210e-eval/composite/Make.defs
index e084664298..9b855671f3 100644
--- a/nuttx/configs/stm3210e-eval/composite/Make.defs
+++ b/nuttx/configs/stm3210e-eval/composite/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3210e-eval/nsh/Make.defs b/nuttx/configs/stm3210e-eval/nsh/Make.defs
index 1e8e945b64..afdf0c0971 100644
--- a/nuttx/configs/stm3210e-eval/nsh/Make.defs
+++ b/nuttx/configs/stm3210e-eval/nsh/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3210e-eval/nsh2/Make.defs b/nuttx/configs/stm3210e-eval/nsh2/Make.defs
index 049c9d7a80..7d36c9a00d 100644
--- a/nuttx/configs/stm3210e-eval/nsh2/Make.defs
+++ b/nuttx/configs/stm3210e-eval/nsh2/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3210e-eval/nx/Make.defs b/nuttx/configs/stm3210e-eval/nx/Make.defs
index a553e01630..bb0ba5b6df 100644
--- a/nuttx/configs/stm3210e-eval/nx/Make.defs
+++ b/nuttx/configs/stm3210e-eval/nx/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3210e-eval/nxconsole/Make.defs b/nuttx/configs/stm3210e-eval/nxconsole/Make.defs
index d55f4c61d4..84b36b2676 100644
--- a/nuttx/configs/stm3210e-eval/nxconsole/Make.defs
+++ b/nuttx/configs/stm3210e-eval/nxconsole/Make.defs
@@ -73,7 +73,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -134,7 +134,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3210e-eval/nxlines/Make.defs b/nuttx/configs/stm3210e-eval/nxlines/Make.defs
index 83bd9eb5e8..a896a901e6 100644
--- a/nuttx/configs/stm3210e-eval/nxlines/Make.defs
+++ b/nuttx/configs/stm3210e-eval/nxlines/Make.defs
@@ -73,7 +73,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -134,7 +134,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3210e-eval/nxtext/Make.defs b/nuttx/configs/stm3210e-eval/nxtext/Make.defs
index 4a082fc745..00370c3b0f 100644
--- a/nuttx/configs/stm3210e-eval/nxtext/Make.defs
+++ b/nuttx/configs/stm3210e-eval/nxtext/Make.defs
@@ -73,7 +73,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -134,7 +134,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3210e-eval/ostest/Make.defs b/nuttx/configs/stm3210e-eval/ostest/Make.defs
index 41a1974570..09b3f03954 100644
--- a/nuttx/configs/stm3210e-eval/ostest/Make.defs
+++ b/nuttx/configs/stm3210e-eval/ostest/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3210e-eval/pm/Make.defs b/nuttx/configs/stm3210e-eval/pm/Make.defs
index c298c4364b..0cc96fa4ee 100644
--- a/nuttx/configs/stm3210e-eval/pm/Make.defs
+++ b/nuttx/configs/stm3210e-eval/pm/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3210e-eval/usbserial/Make.defs b/nuttx/configs/stm3210e-eval/usbserial/Make.defs
index f45de369e9..cda6edf4ee 100644
--- a/nuttx/configs/stm3210e-eval/usbserial/Make.defs
+++ b/nuttx/configs/stm3210e-eval/usbserial/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3210e-eval/usbstorage/Make.defs b/nuttx/configs/stm3210e-eval/usbstorage/Make.defs
index e0a4de6f9e..36688bc805 100644
--- a/nuttx/configs/stm3210e-eval/usbstorage/Make.defs
+++ b/nuttx/configs/stm3210e-eval/usbstorage/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3220g-eval/dhcpd/Make.defs b/nuttx/configs/stm3220g-eval/dhcpd/Make.defs
index 4a94997a5c..f75e94501f 100644
--- a/nuttx/configs/stm3220g-eval/dhcpd/Make.defs
+++ b/nuttx/configs/stm3220g-eval/dhcpd/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3220g-eval/nettest/Make.defs b/nuttx/configs/stm3220g-eval/nettest/Make.defs
index c69852119f..f307d9475d 100644
--- a/nuttx/configs/stm3220g-eval/nettest/Make.defs
+++ b/nuttx/configs/stm3220g-eval/nettest/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3220g-eval/nsh/Make.defs b/nuttx/configs/stm3220g-eval/nsh/Make.defs
index 4b2bbef30a..9fe8b0ffab 100644
--- a/nuttx/configs/stm3220g-eval/nsh/Make.defs
+++ b/nuttx/configs/stm3220g-eval/nsh/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3220g-eval/nsh2/Make.defs b/nuttx/configs/stm3220g-eval/nsh2/Make.defs
index d813508680..64f158ecb5 100644
--- a/nuttx/configs/stm3220g-eval/nsh2/Make.defs
+++ b/nuttx/configs/stm3220g-eval/nsh2/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3220g-eval/nxwm/Make.defs b/nuttx/configs/stm3220g-eval/nxwm/Make.defs
index 616529e7e2..37280e0c44 100644
--- a/nuttx/configs/stm3220g-eval/nxwm/Make.defs
+++ b/nuttx/configs/stm3220g-eval/nxwm/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3220g-eval/ostest/Make.defs b/nuttx/configs/stm3220g-eval/ostest/Make.defs
index 9d8c07dfa2..41e8fff142 100644
--- a/nuttx/configs/stm3220g-eval/ostest/Make.defs
+++ b/nuttx/configs/stm3220g-eval/ostest/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3220g-eval/telnetd/Make.defs b/nuttx/configs/stm3220g-eval/telnetd/Make.defs
index 10725d7279..416bfaa47b 100644
--- a/nuttx/configs/stm3220g-eval/telnetd/Make.defs
+++ b/nuttx/configs/stm3220g-eval/telnetd/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3240g-eval/dhcpd/Make.defs b/nuttx/configs/stm3240g-eval/dhcpd/Make.defs
index 7fb1e0b7f8..1c7a7cff0e 100644
--- a/nuttx/configs/stm3240g-eval/dhcpd/Make.defs
+++ b/nuttx/configs/stm3240g-eval/dhcpd/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3240g-eval/discover/Make.defs b/nuttx/configs/stm3240g-eval/discover/Make.defs
index abcae0f5f0..9cf9d59585 100644
--- a/nuttx/configs/stm3240g-eval/discover/Make.defs
+++ b/nuttx/configs/stm3240g-eval/discover/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3240g-eval/nettest/Make.defs b/nuttx/configs/stm3240g-eval/nettest/Make.defs
index a0a1cd58fd..e8af4cbb5d 100644
--- a/nuttx/configs/stm3240g-eval/nettest/Make.defs
+++ b/nuttx/configs/stm3240g-eval/nettest/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3240g-eval/nsh/Make.defs b/nuttx/configs/stm3240g-eval/nsh/Make.defs
index ab0ede05e6..e88f1054b4 100644
--- a/nuttx/configs/stm3240g-eval/nsh/Make.defs
+++ b/nuttx/configs/stm3240g-eval/nsh/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3240g-eval/nsh2/Make.defs b/nuttx/configs/stm3240g-eval/nsh2/Make.defs
index 7a0e19582f..3e7fa8bd2a 100644
--- a/nuttx/configs/stm3240g-eval/nsh2/Make.defs
+++ b/nuttx/configs/stm3240g-eval/nsh2/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3240g-eval/nxconsole/Make.defs b/nuttx/configs/stm3240g-eval/nxconsole/Make.defs
index 6c200d3ce0..aedfacc80a 100644
--- a/nuttx/configs/stm3240g-eval/nxconsole/Make.defs
+++ b/nuttx/configs/stm3240g-eval/nxconsole/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3240g-eval/nxwm/Make.defs b/nuttx/configs/stm3240g-eval/nxwm/Make.defs
index 167792094f..631cfab861 100644
--- a/nuttx/configs/stm3240g-eval/nxwm/Make.defs
+++ b/nuttx/configs/stm3240g-eval/nxwm/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3240g-eval/ostest/Make.defs b/nuttx/configs/stm3240g-eval/ostest/Make.defs
index a7e7a1392d..875d39f22d 100644
--- a/nuttx/configs/stm3240g-eval/ostest/Make.defs
+++ b/nuttx/configs/stm3240g-eval/ostest/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3240g-eval/telnetd/Make.defs b/nuttx/configs/stm3240g-eval/telnetd/Make.defs
index 1ddbddaabd..d0ed37f28d 100644
--- a/nuttx/configs/stm3240g-eval/telnetd/Make.defs
+++ b/nuttx/configs/stm3240g-eval/telnetd/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3240g-eval/webserver/Make.defs b/nuttx/configs/stm3240g-eval/webserver/Make.defs
index 0669350803..fbe1ffb0ec 100644
--- a/nuttx/configs/stm3240g-eval/webserver/Make.defs
+++ b/nuttx/configs/stm3240g-eval/webserver/Make.defs
@@ -89,8 +89,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -154,7 +154,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm3240g-eval/xmlrpc/Make.defs b/nuttx/configs/stm3240g-eval/xmlrpc/Make.defs
index eb02622e66..61b0d5c4e4 100644
--- a/nuttx/configs/stm3240g-eval/xmlrpc/Make.defs
+++ b/nuttx/configs/stm3240g-eval/xmlrpc/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm32f4discovery/nsh/Make.defs b/nuttx/configs/stm32f4discovery/nsh/Make.defs
index 4a776bffe5..f4110cce3e 100644
--- a/nuttx/configs/stm32f4discovery/nsh/Make.defs
+++ b/nuttx/configs/stm32f4discovery/nsh/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm32f4discovery/nxlines/Make.defs b/nuttx/configs/stm32f4discovery/nxlines/Make.defs
index c728da7b3c..8dab2009ce 100644
--- a/nuttx/configs/stm32f4discovery/nxlines/Make.defs
+++ b/nuttx/configs/stm32f4discovery/nxlines/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm32f4discovery/ostest/Make.defs b/nuttx/configs/stm32f4discovery/ostest/Make.defs
index 7ee4375893..f20fddb843 100644
--- a/nuttx/configs/stm32f4discovery/ostest/Make.defs
+++ b/nuttx/configs/stm32f4discovery/ostest/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/stm32f4discovery/pm/Make.defs b/nuttx/configs/stm32f4discovery/pm/Make.defs
index 8dc63684e2..f96f439ee4 100644
--- a/nuttx/configs/stm32f4discovery/pm/Make.defs
+++ b/nuttx/configs/stm32f4discovery/pm/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/teensy/hello/Make.defs b/nuttx/configs/teensy/hello/Make.defs
index 72d51de14b..cca88363cd 100644
--- a/nuttx/configs/teensy/hello/Make.defs
+++ b/nuttx/configs/teensy/hello/Make.defs
@@ -57,7 +57,7 @@ endif
 
 ifeq ($(CONFIG_AVR_BUILDROOT),y)
   # NuttX buildroot GCC toolchain under Linux or Cygwin
-  CROSSDEV = avr-elf-
+  CROSSDEV = avr-nuttx-elf-
   MAXOPTIMIZATION = -O2
   ARCHCPUFLAGS = -mmcu=at90usb1286
   LDFLAGS += -nostartfiles -nodefaultlibs
diff --git a/nuttx/configs/teensy/nsh/Make.defs b/nuttx/configs/teensy/nsh/Make.defs
index e58b1596ec..13f8e79027 100644
--- a/nuttx/configs/teensy/nsh/Make.defs
+++ b/nuttx/configs/teensy/nsh/Make.defs
@@ -57,7 +57,7 @@ endif
 
 ifeq ($(CONFIG_AVR_BUILDROOT),y)
   # NuttX buildroot GCC toolchain under Linux or Cygwin
-  CROSSDEV = avr-elf-
+  CROSSDEV = avr-nuttx-elf-
   MAXOPTIMIZATION = -O2
   ARCHCPUFLAGS = -mmcu=at90usb1286
   LDFLAGS += -nostartfiles -nodefaultlibs
diff --git a/nuttx/configs/teensy/usbstorage/Make.defs b/nuttx/configs/teensy/usbstorage/Make.defs
index b221491d64..706daf81f6 100644
--- a/nuttx/configs/teensy/usbstorage/Make.defs
+++ b/nuttx/configs/teensy/usbstorage/Make.defs
@@ -57,7 +57,7 @@ endif
 
 ifeq ($(CONFIG_AVR_BUILDROOT),y)
   # NuttX buildroot GCC toolchain under Linux or Cygwin
-  CROSSDEV = avr-elf-
+  CROSSDEV = avr-nuttx-elf-
   MAXOPTIMIZATION = -O2
   ARCHCPUFLAGS = -mmcu=at90usb1286
   LDFLAGS += -nostartfiles -nodefaultlibs
diff --git a/nuttx/configs/twr-k60n512/nsh/Make.defs b/nuttx/configs/twr-k60n512/nsh/Make.defs
index ebeea90a54..99041bcc29 100644
--- a/nuttx/configs/twr-k60n512/nsh/Make.defs
+++ b/nuttx/configs/twr-k60n512/nsh/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_KINETIS_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_KINETIS_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft -mlong-calls
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/twr-k60n512/ostest/Make.defs b/nuttx/configs/twr-k60n512/ostest/Make.defs
index 2f5e208fe5..93c887a2d6 100644
--- a/nuttx/configs/twr-k60n512/ostest/Make.defs
+++ b/nuttx/configs/twr-k60n512/ostest/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_KINETIS_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_KINETIS_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft -mlong-calls
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/us7032evb1/nsh/Make.defs b/nuttx/configs/us7032evb1/nsh/Make.defs
index d861f5d48d..9cbc41f5b9 100644
--- a/nuttx/configs/us7032evb1/nsh/Make.defs
+++ b/nuttx/configs/us7032evb1/nsh/Make.defs
@@ -50,7 +50,7 @@ ARCHDEFINES		=
 ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
 ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nsh/ld.script
 
-CROSSDEV		= sh-elf-
+CROSSDEV		= sh-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CPP			= $(CROSSDEV)gcc -E
 LD			= $(CROSSDEV)ld
diff --git a/nuttx/configs/us7032evb1/ostest/Make.defs b/nuttx/configs/us7032evb1/ostest/Make.defs
index 580c126286..32f45eddab 100644
--- a/nuttx/configs/us7032evb1/ostest/Make.defs
+++ b/nuttx/configs/us7032evb1/ostest/Make.defs
@@ -50,7 +50,7 @@ ARCHDEFINES		=
 ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
 ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/ostest/ld.script
 
-CROSSDEV		= sh-elf-
+CROSSDEV		= sh-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CPP			= $(CROSSDEV)gcc -E
 LD			= $(CROSSDEV)ld
diff --git a/nuttx/configs/vsn/nsh/Make.defs b/nuttx/configs/vsn/nsh/Make.defs
index 15de85f605..abcdf49c16 100644
--- a/nuttx/configs/vsn/nsh/Make.defs
+++ b/nuttx/configs/vsn/nsh/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)

From 535398581c4c7fe105089270f2497247b5279acd Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Fri, 5 Oct 2012 23:43:05 +0000
Subject: [PATCH 17/43] configs/shenzhou will now use the 4.6.3 buildroot EABI
 toolchain

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5214 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/ChangeLog                       | 5 +++++
 nuttx/configs/shenzhou/README.txt     | 4 ++--
 nuttx/configs/shenzhou/nsh/Make.defs  | 6 +++---
 nuttx/configs/shenzhou/nxwm/Make.defs | 6 +++---
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 257119a353..7121c506f1 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3465,3 +3465,8 @@
 	  of CONFIG_EXAMPLE_* to CONFIG_EXAMPLES_*.
 	* drivers/mtd/w25.c and configs/*/src/up_w25.c:  Several fixes for the
 	  W25 SPI FLASH.
+	* configs/*/Make.defs:  All buildroot tools now use the extension
+	  xxx-nuttx-elf- vs. xxx-elf-
+	* configs/shenzhou/*/Make.defs:  Now uses the new buildroot 4.6.3
+	  EABI toolchain.
+
diff --git a/nuttx/configs/shenzhou/README.txt b/nuttx/configs/shenzhou/README.txt
index 1f3f254aab..cad0ad2e73 100644
--- a/nuttx/configs/shenzhou/README.txt
+++ b/nuttx/configs/shenzhou/README.txt
@@ -354,7 +354,7 @@ NuttX buildroot Toolchain
 
   4. cd <some-dir>/buildroot
 
-  5. cp configs/cortexm3-defconfig-4.3.3 .config
+  5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config
 
   6. make oldconfig
 
@@ -770,4 +770,4 @@ Where <subdir> is one of the following:
 
       -CONFIG_NX_WRITEONLY=y
       +# CONFIG_NX_WRITEONLY is not set
- 
\ No newline at end of file
+ 
diff --git a/nuttx/configs/shenzhou/nsh/Make.defs b/nuttx/configs/shenzhou/nsh/Make.defs
index 95495d4c43..317a95cda8 100644
--- a/nuttx/configs/shenzhou/nsh/Make.defs
+++ b/nuttx/configs/shenzhou/nsh/Make.defs
@@ -82,8 +82,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -153,7 +153,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-nuttx-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-eabi-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/nuttx/configs/shenzhou/nxwm/Make.defs b/nuttx/configs/shenzhou/nxwm/Make.defs
index 96e0ffd4b2..96104d6d0c 100644
--- a/nuttx/configs/shenzhou/nxwm/Make.defs
+++ b/nuttx/configs/shenzhou/nxwm/Make.defs
@@ -82,8 +82,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -153,7 +153,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-nuttx-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-eabi-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)

From b9454627bc2b5ae8383cffdf5ae612e03354c2a1 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sat, 6 Oct 2012 00:20:49 +0000
Subject: [PATCH 18/43] More changes for buildroot EABI toolchain

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5215 42af7a65-404d-4744-a932-0658087f49c3
---
 misc/buildroot/configs/README.txt               | 10 +++++++---
 .../configs/arm920t-eabi-defconfig-4.5.2        |  2 +-
 misc/buildroot/configs/arm926t-defconfig-4.3.3  |  2 +-
 misc/buildroot/configs/arm926t-defconfig-nxflat |  2 +-
 nuttx/configs/shenzhou/README.txt               | 17 ++++++++++++++++-
 nuttx/configs/shenzhou/nsh/Make.defs            |  3 ++-
 nuttx/configs/shenzhou/nxwm/Make.defs           |  3 ++-
 7 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/misc/buildroot/configs/README.txt b/misc/buildroot/configs/README.txt
index f37bcf1788..6b76ff80d2 100644
--- a/misc/buildroot/configs/README.txt
+++ b/misc/buildroot/configs/README.txt
@@ -14,12 +14,12 @@ AVAILABLE CONFIGURATIONS
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
 arm-defconfig
-	Builds an ARM toolchain using gcc 3.4.6
+	Builds an OABI ARM toolchain using gcc 3.4.6
 
 arm7tdmi-defconfig-4.2.4
 arm920t-defconfig-4.2.4
 arm926t-defconfig-4.2.4
-	Builds an ARM toolchain using gcc 4.2.4.  This configuration
+	Builds an OABI ARM toolchain using gcc 4.2.4.  This configuration
 	builds both gcc and g++.  There are three versions: one for 
 	arm7tdmi (armv4t), arm920t (armv4t) and arm926t (arv5t) because
 	of differences in the way that soft floating is handled in between
@@ -48,7 +48,7 @@ arm926t-defconfig-4.2.4
 
 arm920t-defconfig-4.3.3
 arm7tdmi-defconfig-4.3.3
-	Builds an ARM toolchain using gcc 4.3.3.  These configurations
+	Builds an OABI ARM toolchain using gcc 4.3.3.  These configurations
 	builds both gcc and g++ for the arm7tdmi (armv4t) or the arm920t
 	(armv4t).  These are udates to *-defconfig-4.2.4 (see notes above).
 
@@ -62,6 +62,10 @@ cortexm3-defconfig-4.3.3
 	Builds an OABI ARM toolchain for the Cortex-M3 using gcc 4.3.3.
 	This configuration builds gcc, g++ and the NXFLAT toolchain.
 
+cortexm3-eabi-defconfig-4.6.3
+        Builds an EABI ARM toolchain for the Cortex-M3 using gcc 4.6.3.
+        This configuration builds gcc, g++ and the NXFLAT toolchain.
+
 cortexm3-defconfig-nxflat
 arm926t-defconfig-nxflat
 	This configuration build an NXFLAT toolchain (only) for
diff --git a/misc/buildroot/configs/arm920t-eabi-defconfig-4.5.2 b/misc/buildroot/configs/arm920t-eabi-defconfig-4.5.2
index 3586e4f334..6e55dc363f 100644
--- a/misc/buildroot/configs/arm920t-eabi-defconfig-4.5.2
+++ b/misc/buildroot/configs/arm920t-eabi-defconfig-4.5.2
@@ -61,7 +61,7 @@ BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-elf"
-BR2_GNU_TARGET_SUFFIX="eabi"
+BR2_GNU_TARGET_SUFFIX="nuttx-eabi"
 # BR2_PREFER_IMA is not set
 
 #
diff --git a/misc/buildroot/configs/arm926t-defconfig-4.3.3 b/misc/buildroot/configs/arm926t-defconfig-4.3.3
index b72a124512..1d63017798 100644
--- a/misc/buildroot/configs/arm926t-defconfig-4.3.3
+++ b/misc/buildroot/configs/arm926t-defconfig-4.3.3
@@ -59,7 +59,7 @@ BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
 BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
-BR2_GNU_BUILD_SUFFIX="arm-elf"
+BR2_GNU_BUILD_SUFFIX="pc-elf"
 BR2_GNU_TARGET_SUFFIX="nuttx-elf"
 # BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
diff --git a/misc/buildroot/configs/arm926t-defconfig-nxflat b/misc/buildroot/configs/arm926t-defconfig-nxflat
index d449ef4aba..4f6a669c2b 100644
--- a/misc/buildroot/configs/arm926t-defconfig-nxflat
+++ b/misc/buildroot/configs/arm926t-defconfig-nxflat
@@ -59,7 +59,7 @@ BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
 BR2_NUTTX_DIR="$(TOPDIR)/../../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
-BR2_GNU_BUILD_SUFFIX="arm-elf"
+BR2_GNU_BUILD_SUFFIX="pc-elf"
 BR2_GNU_TARGET_SUFFIX="nuttx-elf"
 # BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
diff --git a/nuttx/configs/shenzhou/README.txt b/nuttx/configs/shenzhou/README.txt
index cad0ad2e73..c04c55ad02 100644
--- a/nuttx/configs/shenzhou/README.txt
+++ b/nuttx/configs/shenzhou/README.txt
@@ -346,6 +346,9 @@ NuttX buildroot Toolchain
      cd tools
      ./configure.sh shenzhou/<sub-dir>
 
+     cd ..
+     make context
+
   2. Download the latest buildroot package into <some-dir>
 
   3. unpack the buildroot tarball.  The resulting directory may
@@ -360,9 +363,21 @@ NuttX buildroot Toolchain
 
   7. make
 
-  8. Edit setenv.h, if necessary, so that the PATH variable includes
+  8. Edit nuttx/.config to select the buildroot toolchain as described above
+     and below:
+
+     -CONFIG_STM32_CODESOURCERYW=y
+     +CONFIG_STM32_BUILDROOT=y
+
+  9. Edit setenv.h, if necessary, so that the PATH variable includes
      the path to the newly built binaries.
 
+     -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"
+
+     -#export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+     +export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+
   See the file configs/README.txt in the buildroot source tree.  That has more
   detailed PLUS some special instructions that you will need to follow if you are
   building a Cortex-M3 toolchain for Cygwin under Windows.
diff --git a/nuttx/configs/shenzhou/nsh/Make.defs b/nuttx/configs/shenzhou/nsh/Make.defs
index 317a95cda8..555b0069fb 100644
--- a/nuttx/configs/shenzhou/nsh/Make.defs
+++ b/nuttx/configs/shenzhou/nsh/Make.defs
@@ -84,7 +84,8 @@ ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
   CROSSDEV = arm-nuttx-eabi-
   ARCROSSDEV = arm-nuttx-eabi-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+# ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/shenzhou/nxwm/Make.defs b/nuttx/configs/shenzhou/nxwm/Make.defs
index 96104d6d0c..dfb0472a1f 100644
--- a/nuttx/configs/shenzhou/nxwm/Make.defs
+++ b/nuttx/configs/shenzhou/nxwm/Make.defs
@@ -84,7 +84,8 @@ ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
   CROSSDEV = arm-nuttx-eabi-
   ARCROSSDEV = arm-nuttx-eabi-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+# ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 

From a41bc3c2ff6fbf059d715eb8fa0558c3191a346a Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sat, 6 Oct 2012 00:27:17 +0000
Subject: [PATCH 19/43] Eliminate a warning

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5216 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/lib/stdio/lib_libvsprintf.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nuttx/lib/stdio/lib_libvsprintf.c b/nuttx/lib/stdio/lib_libvsprintf.c
index 2bf0958808..30c988599c 100644
--- a/nuttx/lib/stdio/lib_libvsprintf.c
+++ b/nuttx/lib/stdio/lib_libvsprintf.c
@@ -1169,7 +1169,9 @@ int lib_vsprintf(FAR struct lib_outstream_s *obj, FAR const char *src, va_list a
   FAR char        *ptmp;
 #ifndef CONFIG_NOPRINTF_FIELDWIDTH
   int             width;
+#ifdef CONFIG_LIBC_FLOATINGPOINT
   int             trunc;
+#endif
   uint8_t         fmt;
 #endif
   uint8_t         flags;
@@ -1212,7 +1214,9 @@ int lib_vsprintf(FAR struct lib_outstream_s *obj, FAR const char *src, va_list a
 #ifndef CONFIG_NOPRINTF_FIELDWIDTH
       fmt   = FMT_RJUST;
       width = 0;
+#ifdef CONFIG_LIBC_FLOATINGPOINT
       trunc = 0;
+#endif
 #endif
 
       /* Process each format qualifier. */
@@ -1260,8 +1264,10 @@ int lib_vsprintf(FAR struct lib_outstream_s *obj, FAR const char *src, va_list a
               int value = va_arg(ap, int);
               if (IS_HASDOT(flags))
                 {
+#ifdef CONFIG_LIBC_FLOATINGPOINT
                   trunc = value;
                   SET_HASASTERISKTRUNC(flags);
+#endif
                 }
               else
                 {
@@ -1300,7 +1306,9 @@ int lib_vsprintf(FAR struct lib_outstream_s *obj, FAR const char *src, va_list a
 
               if (IS_HASDOT(flags))
                 {
+#ifdef CONFIG_LIBC_FLOATINGPOINT
                   trunc = n;
+#endif
                 }
               else
                 {

From 4d23437df02e0974cb0fbf6d80fe9039037947bd Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sat, 6 Oct 2012 14:50:37 +0000
Subject: [PATCH 20/43] Several bugfixes, mostly from Darcy Gong

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5217 42af7a65-404d-4744-a932-0658087f49c3
---
 apps/ChangeLog.txt                   |   4 +
 apps/netutils/webclient/webclient.c  |  14 +-
 apps/netutils/webserver/httpd.c      |   2 +-
 nuttx/arch/arm/src/stm32/stm32_eth.c |   1 +
 nuttx/drivers/mtd/ramtron.c          | 218 ++++++++++++++-------------
 5 files changed, 128 insertions(+), 111 deletions(-)

diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index bf2a85a9bb..7375adccfc 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -364,3 +364,7 @@
 	  There are still a LOT of empty, stub Kconfig files.
 	* Kconfig:  Fleshed out apps/examples/buttons/Kconfig. There are still a LOT
 	  of empty, stub Kconfig files.
+	* apps/netutils/webserver/httpd.c:  Fix a bug that I introduced in
+	  recent check-ins (Darcy Gong).
+	* apps/netutils/webclient/webclient.c:  Fix another but that I introduced
+	  when I was trying to add correct handling for loss of connection (Darcy Gong)
diff --git a/apps/netutils/webclient/webclient.c b/apps/netutils/webclient/webclient.c
index 05a63ba381..5a84c4fd12 100644
--- a/apps/netutils/webclient/webclient.c
+++ b/apps/netutils/webclient/webclient.c
@@ -110,7 +110,7 @@ struct wget_s
   FAR char *buffer;  /* user-provided buffer */
   int buflen;        /* Length of the user provided buffer */
   int offset;        /* Offset to the beginning of interesting data */
-  int datend;        /* Offset+1 to the last valid byte of data in the buffer */  
+  int datend;        /* Offset+1 to the last valid byte of data in the buffer */
 
   /* Buffer HTTP header data and parse line at a time */
 
@@ -204,7 +204,7 @@ static inline int wget_resolvehost(const char *hostname, in_addr_t *ipaddr)
       /* 'host' does not point to a valid address string.  Try to resolve
        *  the host name to an IP address.
        */
- 
+
       if (resolv_query(hostname, &addr) < 0)
         {
           /* Needs to set the errno here */
@@ -401,10 +401,10 @@ exit:
  *
  * Returned Value:
  *   0: if the GET operation completed successfully;
- *  -1: On a failure with errno set appropriately 
+ *  -1: On a failure with errno set appropriately
  *
  ****************************************************************************/
- 
+
 int wget(FAR const char *url, FAR char *buffer, int buflen,
          wget_callback_t callback, FAR void *arg)
 {
@@ -524,10 +524,10 @@ int wget(FAR const char *url, FAR char *buffer, int buflen,
               ret = ws.datend;
               goto errout_with_errno;
             }
-          else if (ret == 0)
+          else if (ws.datend == 0)
             {
               nvdbg("Connection lost\n");
-              close(sockfd);            
+              close(sockfd);
               break;
             }
 
@@ -567,7 +567,7 @@ int wget(FAR const char *url, FAR char *buffer, int buflen,
               else
                 {
                   redirected = true;
-                  close(sockfd);            
+                  close(sockfd);
                   break;
                 }
             }
diff --git a/apps/netutils/webserver/httpd.c b/apps/netutils/webserver/httpd.c
index f96fc5a6c4..9f621d67cf 100644
--- a/apps/netutils/webserver/httpd.c
+++ b/apps/netutils/webserver/httpd.c
@@ -694,7 +694,7 @@ static inline int httpd_parse(struct httpd_state *pstate)
   while (state != STATE_BODY);
 
 #if !defined(CONFIG_NETUTILS_HTTPD_SENDFILE) && !defined(CONFIG_NETUTILS_HTTPD_MMAP)
-  if (0 == strcmp(pstate->ht_filename, "/")
+  if (0 == strcmp(pstate->ht_filename, "/"))
     {
       strncpy(pstate->ht_filename, "/" CONFIG_NETUTILS_HTTPD_INDEX, strlen("/" CONFIG_NETUTILS_HTTPD_INDEX));
     }
diff --git a/nuttx/arch/arm/src/stm32/stm32_eth.c b/nuttx/arch/arm/src/stm32/stm32_eth.c
index 13f02679fd..3054142ce8 100644
--- a/nuttx/arch/arm/src/stm32/stm32_eth.c
+++ b/nuttx/arch/arm/src/stm32/stm32_eth.c
@@ -1656,6 +1656,7 @@ static void stm32_receive(FAR struct stm32_ethmac_s *priv)
 
           stm32_freebuffer(priv, dev->d_buf);
           dev->d_buf = NULL;
+          dev->d_len = 0;
         }
     }
 }
diff --git a/nuttx/drivers/mtd/ramtron.c b/nuttx/drivers/mtd/ramtron.c
index 074545e2d9..34273bccfc 100644
--- a/nuttx/drivers/mtd/ramtron.c
+++ b/nuttx/drivers/mtd/ramtron.c
@@ -98,7 +98,7 @@
 #define RAMTRON_WRITE     0x02    /* 1 Write                     A   0     1-256 */
 #define RAMTRON_SLEEP     0xb9    // TODO:
 #define RAMTRON_RDID      0x9f    /* 1 Read Identification       0   0     1-3 */
-#define RAMTRON_SN        0xc3	  // TODO:
+#define RAMTRON_SN        0xc3    // TODO:
 
 
 /* Status register bit definitions */
@@ -125,12 +125,12 @@
 
 struct ramtron_parts_s
 {
-	const char *name;
-	uint8_t     id1;
-	uint8_t     id2;
-	uint32_t    size;
-	uint8_t     addr_len;
-	uint32_t	speed;
+  const char *name;
+  uint8_t     id1;
+  uint8_t     id2;
+  uint32_t    size;
+  uint8_t     addr_len;
+  uint32_t    speed;
 };
 
 /* This type represents the state of the MTD device.  The struct mtd_dev_s
@@ -146,84 +146,86 @@ struct ramtron_dev_s
   uint8_t  pageshift;
   uint16_t nsectors;
   uint32_t npages;
-  const struct ramtron_parts_s *part;	/* part instance */
+  const struct ramtron_parts_s *part;  /* part instance */
 };
 
 /************************************************************************************
  * Supported Part Lists
  ************************************************************************************/
 
-// Defines the initial speed compatible with all devices. In case of RAMTRON
-// the defined devices within the part list have all the same speed.
-#define RAMTRON_INIT_CLK_MAX		40000000UL
+/* Defines the initial speed compatible with all devices. In case of RAMTRON
+ * the defined devices within the part list have all the same speed.
+ */
+
+#define RAMTRON_INIT_CLK_MAX    40000000UL
 
 static struct ramtron_parts_s ramtron_parts[] =
 {
-	{
-		"FM25V02",                    /* name */
-		0x22,                         /* id1 */
-		0x00,                         /* id2 */
-		32L*1024L,                    /* size */
-		2,                            /* addr_len */
-		40000000                      /* speed */
-	},
-	{
-		"FM25VN02",                    /* name */
-		0x22,                          /* id1 */
-		0x01,                          /* id2 */
-		32L*1024L,                     /* size */
-		2,                             /* addr_len */
-		40000000                       /* speed */
-	},
-	{
-		"FM25V05",                    /* name */
-		0x23,                         /* id1 */
-		0x00,                         /* id2 */
-		64L*1024L,                    /* size */
-		2,                            /* addr_len */
-		40000000                      /* speed */
-	},
-	{
-		"FM25VN05",                    /* name */
-		0x23,                          /* id1 */
-		0x01,                          /* id2 */
-		64L*1024L,                     /* size */
-		2,                             /* addr_len */
-		40000000                       /* speed */
-	},
-	{
-		"FM25V10",                    /* name */
-		0x24,                         /* id1 */
-		0x00,                         /* id2 */
-		128L*1024L,                   /* size */
-		3,                            /* addr_len */
-		40000000                      /* speed */
-	},
-	{
-		"FM25VN10",                   /* name */
-		0x24,                         /* id1 */
-		0x01,                         /* id2 */
-		128L*1024L,                   /* size */
-		3,                            /* addr_len */
-		40000000                      /* speed */
-	},
+  {
+    "FM25V02",                    /* name */
+    0x22,                         /* id1 */
+    0x00,                         /* id2 */
+    32L*1024L,                    /* size */
+    2,                            /* addr_len */
+    40000000                      /* speed */
+  },
+  {
+    "FM25VN02",                    /* name */
+    0x22,                          /* id1 */
+    0x01,                          /* id2 */
+    32L*1024L,                     /* size */
+    2,                             /* addr_len */
+    40000000                       /* speed */
+  },
+  {
+    "FM25V05",                    /* name */
+    0x23,                         /* id1 */
+    0x00,                         /* id2 */
+    64L*1024L,                    /* size */
+    2,                            /* addr_len */
+    40000000                      /* speed */
+  },
+  {
+    "FM25VN05",                    /* name */
+    0x23,                          /* id1 */
+    0x01,                          /* id2 */
+    64L*1024L,                     /* size */
+    2,                             /* addr_len */
+    40000000                       /* speed */
+  },
+  {
+    "FM25V10",                    /* name */
+    0x24,                         /* id1 */
+    0x00,                         /* id2 */
+    128L*1024L,                   /* size */
+    3,                            /* addr_len */
+    40000000                      /* speed */
+  },
+  {
+    "FM25VN10",                   /* name */
+    0x24,                         /* id1 */
+    0x01,                         /* id2 */
+    128L*1024L,                   /* size */
+    3,                            /* addr_len */
+    40000000                      /* speed */
+  },
 #ifdef CONFIG_RAMTRON_FRAM_NON_JEDEC
-	{
-		"FM25H20",                    /* name */
-		0xff,                         /* id1 */
-		0xff,                         /* id2 */
-		256L*1024L,                   /* size */
-		3,                            /* addr_len */
-		40000000                      /* speed */
-	},
-	{
-		NULL,                         /* name */
-        0,                            /* id1 */
-        0,                            /* id2 */
-		0,                            /* size */
-        0,                            /* addr_len */
-        0                             /* speed */
-	}
+  {
+    "FM25H20",                    /* name */
+    0xff,                         /* id1 */
+    0xff,                         /* id2 */
+    256L*1024L,                   /* size */
+    3,                            /* addr_len */
+    40000000                      /* speed */
+  },
+  {
+    NULL,                         /* name */
+    0,                            /* id1 */
+    0,                            /* id2 */
+    0,                            /* size */
+    0,                            /* addr_len */
+    0                             /* speed */
+  }
 #endif
 };
 
@@ -240,17 +242,17 @@ static inline int ramtron_readid(struct ramtron_dev_s *priv);
 static void ramtron_waitwritecomplete(struct ramtron_dev_s *priv);
 static void ramtron_writeenable(struct ramtron_dev_s *priv);
 static inline void ramtron_pagewrite(struct ramtron_dev_s *priv, FAR const uint8_t *buffer,
-                                  off_t offset);
+                                     off_t offset);
 
 /* MTD driver methods */
 
 static int ramtron_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblocks);
 static ssize_t ramtron_bread(FAR struct mtd_dev_s *dev, off_t startblock,
-                          size_t nblocks, FAR uint8_t *buf);
+                             size_t nblocks, FAR uint8_t *buf);
 static ssize_t ramtron_bwrite(FAR struct mtd_dev_s *dev, off_t startblock,
-                           size_t nblocks, FAR const uint8_t *buf);
+                              size_t nblocks, FAR const uint8_t *buf);
 static ssize_t ramtron_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes,
-                         FAR uint8_t *buffer);
+                            FAR uint8_t *buffer);
 static int ramtron_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg);
 
 /************************************************************************************
@@ -317,31 +319,37 @@ static inline int ramtron_readid(struct ramtron_dev_s *priv)
   /* Send the "Read ID (RDID)" command and read the first three ID bytes */
 
   (void)SPI_SEND(priv->dev, RAMTRON_RDID);
-  for (i=0; i<6; i++) manufacturer = SPI_SEND(priv->dev, RAMTRON_DUMMY);
-  memory       = SPI_SEND(priv->dev, RAMTRON_DUMMY);
-  capacity     = SPI_SEND(priv->dev, RAMTRON_DUMMY);	// fram.id1
-  part         = SPI_SEND(priv->dev, RAMTRON_DUMMY);	// fram.id2
+  for (i = 0; i < 6; i++)
+    {
+      manufacturer = SPI_SEND(priv->dev, RAMTRON_DUMMY);
+    }
+
+  memory           = SPI_SEND(priv->dev, RAMTRON_DUMMY);
+  capacity         = SPI_SEND(priv->dev, RAMTRON_DUMMY);  // fram.id1
+  part             = SPI_SEND(priv->dev, RAMTRON_DUMMY);  // fram.id2
 
   /* Deselect the FLASH and unlock the bus */
 
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
   ramtron_unlock(priv->dev);
   
-  // Select part from the part list
+  /* Select part from the part list */
+ 
   for (priv->part = ramtron_parts;
-	   priv->part->name != NULL && !(priv->part->id1 == capacity && priv->part->id2 == part);
-	   priv->part++);
-	   
-  if (priv->part->name) {
-    fvdbg("RAMTRON %s of size %d bytes (mf:%02x mem:%02x cap:%02x part:%02x)\n",
-           priv->part->name, priv->part->size, manufacturer, memory, capacity, part);
+     priv->part->name != NULL && !(priv->part->id1 == capacity && priv->part->id2 == part);
+     priv->part++);
+     
+  if (priv->part->name)
+    {
+      fvdbg("RAMTRON %s of size %d bytes (mf:%02x mem:%02x cap:%02x part:%02x)\n",
+            priv->part->name, priv->part->size, manufacturer, memory, capacity, part);
 
-    priv->sectorshift = RAMTRON_EMULATE_SECTOR_SHIFT;
-    priv->nsectors    = priv->part->size / (1 << RAMTRON_EMULATE_SECTOR_SHIFT);
-    priv->pageshift   = RAMTRON_EMULATE_PAGE_SHIFT;
-    priv->npages      = priv->part->size / (1 << RAMTRON_EMULATE_PAGE_SHIFT);
-    return OK;
-  }
+      priv->sectorshift = RAMTRON_EMULATE_SECTOR_SHIFT;
+      priv->nsectors    = priv->part->size / (1 << RAMTRON_EMULATE_SECTOR_SHIFT);
+      priv->pageshift   = RAMTRON_EMULATE_PAGE_SHIFT;
+      priv->npages      = priv->part->size / (1 << RAMTRON_EMULATE_PAGE_SHIFT);
+      return OK;
+    }
  
   fvdbg("RAMTRON device not found\n");
   return -ENODEV;
@@ -408,8 +416,10 @@ static inline void ramtron_sendaddr(const struct ramtron_dev_s *priv, uint32_t a
   DEBUGASSERT(priv->part->addr_len == 3 || priv->part->addr_len == 2);
   
   if (priv->part->addr_len == 3)
-	(void)SPI_SEND(priv->dev, (addr >> 16) & 0xff);
-	
+    {
+      (void)SPI_SEND(priv->dev, (addr >> 16) & 0xff);
+    }
+
   (void)SPI_SEND(priv->dev, (addr >> 8) & 0xff);
   (void)SPI_SEND(priv->dev, addr & 0xff);
 }
@@ -419,7 +429,7 @@ static inline void ramtron_sendaddr(const struct ramtron_dev_s *priv, uint32_t a
  ************************************************************************************/
 
 static inline void ramtron_pagewrite(struct ramtron_dev_s *priv, FAR const uint8_t *buffer,
-                                  off_t page)
+                                     off_t page)
 {
   off_t offset = page << priv->pageshift;
 
@@ -475,7 +485,7 @@ static int ramtron_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nbl
  ************************************************************************************/
 
 static ssize_t ramtron_bread(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblocks,
-                          FAR uint8_t *buffer)
+                             FAR uint8_t *buffer)
 {
   FAR struct ramtron_dev_s *priv = (FAR struct ramtron_dev_s *)dev;
   ssize_t nbytes;
@@ -489,6 +499,7 @@ static ssize_t ramtron_bread(FAR struct mtd_dev_s *dev, off_t startblock, size_t
     {
         return nbytes >> priv->pageshift;
     }
+
   return (int)nbytes;
 }
 
@@ -497,7 +508,7 @@ static ssize_t ramtron_bread(FAR struct mtd_dev_s *dev, off_t startblock, size_t
  ************************************************************************************/
 
 static ssize_t ramtron_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblocks,
-                           FAR const uint8_t *buffer)
+                              FAR const uint8_t *buffer)
 {
   FAR struct ramtron_dev_s *priv = (FAR struct ramtron_dev_s *)dev;
   size_t blocksleft = nblocks;
@@ -512,8 +523,8 @@ static ssize_t ramtron_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_
       ramtron_pagewrite(priv, buffer, startblock);
       startblock++;
    }
-  ramtron_unlock(priv->dev);
 
+  ramtron_unlock(priv->dev);
   return nblocks;
 }
 
@@ -522,7 +533,7 @@ static ssize_t ramtron_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_
  ************************************************************************************/
 
 static ssize_t ramtron_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes,
-                         FAR uint8_t *buffer)
+                            FAR uint8_t *buffer)
 {
   FAR struct ramtron_dev_s *priv = (FAR struct ramtron_dev_s *)dev;
 
@@ -662,6 +673,7 @@ FAR struct mtd_dev_s *ramtron_initialize(FAR struct spi_dev_s *dev)
       if (ramtron_readid(priv) != OK)
         {
           /* Unrecognized! Discard all of that work we just did and return NULL */
+
           kfree(priv);
           priv = NULL;
         }

From 79e092e3627aeaaa351fbbc2c19f3b0311dc4001 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sat, 6 Oct 2012 17:29:36 +0000
Subject: [PATCH 21/43] Update all config README.txt files to show that they
 use the EABI buildroot toolchain

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5218 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/configs/ea3131/README.txt             | 182 +++++-----
 nuttx/configs/ea3152/README.txt             | 188 +++++-----
 nuttx/configs/eagle100/README.txt           | 232 +++++++-----
 nuttx/configs/ekk-lm3s9b96/README.txt       |  61 +++-
 nuttx/configs/fire-stm32v2/README.txt       |  62 +++-
 nuttx/configs/hymini-stm32v/README.txt      | 382 +++++++++++---------
 nuttx/configs/kwikstik-k40/README.txt       | 195 ++++++----
 nuttx/configs/lincoln60/README.txt          | 320 +++++++++-------
 nuttx/configs/lm3s6432-s2e/README.txt       | 249 ++++++++-----
 nuttx/configs/lm3s6965-ek/README.txt        | 232 +++++++-----
 nuttx/configs/lm3s8962-ek/README.txt        | 232 +++++++-----
 nuttx/configs/lpc4330-xplorer/README.txt    |  62 +++-
 nuttx/configs/lpcxpresso-lpc1768/README.txt |  29 +-
 nuttx/configs/mbed/README.txt               | 320 +++++++++-------
 nuttx/configs/mcu123-lpc214x/README.txt     |   2 +-
 nuttx/configs/nucleus2g/README.txt          | 320 +++++++++-------
 nuttx/configs/olimex-lpc1766stk/README.txt  | 324 ++++++++++-------
 nuttx/configs/sam3u-ek/README.txt           | 250 ++++++++-----
 nuttx/configs/stm3210e-eval/README.txt      |  62 +++-
 nuttx/configs/stm3220g-eval/README.txt      |  62 +++-
 nuttx/configs/stm3240g-eval/README.txt      |  62 +++-
 nuttx/configs/stm32f4discovery/README.txt   |  62 +++-
 nuttx/configs/twr-k60n512/README.txt        | 219 ++++++-----
 nuttx/configs/vsn/README.txt                | 151 +++++---
 24 files changed, 2648 insertions(+), 1612 deletions(-)

diff --git a/nuttx/configs/ea3131/README.txt b/nuttx/configs/ea3131/README.txt
index a99011ec5b..4d01a4162a 100644
--- a/nuttx/configs/ea3131/README.txt
+++ b/nuttx/configs/ea3131/README.txt
@@ -46,7 +46,7 @@ GNU Toolchain Options
     CONFIG_LPC31_CODESOURCERYW=y  : CodeSourcery under Windows
     CONFIG_LPC31_CODESOURCERYL=y  : CodeSourcery under Linux
     CONFIG_LPC31_DEVKITARM=y      : devkitARM under Windows
-    CONFIG_LPC31_BUILDROOT=y	    : NuttX buildroot under Linux or Cygwin (default)
+    CONFIG_LPC31_BUILDROOT=y      : NuttX buildroot under Linux or Cygwin (default)
 
   If you are not using CONFIG_LPC31_BUILDROOT, then you may also have to modify
   the PATH in the setenv.h file if your make cannot find the tools.
@@ -196,12 +196,12 @@ Image Format
   Then, to build the NuttX binary ready to load with the bootloader, just
   following these steps:
 
-  - cd tools/				# Configure Nuttx
-  - ./configure.sh ea3131/ostest	# (using the ostest configuration for this example)
-  - cd ..				# Set up environment
-  - . ./setenv.sh			# (see notes below)
-  - make				# Make NuttX.  This will produce nuttx.bin
-  - mklpc.sh				# Make the bootloader binary (nuttx.lpc)
+  - cd tools/                     # Configure Nuttx
+  - ./configure.sh ea3131/ostest  # (using the ostest configuration for this example)
+  - cd ..                         # Set up environment
+  - . ./setenv.sh                 # (see notes below)
+  - make                          # Make NuttX.  This will produce nuttx.bin
+  - mklpc.sh                      # Make the bootloader binary (nuttx.lpc)
 
   NOTES:
   
@@ -469,121 +469,121 @@ On-Demand Paging
 ARM/EA3131-specific Configuration Options
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-	CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
-	   be set to:
+    CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
+       be set to:
 
-	   CONFIG_ARCH=arm
+       CONFIG_ARCH=arm
 
-	CONFIG_ARCH_family - For use in C code:
+    CONFIG_ARCH_family - For use in C code:
 
-	   CONFIG_ARCH_ARM=y
+       CONFIG_ARCH_ARM=y
 
-	CONFIG_ARCH_architecture - For use in C code:
+    CONFIG_ARCH_architecture - For use in C code:
 
-	   CONFIG_ARCH_ARM926EJS=y
+       CONFIG_ARCH_ARM926EJS=y
 
-	CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
+    CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
-	   CONFIG_ARCH_CHIP=lpc313x
+       CONFIG_ARCH_CHIP=lpc313x
 
-	CONFIG_ARCH_CHIP_name - For use in C code
+    CONFIG_ARCH_CHIP_name - For use in C code
 
-	   CONFIG_ARCH_CHIP_LPC3131
+       CONFIG_ARCH_CHIP_LPC3131
 
-	CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
-	   hence, the board that supports the particular chip or SoC.
+    CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
+       hence, the board that supports the particular chip or SoC.
 
-	   CONFIG_ARCH_BOARD=ea3131
+       CONFIG_ARCH_BOARD=ea3131
 
-	CONFIG_ARCH_BOARD_name - For use in C code
+    CONFIG_ARCH_BOARD_name - For use in C code
 
-	   CONFIG_ARCH_BOARD_EA3131
+       CONFIG_ARCH_BOARD_EA3131
 
-	CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
-	   of delay loops
+    CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
+       of delay loops
 
-	CONFIG_ENDIAN_BIG - define if big endian (default is little
-	   endian)
+    CONFIG_ENDIAN_BIG - define if big endian (default is little
+       endian)
 
-	CONFIG_DRAM_SIZE - For most ARM9 architectures, this describes the
-	  size of installed DRAM.  For the LPC313X, it is used only to
-	  deterimine how to map the executable regions.  It is SDRAM size
-	  only if you are executing out of the external SDRAM; or it could
-	  be NOR FLASH size, external SRAM size, or internal SRAM size.
+    CONFIG_DRAM_SIZE - For most ARM9 architectures, this describes the
+      size of installed DRAM.  For the LPC313X, it is used only to
+      deterimine how to map the executable regions.  It is SDRAM size
+      only if you are executing out of the external SDRAM; or it could
+      be NOR FLASH size, external SRAM size, or internal SRAM size.
 
-	CONFIG_DRAM_START - The start address of installed DRAM (physical)
+    CONFIG_DRAM_START - The start address of installed DRAM (physical)
 
-	CONFIG_DRAM_VSTART - The startaddress of DRAM (virtual)
+    CONFIG_DRAM_VSTART - The startaddress of DRAM (virtual)
 
-	CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
-	   have LEDs
+    CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
+       have LEDs
 
-	CONFIG_ARCH_IRQPRIO - The LPC313x supports interrupt prioritization
+    CONFIG_ARCH_IRQPRIO - The LPC313x supports interrupt prioritization
 
-	CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
-	   stack. If defined, this symbol is the size of the interrupt
-	   stack in bytes.  If not defined, the user task stacks will be
-	  used during interrupt handling.
+    CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
+       stack. If defined, this symbol is the size of the interrupt
+       stack in bytes.  If not defined, the user task stacks will be
+      used during interrupt handling.
 
-	CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
+    CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 
-	CONFIG_ARCH_BOOTLOADER - Set if you are using a bootloader.
+    CONFIG_ARCH_BOOTLOADER - Set if you are using a bootloader.
 
-	CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
+    CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
 
-	CONFIG_ARCH_BUTTONS -  Enable support for buttons. Unique to board architecture.
+    CONFIG_ARCH_BUTTONS -  Enable support for buttons. Unique to board architecture.
 
-	CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
-	   cause a 100 second delay during boot-up.  This 100 second delay
-	   serves no purpose other than it allows you to calibratre
-	   CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
-	   the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
-	   the delay actually is 100 seconds.
-	CONFIG_ARCH_DMA - Support DMA initialization
-	CONFIG_ARCH_LOWVECTORS - define if vectors reside at address 0x0000:00000
-	  Undefine if vectors reside at address 0xffff:0000
-	CONFIG_ARCH_ROMPGTABLE - A pre-initialized, read-only page table is available.
-	  If defined, then board-specific logic must also define PGTABLE_BASE_PADDR,
-	  PGTABLE_BASE_VADDR, and all memory section mapping in a file named
-	  board_memorymap.h.
+    CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
+       cause a 100 second delay during boot-up.  This 100 second delay
+       serves no purpose other than it allows you to calibratre
+       CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
+       the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
+       the delay actually is 100 seconds.
+    CONFIG_ARCH_DMA - Support DMA initialization
+    CONFIG_ARCH_LOWVECTORS - define if vectors reside at address 0x0000:00000
+      Undefine if vectors reside at address 0xffff:0000
+    CONFIG_ARCH_ROMPGTABLE - A pre-initialized, read-only page table is available.
+      If defined, then board-specific logic must also define PGTABLE_BASE_PADDR,
+      PGTABLE_BASE_VADDR, and all memory section mapping in a file named
+      board_memorymap.h.
 
   Individual subsystems can be enabled:
 
-	CONFIG_LPC31_MCI, CONFIG_LPC31_SPI, CONFIG_LPC31_UART
+    CONFIG_LPC31_MCI, CONFIG_LPC31_SPI, CONFIG_LPC31_UART
 
   External memory available on the board (see also CONFIG_MM_REGIONS)
 
-	CONFIG_LPC31_EXTSRAM0 - Select if external SRAM0 is present
-	CONFIG_LPC31_EXTSRAM0HEAP - Select if external SRAM0 should be
-	  configured as part of the NuttX heap.
-	CONFIG_LPC31_EXTSRAM0SIZE - Size (in bytes) of the installed
-	  external SRAM0 memory
-	CONFIG_LPC31_EXTSRAM1 - Select if external SRAM1 is present
-	CONFIG_LPC31_EXTSRAM1HEAP - Select if external SRAM1 should be
-	  configured as part of the NuttX heap.
-	CONFIG_LPC31_EXTSRAM1SIZE - Size (in bytes) of the installed
-	  external SRAM1 memory
-	CONFIG_LPC31_EXTSDRAM - Select if external SDRAM is present
-	CONFIG_LPC31_EXTSDRAMHEAP - Select if external SDRAM should be
-	  configured as part of the NuttX heap.
-	CONFIG_LPC31_EXTSDRAMSIZE - Size (in bytes) of the installed
-	  external SDRAM memory
-	CONFIG_LPC31_EXTNAND - Select if external NAND is present
-	CONFIG_LPC31_EXTSDRAMSIZE - Size (in bytes) of the installed
-	  external NAND memory
+    CONFIG_LPC31_EXTSRAM0 - Select if external SRAM0 is present
+    CONFIG_LPC31_EXTSRAM0HEAP - Select if external SRAM0 should be
+      configured as part of the NuttX heap.
+    CONFIG_LPC31_EXTSRAM0SIZE - Size (in bytes) of the installed
+      external SRAM0 memory
+    CONFIG_LPC31_EXTSRAM1 - Select if external SRAM1 is present
+    CONFIG_LPC31_EXTSRAM1HEAP - Select if external SRAM1 should be
+      configured as part of the NuttX heap.
+    CONFIG_LPC31_EXTSRAM1SIZE - Size (in bytes) of the installed
+      external SRAM1 memory
+    CONFIG_LPC31_EXTSDRAM - Select if external SDRAM is present
+    CONFIG_LPC31_EXTSDRAMHEAP - Select if external SDRAM should be
+      configured as part of the NuttX heap.
+    CONFIG_LPC31_EXTSDRAMSIZE - Size (in bytes) of the installed
+      external SDRAM memory
+    CONFIG_LPC31_EXTNAND - Select if external NAND is present
+    CONFIG_LPC31_EXTSDRAMSIZE - Size (in bytes) of the installed
+      external NAND memory
 
   LPC313X specific device driver settings
 
-	CONFIG_UART_SERIAL_CONSOLE - selects the UART for the
-	  console and ttys0
-	CONFIG_UART_RXBUFSIZE - Characters are buffered as received.
-	  This specific the size of the receive buffer
-	CONFIG_UART_TXBUFSIZE - Characters are buffered before
-	  being sent.  This specific the size of the transmit buffer
-	CONFIG_UART_BAUD - The configure BAUD of the UART.  Must be
-	CONFIG_UART_BITS - The number of bits.  Must be either 7 or 8.
-	CONFIG_UART_PARTIY - 0=no parity, 1=odd parity, 2=even parity
-	CONFIG_UART_2STOP - Two stop bits
+    CONFIG_UART_SERIAL_CONSOLE - selects the UART for the
+      console and ttys0
+    CONFIG_UART_RXBUFSIZE - Characters are buffered as received.
+      This specific the size of the receive buffer
+    CONFIG_UART_TXBUFSIZE - Characters are buffered before
+      being sent.  This specific the size of the transmit buffer
+    CONFIG_UART_BAUD - The configure BAUD of the UART.  Must be
+    CONFIG_UART_BITS - The number of bits.  Must be either 7 or 8.
+    CONFIG_UART_PARTIY - 0=no parity, 1=odd parity, 2=even parity
+    CONFIG_UART_2STOP - Two stop bits
 
 Configurations
 ^^^^^^^^^^^^^^
@@ -591,10 +591,10 @@ Configurations
 Each EA3131 configuration is maintained in a sudirectory and can be
 selected as follow:
 
-	cd tools
-	./configure.sh ea3131/<subdir>
-	cd -
-	. ./setenv.sh
+    cd tools
+    ./configure.sh ea3131/<subdir>
+    cd -
+    . ./setenv.sh
 
 Where <subdir> is one of the following:
 
diff --git a/nuttx/configs/ea3152/README.txt b/nuttx/configs/ea3152/README.txt
index 5b6eb17a93..5b513a620c 100644
--- a/nuttx/configs/ea3152/README.txt
+++ b/nuttx/configs/ea3152/README.txt
@@ -45,7 +45,7 @@ GNU Toolchain Options
     CONFIG_LPC31_CODESOURCERYW=y  : CodeSourcery under Windows
     CONFIG_LPC31_CODESOURCERYL=y  : CodeSourcery under Linux
     CONFIG_LPC31_DEVKITARM=y      : devkitARM under Windows
-    CONFIG_LPC31_BUILDROOT=y	    : NuttX buildroot under Linux or Cygwin (default)
+    CONFIG_LPC31_BUILDROOT=y      : NuttX buildroot under Linux or Cygwin (default)
 
   If you are not using CONFIG_LPC31_BUILDROOT, then you may also have to modify
   the PATH in the setenv.h file if your make cannot find the tools.
@@ -165,7 +165,7 @@ NuttX buildroot Toolchain
 
 Boot Sequence
 ^^^^^^^^^^^^^
-  LPC313x has on chip bootrom which loads properly formatted images from multiple
+  LPC315x has on chip bootrom which loads properly formatted images from multiple
   sources into SRAM.  These sources include including SPI Flash, NOR Flash, UART,
   USB, SD Card, and NAND Flash.
 
@@ -195,12 +195,12 @@ Image Format
   Then, to build the NuttX binary ready to load with the bootloader, just
   following these steps:
 
-  - cd tools/				# Configure Nuttx
-  - ./configure.sh ea3152/ostest	# (using the ostest configuration for this example)
-  - cd ..				# Set up environment
-  - . ./setenv.sh			# (see notes below)
-  - make				# Make NuttX.  This will produce nuttx.bin
-  - mklpc.sh				# Make the bootloader binary (nuttx.lpc)
+  - cd tools/                     # Configure Nuttx
+  - ./configure.sh ea3152/ostest  # (using the ostest configuration for this example)
+  - cd ..                         # Set up environment
+  - . ./setenv.sh                 # (see notes below)
+  - make                          # Make NuttX.  This will produce nuttx.bin
+  - mklpc.sh                      # Make the bootloader binary (nuttx.lpc)
 
   NOTES:
   
@@ -238,7 +238,7 @@ are the steps that I use for loading new code into the EA3152:
 
 That will load the NuttX binary into ISRAM and attempt to execute it.
 
-*See the LPC313x documentation if you do not have the FTDI driver installed.
+*See the LPC315x documentation if you do not have the FTDI driver installed.
 
 Using OpenOCD and GDB
 ^^^^^^^^^^^^^^^^^^^^^
@@ -275,121 +275,121 @@ Using OpenOCD and GDB
 ARM/EA3152-specific Configuration Options
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-	CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
-	   be set to:
+    CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
+       be set to:
 
-	   CONFIG_ARCH=arm
+       CONFIG_ARCH=arm
 
-	CONFIG_ARCH_family - For use in C code:
+    CONFIG_ARCH_family - For use in C code:
 
-	   CONFIG_ARCH_ARM=y
+       CONFIG_ARCH_ARM=y
 
-	CONFIG_ARCH_architecture - For use in C code:
+    CONFIG_ARCH_architecture - For use in C code:
 
-	   CONFIG_ARCH_ARM926EJS=y
+       CONFIG_ARCH_ARM926EJS=y
 
-	CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
+    CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
-	   CONFIG_ARCH_CHIP=lpc313x
+       CONFIG_ARCH_CHIP=lpc31xx
 
-	CONFIG_ARCH_CHIP_name - For use in C code
+    CONFIG_ARCH_CHIP_name - For use in C code
 
-	   CONFIG_ARCH_CHIP_LPC3152
+       CONFIG_ARCH_CHIP_LPC3152
 
-	CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
-	   hence, the board that supports the particular chip or SoC.
+    CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
+       hence, the board that supports the particular chip or SoC.
 
-	   CONFIG_ARCH_BOARD=ea3152
+       CONFIG_ARCH_BOARD=ea3152
 
-	CONFIG_ARCH_BOARD_name - For use in C code
+    CONFIG_ARCH_BOARD_name - For use in C code
 
-	   CONFIG_ARCH_BOARD_EA3152
+       CONFIG_ARCH_BOARD_EA3152
 
-	CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
-	   of delay loops
+    CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
+       of delay loops
 
-	CONFIG_ENDIAN_BIG - define if big endian (default is little
-	   endian)
+    CONFIG_ENDIAN_BIG - define if big endian (default is little
+       endian)
 
-	CONFIG_DRAM_SIZE - For most ARM9 architectures, this describes the
-	  size of installed DRAM.  For the LPC313X, it is used only to
-	  deterimine how to map the executable regions.  It is SDRAM size
-	  only if you are executing out of the external SDRAM; or it could
-	  be NOR FLASH size, external SRAM size, or internal SRAM size.
+    CONFIG_DRAM_SIZE - For most ARM9 architectures, this describes the
+      size of installed DRAM.  For the LPC315X, it is used only to
+      deterimine how to map the executable regions.  It is SDRAM size
+      only if you are executing out of the external SDRAM; or it could
+      be NOR FLASH size, external SRAM size, or internal SRAM size.
 
-	CONFIG_DRAM_START - The start address of installed DRAM (physical)
+    CONFIG_DRAM_START - The start address of installed DRAM (physical)
 
-	CONFIG_DRAM_VSTART - The startaddress of DRAM (virtual)
+    CONFIG_DRAM_VSTART - The startaddress of DRAM (virtual)
 
-	CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
-	   have LEDs
+    CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
+       have LEDs
 
-	CONFIG_ARCH_IRQPRIO - The LPC313x supports interrupt prioritization
+    CONFIG_ARCH_IRQPRIO - The LPC315x supports interrupt prioritization
 
-	CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
-	   stack. If defined, this symbol is the size of the interrupt
-	   stack in bytes.  If not defined, the user task stacks will be
-	  used during interrupt handling.
+    CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
+       stack. If defined, this symbol is the size of the interrupt
+       stack in bytes.  If not defined, the user task stacks will be
+      used during interrupt handling.
 
-	CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
+    CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 
-	CONFIG_ARCH_BOOTLOADER - Set if you are using a bootloader.
+    CONFIG_ARCH_BOOTLOADER - Set if you are using a bootloader.
 
-	CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
+    CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
 
-	CONFIG_ARCH_BUTTONS -  Enable support for buttons. Unique to board architecture.
+    CONFIG_ARCH_BUTTONS -  Enable support for buttons. Unique to board architecture.
 
-	CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
-	   cause a 100 second delay during boot-up.  This 100 second delay
-	   serves no purpose other than it allows you to calibratre
-	   CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
-	   the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
-	   the delay actually is 100 seconds.
-	CONFIG_ARCH_DMA - Support DMA initialization
-	CONFIG_ARCH_LOWVECTORS - define if vectors reside at address 0x0000:00000
-	  Undefine if vectors reside at address 0xffff:0000
-	CONFIG_ARCH_ROMPGTABLE - A pre-initialized, read-only page table is available.
-	  If defined, then board-specific logic must also define PGTABLE_BASE_PADDR,
-	  PGTABLE_BASE_VADDR, and all memory section mapping in a file named
-	  board_memorymap.h.
+    CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
+       cause a 100 second delay during boot-up.  This 100 second delay
+       serves no purpose other than it allows you to calibratre
+       CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
+       the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
+       the delay actually is 100 seconds.
+    CONFIG_ARCH_DMA - Support DMA initialization
+    CONFIG_ARCH_LOWVECTORS - define if vectors reside at address 0x0000:00000
+      Undefine if vectors reside at address 0xffff:0000
+    CONFIG_ARCH_ROMPGTABLE - A pre-initialized, read-only page table is available.
+      If defined, then board-specific logic must also define PGTABLE_BASE_PADDR,
+      PGTABLE_BASE_VADDR, and all memory section mapping in a file named
+      board_memorymap.h.
 
   Individual subsystems can be enabled:
 
-	CONFIG_LPC31_MCI, CONFIG_LPC31_SPI, CONFIG_LPC31_UART
+    CONFIG_LPC31_MCI, CONFIG_LPC31_SPI, CONFIG_LPC31_UART
 
   External memory available on the board (see also CONFIG_MM_REGIONS)
 
-	CONFIG_LPC31_EXTSRAM0 - Select if external SRAM0 is present
-	CONFIG_LPC31_EXTSRAM0HEAP - Select if external SRAM0 should be
-	  configured as part of the NuttX heap.
-	CONFIG_LPC31_EXTSRAM0SIZE - Size (in bytes) of the installed
-	  external SRAM0 memory
-	CONFIG_LPC31_EXTSRAM1 - Select if external SRAM1 is present
-	CONFIG_LPC31_EXTSRAM1HEAP - Select if external SRAM1 should be
-	  configured as part of the NuttX heap.
-	CONFIG_LPC31_EXTSRAM1SIZE - Size (in bytes) of the installed
-	  external SRAM1 memory
-	CONFIG_LPC31_EXTSDRAM - Select if external SDRAM is present
-	CONFIG_LPC31_EXTSDRAMHEAP - Select if external SDRAM should be
-	  configured as part of the NuttX heap.
-	CONFIG_LPC31_EXTSDRAMSIZE - Size (in bytes) of the installed
-	  external SDRAM memory
-	CONFIG_LPC31_EXTNAND - Select if external NAND is present
-	CONFIG_LPC31_EXTSDRAMSIZE - Size (in bytes) of the installed
-	  external NAND memory
+    CONFIG_LPC31_EXTSRAM0 - Select if external SRAM0 is present
+    CONFIG_LPC31_EXTSRAM0HEAP - Select if external SRAM0 should be
+      configured as part of the NuttX heap.
+    CONFIG_LPC31_EXTSRAM0SIZE - Size (in bytes) of the installed
+      external SRAM0 memory
+    CONFIG_LPC31_EXTSRAM1 - Select if external SRAM1 is present
+    CONFIG_LPC31_EXTSRAM1HEAP - Select if external SRAM1 should be
+      configured as part of the NuttX heap.
+    CONFIG_LPC31_EXTSRAM1SIZE - Size (in bytes) of the installed
+      external SRAM1 memory
+    CONFIG_LPC31_EXTSDRAM - Select if external SDRAM is present
+    CONFIG_LPC31_EXTSDRAMHEAP - Select if external SDRAM should be
+      configured as part of the NuttX heap.
+    CONFIG_LPC31_EXTSDRAMSIZE - Size (in bytes) of the installed
+      external SDRAM memory
+    CONFIG_LPC31_EXTNAND - Select if external NAND is present
+    CONFIG_LPC31_EXTSDRAMSIZE - Size (in bytes) of the installed
+      external NAND memory
 
-  LPC313X specific device driver settings
+  LPC315X specific device driver settings
 
-	CONFIG_UART_SERIAL_CONSOLE - selects the UART for the
-	  console and ttys0
-	CONFIG_UART_RXBUFSIZE - Characters are buffered as received.
-	  This specific the size of the receive buffer
-	CONFIG_UART_TXBUFSIZE - Characters are buffered before
-	  being sent.  This specific the size of the transmit buffer
-	CONFIG_UART_BAUD - The configure BAUD of the UART.  Must be
-	CONFIG_UART_BITS - The number of bits.  Must be either 7 or 8.
-	CONFIG_UART_PARTIY - 0=no parity, 1=odd parity, 2=even parity
-	CONFIG_UART_2STOP - Two stop bits
+    CONFIG_UART_SERIAL_CONSOLE - selects the UART for the
+      console and ttys0
+    CONFIG_UART_RXBUFSIZE - Characters are buffered as received.
+      This specific the size of the receive buffer
+    CONFIG_UART_TXBUFSIZE - Characters are buffered before
+      being sent.  This specific the size of the transmit buffer
+    CONFIG_UART_BAUD - The configure BAUD of the UART.  Must be
+    CONFIG_UART_BITS - The number of bits.  Must be either 7 or 8.
+    CONFIG_UART_PARTIY - 0=no parity, 1=odd parity, 2=even parity
+    CONFIG_UART_2STOP - Two stop bits
 
 Configurations
 ^^^^^^^^^^^^^^
@@ -397,10 +397,10 @@ Configurations
 Each EA3152 configuration is maintained in a sudirectory and can be
 selected as follow:
 
-	cd tools
-	./configure.sh ea3152/<subdir>
-	cd -
-	. ./setenv.sh
+    cd tools
+    ./configure.sh ea3152/<subdir>
+    cd -
+    . ./setenv.sh
 
 Where <subdir> is one of the following:
 
diff --git a/nuttx/configs/eagle100/README.txt b/nuttx/configs/eagle100/README.txt
index 47c4f89df0..105bd5ff18 100644
--- a/nuttx/configs/eagle100/README.txt
+++ b/nuttx/configs/eagle100/README.txt
@@ -110,8 +110,8 @@ CodeSourcery on Linux
   For an example of a CodeSourcery-under-Linux Make.defs file, see
   configs/stm3210e-eval/nsh/Make.defs.
 
-NuttX buildroot Toolchain
-^^^^^^^^^^^^^^^^^^^^^^^^^
+NuttX EABI "buildroot" Toolchain
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
   A GNU GCC-based toolchain is assumed.  The files */setenv.sh should
   be modified to point to the correct path to the Cortex-M3 GCC toolchain (if
@@ -134,7 +134,7 @@ NuttX buildroot Toolchain
 
   4. cd <some-dir>/buildroot
 
-  5. cp configs/cortexm3-defconfig-4.3.3 .config
+  5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config
 
   6. make oldconfig
 
@@ -144,9 +144,59 @@ NuttX buildroot Toolchain
      the path to the newly built binaries.
 
   See the file configs/README.txt in the buildroot source tree.  That has more
-  detailed PLUS some special instructions that you will need to follow if you are
+  details PLUS some special instructions that you will need to follow if you are
   building a Cortex-M3 toolchain for Cygwin under Windows.
 
+NuttX OABI "buildroot" Toolchain
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+  The older, OABI buildroot toolchain is also available.  To use the OABI
+  toolchain:
+
+  1. When building the buildroot toolchain, either (1) modify the cortexm3-eabi-defconfig-4.6.3
+     configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
+     configuration such as cortexm3-defconfig-4.3.3
+
+  2. Modify the Make.defs file to use the OABI converntions:
+
+    +CROSSDEV = arm-nuttx-elf-
+    +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    -CROSSDEV = arm-nuttx-eabi-
+    -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+
+NXFLAT Toolchain
+^^^^^^^^^^^^^^^^
+
+  If you are *not* using the NuttX buildroot toolchain and you want to use
+  the NXFLAT tools, then you will still have to build a portion of the buildroot
+  tools -- just the NXFLAT tools.  The buildroot with the NXFLAT tools can
+  be downloaded from the NuttX SourceForge download site
+  (https://sourceforge.net/projects/nuttx/files/).
+ 
+  This GNU toolchain builds and executes in the Linux or Cygwin environment.
+
+  1. You must have already configured Nuttx in <some-dir>/nuttx.
+
+     cd tools
+     ./configure.sh lpcxpresso-lpc1768/<sub-dir>
+
+  2. Download the latest buildroot package into <some-dir>
+
+  3. unpack the buildroot tarball.  The resulting directory may
+     have versioning information on it like buildroot-x.y.z.  If so,
+     rename <some-dir>/buildroot-x.y.z to <some-dir>/buildroot.
+
+  4. cd <some-dir>/buildroot
+
+  5. cp configs/cortexm3-defconfig-nxflat .config
+
+  6. make oldconfig
+
+  7. make
+
+  8. Edit setenv.h, if necessary, so that the PATH variable includes
+     the path to the newly builtNXFLAT binaries.
+
 Ethernet-Bootloader
 ^^^^^^^^^^^^^^^^^^^
 
@@ -207,127 +257,127 @@ Ethernet-Bootloader
 Eagle100-specific Configuration Options
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-	CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
-	   be set to:
+    CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
+       be set to:
 
-	   CONFIG_ARCH=arm
+       CONFIG_ARCH=arm
 
-	CONFIG_ARCH_family - For use in C code:
+    CONFIG_ARCH_family - For use in C code:
 
-	   CONFIG_ARCH_ARM=y
+       CONFIG_ARCH_ARM=y
 
-	CONFIG_ARCH_architecture - For use in C code:
+    CONFIG_ARCH_architecture - For use in C code:
 
-	   CONFIG_ARCH_CORTEXM3=y
+       CONFIG_ARCH_CORTEXM3=y
 
-	CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
+    CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
-	   CONFIG_ARCH_CHIP=lm3s
+       CONFIG_ARCH_CHIP=lm3s
 
-	CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
-	   chip:
+    CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
+       chip:
 
-	   CONFIG_ARCH_CHIP_LM3S6918
+       CONFIG_ARCH_CHIP_LM3S6918
 
-	CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
-	   hence, the board that supports the particular chip or SoC.
+    CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
+       hence, the board that supports the particular chip or SoC.
 
-	   CONFIG_ARCH_BOARD=eagle100 (for the MicroMint Eagle-100 development board)
+       CONFIG_ARCH_BOARD=eagle100 (for the MicroMint Eagle-100 development board)
 
-	CONFIG_ARCH_BOARD_name - For use in C code
+    CONFIG_ARCH_BOARD_name - For use in C code
 
-	   CONFIG_ARCH_BOARD_EAGLE100
+       CONFIG_ARCH_BOARD_EAGLE100
 
-	CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
-	   of delay loops
+    CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
+       of delay loops
 
-	CONFIG_ENDIAN_BIG - define if big endian (default is little
-	   endian)
+    CONFIG_ENDIAN_BIG - define if big endian (default is little
+       endian)
 
-	CONFIG_DRAM_SIZE - Describes the installed DRAM (SRAM in this case):
+    CONFIG_DRAM_SIZE - Describes the installed DRAM (SRAM in this case):
 
-	   CONFIG_DRAM_SIZE=0x00010000 (64Kb)
+       CONFIG_DRAM_SIZE=0x00010000 (64Kb)
 
-	CONFIG_DRAM_START - The start address of installed DRAM
+    CONFIG_DRAM_START - The start address of installed DRAM
 
-	   CONFIG_DRAM_START=0x20000000
+       CONFIG_DRAM_START=0x20000000
 
-	CONFIG_ARCH_IRQPRIO - The LM3S6918 supports interrupt prioritization
+    CONFIG_ARCH_IRQPRIO - The LM3S6918 supports interrupt prioritization
 
-	   CONFIG_ARCH_IRQPRIO=y
+       CONFIG_ARCH_IRQPRIO=y
 
-	CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
-	   have LEDs
+    CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
+       have LEDs
 
-	CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
-	   stack. If defined, this symbol is the size of the interrupt
-	    stack in bytes.  If not defined, the user task stacks will be
-	  used during interrupt handling.
+    CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
+       stack. If defined, this symbol is the size of the interrupt
+        stack in bytes.  If not defined, the user task stacks will be
+      used during interrupt handling.
 
-	CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
+    CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 
-	CONFIG_ARCH_BOOTLOADER - Configure to use the MicroMint Eagle-100
-	   Ethernet bootloader.
+    CONFIG_ARCH_BOOTLOADER - Configure to use the MicroMint Eagle-100
+       Ethernet bootloader.
 
-	CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
+    CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
 
-	CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
-	   cause a 100 second delay during boot-up.  This 100 second delay
-	   serves no purpose other than it allows you to calibratre
-	   CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
-	   the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
-	   the delay actually is 100 seconds.
+    CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
+       cause a 100 second delay during boot-up.  This 100 second delay
+       serves no purpose other than it allows you to calibratre
+       CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
+       the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
+       the delay actually is 100 seconds.
 
   There are configurations for disabling support for interrupts GPIO ports.
   GPIOH and GPIOJ must be disabled because they do not exist on the LM3S6918.
   Additional interrupt support can be disabled if desired to reduce memory
   footprint.
 
-	CONFIG_LM3S_DISABLE_GPIOA_IRQS=n
-	CONFIG_LM3S_DISABLE_GPIOB_IRQS=n
-	CONFIG_LM3S_DISABLE_GPIOC_IRQS=n
-	CONFIG_LM3S_DISABLE_GPIOD_IRQS=n
-	CONFIG_LM3S_DISABLE_GPIOE_IRQS=n
-	CONFIG_LM3S_DISABLE_GPIOF_IRQS=n
-	CONFIG_LM3S_DISABLE_GPIOG_IRQS=n
-	CONFIG_LM3S_DISABLE_GPIOH_IRQS=y
-	CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
+    CONFIG_LM3S_DISABLE_GPIOA_IRQS=n
+    CONFIG_LM3S_DISABLE_GPIOB_IRQS=n
+    CONFIG_LM3S_DISABLE_GPIOC_IRQS=n
+    CONFIG_LM3S_DISABLE_GPIOD_IRQS=n
+    CONFIG_LM3S_DISABLE_GPIOE_IRQS=n
+    CONFIG_LM3S_DISABLE_GPIOF_IRQS=n
+    CONFIG_LM3S_DISABLE_GPIOG_IRQS=n
+    CONFIG_LM3S_DISABLE_GPIOH_IRQS=y
+    CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
  
   LM3S6818 specific device driver settings
 
-	CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the
-	   console and ttys0 (default is the UART0).
-	CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received.
-	   This specific the size of the receive buffer
-	CONFIG_UARTn_TXBUFSIZE - Characters are buffered before
-	   being sent.  This specific the size of the transmit buffer
-	CONFIG_UARTn_BAUD - The configure BAUD of the UART.  Must be
-	CONFIG_UARTn_BITS - The number of bits.  Must be either 7 or 8.
-	CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
-	CONFIG_UARTn_2STOP - Two stop bits
+    CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the
+       console and ttys0 (default is the UART0).
+    CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received.
+       This specific the size of the receive buffer
+    CONFIG_UARTn_TXBUFSIZE - Characters are buffered before
+       being sent.  This specific the size of the transmit buffer
+    CONFIG_UARTn_BAUD - The configure BAUD of the UART.  Must be
+    CONFIG_UARTn_BITS - The number of bits.  Must be either 7 or 8.
+    CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
+    CONFIG_UARTn_2STOP - Two stop bits
 
-	CONFIG_SSI0_DISABLE - Select to disable support for SSI0
-	CONFIG_SSI1_DISABLE - Select to disable support for SSI1
-	CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support.
-	  Poll-waiting is recommended if the interrupt rate would be to
-	  high in the interrupt driven case.
-	CONFIG_SSI_TXLIMIT - Write this many words to the Tx FIFO before
-	  emptying the Rx FIFO.  If the SPI frequency is high and this
-	  value is large, then larger values of this setting may cause
-	  Rx FIFO overrun errors.  Default: half of the Tx FIFO size (4).
+    CONFIG_SSI0_DISABLE - Select to disable support for SSI0
+    CONFIG_SSI1_DISABLE - Select to disable support for SSI1
+    CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support.
+      Poll-waiting is recommended if the interrupt rate would be to
+      high in the interrupt driven case.
+    CONFIG_SSI_TXLIMIT - Write this many words to the Tx FIFO before
+      emptying the Rx FIFO.  If the SPI frequency is high and this
+      value is large, then larger values of this setting may cause
+      Rx FIFO overrun errors.  Default: half of the Tx FIFO size (4).
 
-	CONFIG_LM3S_ETHERNET - This must be set (along with CONFIG_NET)
-	  to build the LM3S Ethernet driver
-	CONFIG_LM3S_ETHLEDS - Enable to use Ethernet LEDs on the board.
-	CONFIG_LM3S_BOARDMAC - If the board-specific logic can provide
-	  a MAC address (via lm3s_ethernetmac()), then this should be selected.
-	CONFIG_LM3S_ETHHDUPLEX - Set to force half duplex operation
-	CONFIG_LM3S_ETHNOAUTOCRC - Set to suppress auto-CRC generation
-	CONFIG_LM3S_ETHNOPAD - Set to suppress Tx padding
-	CONFIG_LM3S_MULTICAST - Set to enable multicast frames
-	CONFIG_LM3S_PROMISCUOUS - Set to enable promiscuous mode
-	CONFIG_LM3S_BADCRC - Set to enable bad CRC rejection.
-	CONFIG_LM3S_DUMPPACKET - Dump each packet received/sent to the console.
+    CONFIG_LM3S_ETHERNET - This must be set (along with CONFIG_NET)
+      to build the LM3S Ethernet driver
+    CONFIG_LM3S_ETHLEDS - Enable to use Ethernet LEDs on the board.
+    CONFIG_LM3S_BOARDMAC - If the board-specific logic can provide
+      a MAC address (via lm3s_ethernetmac()), then this should be selected.
+    CONFIG_LM3S_ETHHDUPLEX - Set to force half duplex operation
+    CONFIG_LM3S_ETHNOAUTOCRC - Set to suppress auto-CRC generation
+    CONFIG_LM3S_ETHNOPAD - Set to suppress Tx padding
+    CONFIG_LM3S_MULTICAST - Set to enable multicast frames
+    CONFIG_LM3S_PROMISCUOUS - Set to enable promiscuous mode
+    CONFIG_LM3S_BADCRC - Set to enable bad CRC rejection.
+    CONFIG_LM3S_DUMPPACKET - Dump each packet received/sent to the console.
 
 Configurations
 ^^^^^^^^^^^^^^
@@ -335,10 +385,10 @@ Configurations
 Each Eagle-100 configuration is maintained in a sudirectory and
 can be selected as follow:
 
-	cd tools
-	./configure.sh eagle100/<subdir>
-	cd -
-	. ./setenv.sh
+    cd tools
+    ./configure.sh eagle100/<subdir>
+    cd -
+    . ./setenv.sh
 
 Where <subdir> is one of the following:
 
diff --git a/nuttx/configs/ekk-lm3s9b96/README.txt b/nuttx/configs/ekk-lm3s9b96/README.txt
index 539eb0c26d..16568dbda2 100644
--- a/nuttx/configs/ekk-lm3s9b96/README.txt
+++ b/nuttx/configs/ekk-lm3s9b96/README.txt
@@ -10,7 +10,9 @@ Contents
   Development Environment
   GNU Toolchain Options
   IDEs
-  NuttX buildroot Toolchain
+  NuttX EABI "buildroot" Toolchain
+  NuttX OABI "buildroot" Toolchain
+  NXFLAT Toolchain
   Stellaris EKK-LM3S9B96 Evaluation Kit Configuration Options
   Configurations
 
@@ -186,8 +188,8 @@ IDEs
   Startup files will probably cause you some headaches.  The NuttX startup file
   is arch/arm/src/lm3s/lm3s_vectors.S.
 
-NuttX buildroot Toolchain
-^^^^^^^^^^^^^^^^^^^^^^^^^
+NuttX EABI "buildroot" Toolchain
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
   A GNU GCC-based toolchain is assumed.  The files */setenv.sh should
   be modified to point to the correct path to the Cortex-M3 GCC toolchain (if
@@ -210,7 +212,7 @@ NuttX buildroot Toolchain
 
   4. cd <some-dir>/buildroot
 
-  5. cp configs/cortexm3-defconfig-4.3.3 .config
+  5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config
 
   6. make oldconfig
 
@@ -220,11 +222,58 @@ NuttX buildroot Toolchain
      the path to the newly built binaries.
 
   See the file configs/README.txt in the buildroot source tree.  That has more
-  detailed PLUS some special instructions that you will need to follow if you
+  details PLUS some special instructions that you will need to follow if you
   are building a Cortex-M3 toolchain for Cygwin under Windows.
 
-  NOTE: This is an OABI toolchain.
+NuttX OABI "buildroot" Toolchain
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+  The older, OABI buildroot toolchain is also available.  To use the OABI
+  toolchain:
+
+  1. When building the buildroot toolchain, either (1) modify the cortexm3-eabi-defconfig-4.6.3
+     configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
+     configuration such as cortexm3-defconfig-4.3.3
+
+  2. Modify the Make.defs file to use the OABI converntions:
+
+    +CROSSDEV = arm-nuttx-elf-
+    +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    -CROSSDEV = arm-nuttx-eabi-
+    -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+
+NXFLAT Toolchain
+^^^^^^^^^^^^^^^^
+
+  If you are *not* using the NuttX buildroot toolchain and you want to use
+  the NXFLAT tools, then you will still have to build a portion of the buildroot
+  tools -- just the NXFLAT tools.  The buildroot with the NXFLAT tools can
+  be downloaded from the NuttX SourceForge download site
+  (https://sourceforge.net/projects/nuttx/files/).
+ 
+  This GNU toolchain builds and executes in the Linux or Cygwin environment.
+
+  1. You must have already configured Nuttx in <some-dir>/nuttx.
+
+     cd tools
+     ./configure.sh lpcxpresso-lpc1768/<sub-dir>
+
+  2. Download the latest buildroot package into <some-dir>
+
+  3. unpack the buildroot tarball.  The resulting directory may
+     have versioning information on it like buildroot-x.y.z.  If so,
+     rename <some-dir>/buildroot-x.y.z to <some-dir>/buildroot.
+
+  4. cd <some-dir>/buildroot
+
+  5. cp configs/cortexm3-defconfig-nxflat .config
+
+  6. make oldconfig
+
+  7. make
+
+  8. Edit setenv.h, if necessary, so that the PATH variable includes
+     the path to the newly builtNXFLAT binaries.
 
 Stellaris EKK-LM3S9B96 Evaluation Kit Configuration Options
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/nuttx/configs/fire-stm32v2/README.txt b/nuttx/configs/fire-stm32v2/README.txt
index 6382a7363e..74f3c72948 100644
--- a/nuttx/configs/fire-stm32v2/README.txt
+++ b/nuttx/configs/fire-stm32v2/README.txt
@@ -15,7 +15,9 @@ Contents
   - Development Environment
   - GNU Toolchain Options
   - IDEs
-  - NuttX buildroot Toolchain
+  - NuttX EABI "buildroot" Toolchain
+  - NuttX OABI "buildroot" Toolchain
+  - NXFLAT Toolchain
   - DFU and JTAG
   - OpenOCD
   - LEDs
@@ -308,8 +310,8 @@ IDEs
   one time from the Cygwin command line in order to obtain the pre-built
   startup object needed by RIDE.
 
-NuttX buildroot Toolchain
-=========================
+NuttX EABI "buildroot" Toolchain
+================================
 
   A GNU GCC-based toolchain is assumed.  The files */setenv.sh should
   be modified to point to the correct path to the Cortex-M3 GCC toolchain (if
@@ -332,7 +334,7 @@ NuttX buildroot Toolchain
 
   4. cd <some-dir>/buildroot
 
-  5. cp configs/cortexm3-defconfig-4.3.3 .config
+  5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config
 
   6. make oldconfig
 
@@ -342,9 +344,59 @@ NuttX buildroot Toolchain
      the path to the newly built binaries.
 
   See the file configs/README.txt in the buildroot source tree.  That has more
-  detailed PLUS some special instructions that you will need to follow if you are
+  details PLUS some special instructions that you will need to follow if you are
   building a Cortex-M3 toolchain for Cygwin under Windows.
 
+NuttX OABI "buildroot" Toolchain
+================================
+
+  The older, OABI buildroot toolchain is also available.  To use the OABI
+  toolchain:
+
+  1. When building the buildroot toolchain, either (1) modify the cortexm3-eabi-defconfig-4.6.3
+     configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
+     configuration such as cortexm3-defconfig-4.3.3
+
+  2. Modify the Make.defs file to use the OABI converntions:
+
+    +CROSSDEV = arm-nuttx-elf-
+    +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    -CROSSDEV = arm-nuttx-eabi-
+    -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+
+NXFLAT Toolchain
+================
+
+  If you are *not* using the NuttX buildroot toolchain and you want to use
+  the NXFLAT tools, then you will still have to build a portion of the buildroot
+  tools -- just the NXFLAT tools.  The buildroot with the NXFLAT tools can
+  be downloaded from the NuttX SourceForge download site
+  (https://sourceforge.net/projects/nuttx/files/).
+ 
+  This GNU toolchain builds and executes in the Linux or Cygwin environment.
+
+  1. You must have already configured Nuttx in <some-dir>/nuttx.
+
+     cd tools
+     ./configure.sh lpcxpresso-lpc1768/<sub-dir>
+
+  2. Download the latest buildroot package into <some-dir>
+
+  3. unpack the buildroot tarball.  The resulting directory may
+     have versioning information on it like buildroot-x.y.z.  If so,
+     rename <some-dir>/buildroot-x.y.z to <some-dir>/buildroot.
+
+  4. cd <some-dir>/buildroot
+
+  5. cp configs/cortexm3-defconfig-nxflat .config
+
+  6. make oldconfig
+
+  7. make
+
+  8. Edit setenv.h, if necessary, so that the PATH variable includes
+     the path to the newly builtNXFLAT binaries.
+
 DFU and JTAG
 ============
 
diff --git a/nuttx/configs/hymini-stm32v/README.txt b/nuttx/configs/hymini-stm32v/README.txt
index 75c67adeb0..03658be0ac 100644
--- a/nuttx/configs/hymini-stm32v/README.txt
+++ b/nuttx/configs/hymini-stm32v/README.txt
@@ -10,7 +10,9 @@ Contents
   - Development Environment
   - GNU Toolchain Options
   - IDEs
-  - NuttX buildroot Toolchain
+  - NuttX EABI "buildroot" Toolchain
+  - NuttX OABI "buildroot" Toolchain
+  - NXFLAT Toolchain
   - DFU
   - LEDs
   - RTC
@@ -47,7 +49,7 @@ GNU Toolchain Options
     CONFIG_STM32_CODESOURCERYL=y  : CodeSourcery under Linux
     CONFIG_STM32_DEVKITARM=y      : devkitARM under Windows
     CONFIG_STM32_RAISONANCE=y     : Raisonance RIDE7 under Windows
-    CONFIG_STM32_BUILDROOT=y	  : NuttX buildroot under Linux or Cygwin (default)
+    CONFIG_STM32_BUILDROOT=y      : NuttX buildroot under Linux or Cygwin (default)
 
   If you are not using CONFIG_STM32_BUILDROOT, then you may also have to modify
   the PATH in the setenv.h file if your make cannot find the tools.
@@ -128,8 +130,8 @@ IDEs
   one time from the Cygwin command line in order to obtain the pre-built
   startup object needed by RIDE.
 
-NuttX buildroot Toolchain
-=========================
+NuttX EABI "buildroot" Toolchain
+================================
 
   A GNU GCC-based toolchain is assumed.  The files */setenv.sh should
   be modified to point to the correct path to the Cortex-M3 GCC toolchain (if
@@ -152,7 +154,7 @@ NuttX buildroot Toolchain
 
   4. cd <some-dir>/buildroot
 
-  5. cp configs/cortexm3-defconfig-4.3.3 .config
+  5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config
 
   6. make oldconfig
 
@@ -162,9 +164,59 @@ NuttX buildroot Toolchain
      the path to the newly built binaries.
 
   See the file configs/README.txt in the buildroot source tree.  That has more
-  detailed PLUS some special instructions that you will need to follow if you are
+  details PLUS some special instructions that you will need to follow if you are
   building a Cortex-M3 toolchain for Cygwin under Windows.
 
+NuttX OABI "buildroot" Toolchain
+================================
+
+  The older, OABI buildroot toolchain is also available.  To use the OABI
+  toolchain:
+
+  1. When building the buildroot toolchain, either (1) modify the cortexm3-eabi-defconfig-4.6.3
+     configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
+     configuration such as cortexm3-defconfig-4.3.3
+
+  2. Modify the Make.defs file to use the OABI converntions:
+
+    +CROSSDEV = arm-nuttx-elf-
+    +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    -CROSSDEV = arm-nuttx-eabi-
+    -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+
+NXFLAT Toolchain
+================
+
+  If you are *not* using the NuttX buildroot toolchain and you want to use
+  the NXFLAT tools, then you will still have to build a portion of the buildroot
+  tools -- just the NXFLAT tools.  The buildroot with the NXFLAT tools can
+  be downloaded from the NuttX SourceForge download site
+  (https://sourceforge.net/projects/nuttx/files/).
+ 
+  This GNU toolchain builds and executes in the Linux or Cygwin environment.
+
+  1. You must have already configured Nuttx in <some-dir>/nuttx.
+
+     cd tools
+     ./configure.sh lpcxpresso-lpc1768/<sub-dir>
+
+  2. Download the latest buildroot package into <some-dir>
+
+  3. unpack the buildroot tarball.  The resulting directory may
+     have versioning information on it like buildroot-x.y.z.  If so,
+     rename <some-dir>/buildroot-x.y.z to <some-dir>/buildroot.
+
+  4. cd <some-dir>/buildroot
+
+  5. cp configs/cortexm3-defconfig-nxflat .config
+
+  6. make oldconfig
+
+  7. make
+
+  8. Edit setenv.h, if necessary, so that the PATH variable includes
+     the path to the newly builtNXFLAT binaries.
+
 DFU
 ===
 
@@ -218,16 +270,16 @@ The HY-MiniSTM32 board provides only two controlable LEDs labeled LED1 and LED2.
 Usage of these LEDs is defined in include/board.h and src/up_leds.c.
 They are encoded as follows:
 
-	SYMBOL				Meaning					LED1*	LED2	
-	-------------------	-----------------------	-------	-------	
-	LED_STARTED			NuttX has been started	OFF		OFF		
-	LED_HEAPALLOCATE	Heap has been allocated	ON		OFF		
-	LED_IRQSENABLED		Interrupts enabled		OFF		ON		
-	LED_STACKCREATED	Idle stack created		ON		OFF		
-	LED_INIRQ			In an interrupt**		OFF		N/C		
-	LED_SIGNAL			In a signal handler***  N/C		ON		
-	LED_ASSERTION		An assertion failed		ON		ON		
-	LED_PANIC			The system has crashed	BLINK	BLINK		
+    SYMBOL              Meaning                 LED1*   LED2    
+    ------------------- ----------------------- ------- -------    
+    LED_STARTED         NuttX has been started  OFF     OFF        
+    LED_HEAPALLOCATE    Heap has been allocated ON      OFF        
+    LED_IRQSENABLED     Interrupts enabled      OFF     ON        
+    LED_STACKCREATED    Idle stack created      ON      OFF        
+    LED_INIRQ           In an interrupt**       OFF     N/C        
+    LED_SIGNAL          In a signal handler***  N/C     ON        
+    LED_ASSERTION       An assertion failed     ON      ON        
+    LED_PANIC           The system has crashed  BLINK   BLINK        
     LED_IDLE            STM32 is is sleep mode  (Optional, not used)
 
   * If Nuttx starts correctly, normal state is to have LED1 on and LED2 off.
@@ -269,123 +321,123 @@ RTC
 HY-Mini specific Configuration Options
 ============================================
 
-	CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
-	   be set to:
+    CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
+       be set to:
 
-	   CONFIG_ARCH=arm
+       CONFIG_ARCH=arm
 
-	CONFIG_ARCH_family - For use in C code:
+    CONFIG_ARCH_family - For use in C code:
 
-	   CONFIG_ARCH_ARM=y
+       CONFIG_ARCH_ARM=y
 
-	CONFIG_ARCH_architecture - For use in C code:
+    CONFIG_ARCH_architecture - For use in C code:
 
-	   CONFIG_ARCH_CORTEXM3=y
+       CONFIG_ARCH_CORTEXM3=y
 
-	CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
+    CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
-	   CONFIG_ARCH_CHIP=stm32
+       CONFIG_ARCH_CHIP=stm32
 
-	CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
-	   chip:
+    CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
+       chip:
 
-	   CONFIG_ARCH_CHIP_STM32F103VCT6
+       CONFIG_ARCH_CHIP_STM32F103VCT6
 
     CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG - Enables special STM32 clock
        configuration features.
 
        CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=n
  
-	CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
-	   hence, the board that supports the particular chip or SoC.
+    CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
+       hence, the board that supports the particular chip or SoC.
 
-	   CONFIG_ARCH_BOARD=hymini-stm32v (for the HY-Mini development board)
+       CONFIG_ARCH_BOARD=hymini-stm32v (for the HY-Mini development board)
 
-	CONFIG_ARCH_BOARD_name - For use in C code
+    CONFIG_ARCH_BOARD_name - For use in C code
 
-	   CONFIG_ARCH_BOARD_HYMINI_STM32V=y
+       CONFIG_ARCH_BOARD_HYMINI_STM32V=y
 
-	CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
-	   of delay loops
+    CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
+       of delay loops
 
-	CONFIG_ENDIAN_BIG - define if big endian (default is little
-	   endian)
+    CONFIG_ENDIAN_BIG - define if big endian (default is little
+       endian)
 
-	CONFIG_DRAM_SIZE - Describes the installed DRAM (SRAM in this case):
+    CONFIG_DRAM_SIZE - Describes the installed DRAM (SRAM in this case):
 
-	   CONFIG_DRAM_SIZE=0x0000C000 (48Kb)
+       CONFIG_DRAM_SIZE=0x0000C000 (48Kb)
 
-	CONFIG_DRAM_START - The start address of installed DRAM
+    CONFIG_DRAM_START - The start address of installed DRAM
 
-	   CONFIG_DRAM_START=0x20000000
+       CONFIG_DRAM_START=0x20000000
 
-	CONFIG_ARCH_IRQPRIO - The STM32F103V supports interrupt prioritization
+    CONFIG_ARCH_IRQPRIO - The STM32F103V supports interrupt prioritization
 
-	   CONFIG_ARCH_IRQPRIO=y
+       CONFIG_ARCH_IRQPRIO=y
 
-	CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
-	   have LEDs
+    CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
+       have LEDs
 
-	CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
-	   stack. If defined, this symbol is the size of the interrupt
-	   stack in bytes.  If not defined, the user task stacks will be
-	   used during interrupt handling.
+    CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
+       stack. If defined, this symbol is the size of the interrupt
+       stack in bytes.  If not defined, the user task stacks will be
+       used during interrupt handling.
 
-	CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
+    CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 
-	CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
+    CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
 
-	CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
-	   cause a 100 second delay during boot-up.  This 100 second delay
-	   serves no purpose other than it allows you to calibratre
-	   CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
-	   the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
-	   the delay actually is 100 seconds.
+    CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
+       cause a 100 second delay during boot-up.  This 100 second delay
+       serves no purpose other than it allows you to calibratre
+       CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
+       the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
+       the delay actually is 100 seconds.
 
   Individual subsystems can be enabled:
-	AHB
-	---
-	CONFIG_STM32_DMA1
-	CONFIG_STM32_DMA2
-	CONFIG_STM32_CRC
-	CONFIG_STM32_FSMC
-	CONFIG_STM32_SDIO
+    AHB
+    ---
+    CONFIG_STM32_DMA1
+    CONFIG_STM32_DMA2
+    CONFIG_STM32_CRC
+    CONFIG_STM32_FSMC
+    CONFIG_STM32_SDIO
 
-	APB1
-	----
-	CONFIG_STM32_TIM2
-	CONFIG_STM32_TIM3    (required for PWM control of LCD backlight)
-	CONFIG_STM32_TIM4
-	CONFIG_STM32_TIM5
-	CONFIG_STM32_TIM6
-	CONFIG_STM32_TIM7
-	CONFIG_STM32_IWDG
-	CONFIG_STM32_WWDG
-	CONFIG_STM32_IWDG
-	CONFIG_STM32_SPI2
-	CONFIG_STM32_SPI4
-	CONFIG_STM32_USART2
-	CONFIG_STM32_USART3
-	CONFIG_STM32_UART4
-	CONFIG_STM32_UART5
-	CONFIG_STM32_I2C1
-	CONFIG_STM32_I2C2
-	CONFIG_STM32_USB
-	CONFIG_STM32_CAN1
-	CONFIG_STM32_BKP
-	CONFIG_STM32_PWR
-	CONFIG_STM32_DAC
-	CONFIG_STM32_USB
+    APB1
+    ----
+    CONFIG_STM32_TIM2
+    CONFIG_STM32_TIM3    (required for PWM control of LCD backlight)
+    CONFIG_STM32_TIM4
+    CONFIG_STM32_TIM5
+    CONFIG_STM32_TIM6
+    CONFIG_STM32_TIM7
+    CONFIG_STM32_IWDG
+    CONFIG_STM32_WWDG
+    CONFIG_STM32_IWDG
+    CONFIG_STM32_SPI2
+    CONFIG_STM32_SPI4
+    CONFIG_STM32_USART2
+    CONFIG_STM32_USART3
+    CONFIG_STM32_UART4
+    CONFIG_STM32_UART5
+    CONFIG_STM32_I2C1
+    CONFIG_STM32_I2C2
+    CONFIG_STM32_USB
+    CONFIG_STM32_CAN1
+    CONFIG_STM32_BKP
+    CONFIG_STM32_PWR
+    CONFIG_STM32_DAC
+    CONFIG_STM32_USB
 
-	APB2
-	----
-	CONFIG_STM32_ADC1
-	CONFIG_STM32_ADC2
-	CONFIG_STM32_TIM1
-	CONFIG_STM32_SPI1
-	CONFIG_STM32_TIM8
-	CONFIG_STM32_USART1
-	CONFIG_STM32_ADC3
+    APB2
+    ----
+    CONFIG_STM32_ADC1
+    CONFIG_STM32_ADC2
+    CONFIG_STM32_TIM1
+    CONFIG_STM32_SPI1
+    CONFIG_STM32_TIM8
+    CONFIG_STM32_USART1
+    CONFIG_STM32_ADC3
 
   Timer and I2C devices may need to the following to force power to be applied
   unconditionally at power up.  (Otherwise, the device is powered when it is
@@ -405,84 +457,84 @@ HY-Mini specific Configuration Options
   to assign the timer (n) for used by the ADC or DAC, but then you also have to
   configure which ADC or DAC (m) it is assigned to.
 
-	CONFIG_STM32_TIMn_PWM   Reserve timer n for use by PWM, n=1,..,8
-	CONFIG_STM32_TIMn_ADC   Reserve timer n for use by ADC, n=1,..,8
-	CONFIG_STM32_TIMn_ADCm  Reserve timer n to trigger ADCm, n=1,..,8, m=1,..,3
-	CONFIG_STM32_TIMn_DAC   Reserve timer n for use by DAC, n=1,..,8
-	CONFIG_STM32_TIMn_DACm  Reserve timer n to trigger DACm, n=1,..,8, m=1,..,2
+    CONFIG_STM32_TIMn_PWM   Reserve timer n for use by PWM, n=1,..,8
+    CONFIG_STM32_TIMn_ADC   Reserve timer n for use by ADC, n=1,..,8
+    CONFIG_STM32_TIMn_ADCm  Reserve timer n to trigger ADCm, n=1,..,8, m=1,..,3
+    CONFIG_STM32_TIMn_DAC   Reserve timer n for use by DAC, n=1,..,8
+    CONFIG_STM32_TIMn_DACm  Reserve timer n to trigger DACm, n=1,..,8, m=1,..,2
 
   Others alternate pin mappings available:
 
-	CONFIG_STM32_TIM1_FULL_REMAP
-	CONFIG_STM32_TIM1_PARTIAL_REMAP
-	CONFIG_STM32_TIM2_FULL_REMAP
-	CONFIG_STM32_TIM2_PARTIAL_REMAP_1
-	CONFIG_STM32_TIM2_PARTIAL_REMAP_2
-	CONFIG_STM32_TIM3_FULL_REMAP
-	CONFIG_STM32_TIM3_PARTIAL_REMAP
-	CONFIG_STM32_TIM4_REMAP
-	CONFIG_STM32_USART1_REMAP
-	CONFIG_STM32_USART2_REMAP
-	CONFIG_STM32_USART3_FULL_REMAP
-	CONFIG_STM32_USART3_PARTIAL_REMAP
-	CONFIG_STM32_SPI1_REMAP
-	CONFIG_STM32_SPI3_REMAP
-	CONFIG_STM32_I2C1_REMAP
-	CONFIG_STM32_CAN1_REMAP1
-	CONFIG_STM32_CAN1_REMAP2
-	CONFIG_STM32_CAN2_REMAP
+    CONFIG_STM32_TIM1_FULL_REMAP
+    CONFIG_STM32_TIM1_PARTIAL_REMAP
+    CONFIG_STM32_TIM2_FULL_REMAP
+    CONFIG_STM32_TIM2_PARTIAL_REMAP_1
+    CONFIG_STM32_TIM2_PARTIAL_REMAP_2
+    CONFIG_STM32_TIM3_FULL_REMAP
+    CONFIG_STM32_TIM3_PARTIAL_REMAP
+    CONFIG_STM32_TIM4_REMAP
+    CONFIG_STM32_USART1_REMAP
+    CONFIG_STM32_USART2_REMAP
+    CONFIG_STM32_USART3_FULL_REMAP
+    CONFIG_STM32_USART3_PARTIAL_REMAP
+    CONFIG_STM32_SPI1_REMAP
+    CONFIG_STM32_SPI3_REMAP
+    CONFIG_STM32_I2C1_REMAP
+    CONFIG_STM32_CAN1_REMAP1
+    CONFIG_STM32_CAN1_REMAP2
+    CONFIG_STM32_CAN2_REMAP
 
   STM32F103V specific device driver settings
 
-	CONFIG_U[S]ARTn_SERIAL_CONSOLE - selects the USARTn (n=1,2,3) or UART
+    CONFIG_U[S]ARTn_SERIAL_CONSOLE - selects the USARTn (n=1,2,3) or UART
            m (m=4,5) for the console and ttys0 (default is the USART1).
            
            Note: USART1 is connected to a PL2303 serial to USB converter.
            So USART1 is available through USB port labeled CN3 on the board.
            
-	CONFIG_U[S]ARTn_RXBUFSIZE - Characters are buffered as received.
-	   This specific the size of the receive buffer
-	CONFIG_U[S]ARTn_TXBUFSIZE - Characters are buffered before
-	   being sent.  This specific the size of the transmit buffer
-	CONFIG_U[S]ARTn_BAUD - The configure BAUD of the UART.  Must be
-	CONFIG_U[S]ARTn_BITS - The number of bits.  Must be either 7 or 8.
-	CONFIG_U[S]ARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
-	CONFIG_U[S]ARTn_2STOP - Two stop bits
+    CONFIG_U[S]ARTn_RXBUFSIZE - Characters are buffered as received.
+       This specific the size of the receive buffer
+    CONFIG_U[S]ARTn_TXBUFSIZE - Characters are buffered before
+       being sent.  This specific the size of the transmit buffer
+    CONFIG_U[S]ARTn_BAUD - The configure BAUD of the UART.  Must be
+    CONFIG_U[S]ARTn_BITS - The number of bits.  Must be either 7 or 8.
+    CONFIG_U[S]ARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
+    CONFIG_U[S]ARTn_2STOP - Two stop bits
 
-	CONFIG_STM32_SPI_INTERRUPTS - Select to enable interrupt driven SPI
-	  support. Non-interrupt-driven, poll-waiting is recommended if the
-	  interrupt rate would be to high in the interrupt driven case.
-	CONFIG_STM32_SPI_DMA - Use DMA to improve SPI transfer performance.
-	  Cannot be used with CONFIG_STM32_SPI_INTERRUPT.
+    CONFIG_STM32_SPI_INTERRUPTS - Select to enable interrupt driven SPI
+      support. Non-interrupt-driven, poll-waiting is recommended if the
+      interrupt rate would be to high in the interrupt driven case.
+    CONFIG_STM32_SPI_DMA - Use DMA to improve SPI transfer performance.
+      Cannot be used with CONFIG_STM32_SPI_INTERRUPT.
 
-	CONFIG_SDIO_DMA - Support DMA data transfers.  Requires CONFIG_STM32_SDIO
-	  and CONFIG_STM32_DMA2.
-	CONFIG_SDIO_PRI - Select SDIO interrupt prority.  Default: 128
-	CONFIG_SDIO_DMAPRIO - Select SDIO DMA interrupt priority. 
-	  Default:  Medium
-	CONFIG_SDIO_WIDTH_D1_ONLY - Select 1-bit transfer mode.  Default:
-	  4-bit transfer mode.
+    CONFIG_SDIO_DMA - Support DMA data transfers.  Requires CONFIG_STM32_SDIO
+      and CONFIG_STM32_DMA2.
+    CONFIG_SDIO_PRI - Select SDIO interrupt prority.  Default: 128
+    CONFIG_SDIO_DMAPRIO - Select SDIO DMA interrupt priority. 
+      Default:  Medium
+    CONFIG_SDIO_WIDTH_D1_ONLY - Select 1-bit transfer mode.  Default:
+      4-bit transfer mode.
     CONFIG_MMCSD_HAVECARDDETECT - Select if SDIO driver card detection
       is 100% accurate  (it is on the  HY-MiniSTM32V)
 
   HY-MiniSTM32V CAN Configuration
 
-	CONFIG_CAN - Enables CAN support (one or both of CONFIG_STM32_CAN1 or
-	  CONFIG_STM32_CAN2 must also be defined)
-	CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
-	  Standard 11-bit IDs.
-	CONFIG_CAN_FIFOSIZE - The size of the circular buffer of CAN messages.
-	  Default: 8
-	CONFIG_CAN_NPENDINGRTR - The size of the list of pending RTR requests.
-	  Default: 4
-	CONFIG_CAN_LOOPBACK - A CAN driver may or may not support a loopback
-	  mode for testing. The STM32 CAN driver does support loopback mode.
-	CONFIG_CAN1_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN1 is defined.
-	CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN2 is defined.
-	CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
-	CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
-	CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
-	  dump of all CAN registers.
+    CONFIG_CAN - Enables CAN support (one or both of CONFIG_STM32_CAN1 or
+      CONFIG_STM32_CAN2 must also be defined)
+    CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
+      Standard 11-bit IDs.
+    CONFIG_CAN_FIFOSIZE - The size of the circular buffer of CAN messages.
+      Default: 8
+    CONFIG_CAN_NPENDINGRTR - The size of the list of pending RTR requests.
+      Default: 4
+    CONFIG_CAN_LOOPBACK - A CAN driver may or may not support a loopback
+      mode for testing. The STM32 CAN driver does support loopback mode.
+    CONFIG_CAN1_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN1 is defined.
+    CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN2 is defined.
+    CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
+    CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
+    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+      dump of all CAN registers.
 
   HY-MiniSTM32V LCD Hardware Configuration  (SSD1289 controler)
 
@@ -510,10 +562,10 @@ Configurations
 Each HY-MiniSTM32V configuration is maintained in a sudirectory and
 can be selected as follow:
 
-	cd tools
-	./configure.sh hymini-stm32v/<subdir>
-	cd -
-	. ./setenv.sh
+    cd tools
+    ./configure.sh hymini-stm32v/<subdir>
+    cd -
+    . ./setenv.sh
 
 Where <subdir> is one of the following:
 
@@ -547,10 +599,10 @@ Where <subdir> is one of the following:
     FAT FS      CONFIG_FAT_LCNAME=y     CONFIG_FAT_LCNAME=y
     Config      CONFIG_FAT_LFN=n        CONFIG_FAT_LFN=y (4)
     ----------- ----------------------- --------------------------------
-	LCD Driver  No                      Yes
-	Support 
+    LCD Driver  No                      Yes
+    Support 
     ----------- ----------------------- --------------------------------
-	RTC Support No                      Yes
+    RTC Support No                      Yes
     ----------- ----------------------- --------------------------------
     Support for No                      Yes
     Built-in
diff --git a/nuttx/configs/kwikstik-k40/README.txt b/nuttx/configs/kwikstik-k40/README.txt
index a268a52d8e..a320cbb054 100644
--- a/nuttx/configs/kwikstik-k40/README.txt
+++ b/nuttx/configs/kwikstik-k40/README.txt
@@ -22,7 +22,9 @@ Contents
   o Development Environment
   o GNU Toolchain Options
   o IDEs
-  o NuttX buildroot Toolchain
+  o NuttX EABI "buildroot" Toolchain
+  o NuttX OABI "buildroot" Toolchain
+  o NXFLAT Toolchain
   
 Kinetis KwikStik-K40 Features:
 ==============================
@@ -171,7 +173,7 @@ GNU Toolchain Options
     CONFIG_KINETIS_CODESOURCERYW=y  : CodeSourcery under Windows
     CONFIG_KINETIS_CODESOURCERYL=y  : CodeSourcery under Linux
     CONFIG_KINETIS_DEVKITARM=y      : devkitARM under Windows
-    CONFIG_KINETIS_BUILDROOT=y	    : NuttX buildroot under Linux or Cygwin (default)
+    CONFIG_KINETIS_BUILDROOT=y      : NuttX buildroot under Linux or Cygwin (default)
 
   If you are not using CONFIG_KINETIS_BUILDROOT, then you may also have to modify
   the PATH in the setenv.h file if your make cannot find the tools.
@@ -249,8 +251,8 @@ IDEs
   Startup files will probably cause you some headaches.  The NuttX startup file
   is arch/arm/src/kinetis/k40_vectors.S.
 
-NuttX buildroot Toolchain
-=========================
+NuttX EABI "buildroot" Toolchain
+================================
 
   A GNU GCC-based toolchain is assumed.  The files */setenv.sh should
   be modified to point to the correct path to the Cortex-M4 GCC toolchain (if
@@ -260,8 +262,7 @@ NuttX buildroot Toolchain
   SourceForge download site (https://sourceforge.net/projects/nuttx/files/buildroot/).
   This GNU toolchain builds and executes in the Linux or Cygwin environment.
 
-  NOTE:  The NuttX toolchain is an OABI toolchain (vs. the more common EABI)
-  and does not include optimizations for Cortex-M4 (ARMv7E-M).
+  NOTE:  The NuttX toolchain may not include optimizations for Cortex-M4 (ARMv7E-M).
 
   1. You must have already configured Nuttx in <some-dir>/nuttx.
 
@@ -276,7 +277,7 @@ NuttX buildroot Toolchain
 
   4. cd <some-dir>/buildroot
 
-  5. cp configs/cortexm3-defconfig-4.3.3 .config
+  5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config
 
   6. make oldconfig
 
@@ -286,92 +287,142 @@ NuttX buildroot Toolchain
      the path to the newly built binaries.
 
   See the file configs/README.txt in the buildroot source tree.  That has more
-  detailed PLUS some special instructions that you will need to follow if you are
+  details PLUS some special instructions that you will need to follow if you are
   building a Cortex-M4 toolchain for Cygwin under Windows.
 
+NuttX OABI "buildroot" Toolchain
+================================
+
+  The older, OABI buildroot toolchain is also available.  To use the OABI
+  toolchain:
+
+  1. When building the buildroot toolchain, either (1) modify the cortexm3-eabi-defconfig-4.6.3
+     configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
+     configuration such as cortexm3-defconfig-4.3.3
+
+  2. Modify the Make.defs file to use the OABI converntions:
+
+    +CROSSDEV = arm-nuttx-elf-
+    +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    -CROSSDEV = arm-nuttx-eabi-
+    -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+
+NXFLAT Toolchain
+================
+
+  If you are *not* using the NuttX buildroot toolchain and you want to use
+  the NXFLAT tools, then you will still have to build a portion of the buildroot
+  tools -- just the NXFLAT tools.  The buildroot with the NXFLAT tools can
+  be downloaded from the NuttX SourceForge download site
+  (https://sourceforge.net/projects/nuttx/files/).
+ 
+  This GNU toolchain builds and executes in the Linux or Cygwin environment.
+
+  1. You must have already configured Nuttx in <some-dir>/nuttx.
+
+     cd tools
+     ./configure.sh lpcxpresso-lpc1768/<sub-dir>
+
+  2. Download the latest buildroot package into <some-dir>
+
+  3. unpack the buildroot tarball.  The resulting directory may
+     have versioning information on it like buildroot-x.y.z.  If so,
+     rename <some-dir>/buildroot-x.y.z to <some-dir>/buildroot.
+
+  4. cd <some-dir>/buildroot
+
+  5. cp configs/cortexm3-defconfig-nxflat .config
+
+  6. make oldconfig
+
+  7. make
+
+  8. Edit setenv.h, if necessary, so that the PATH variable includes
+     the path to the newly builtNXFLAT binaries.
+
 KwikStik-K40-specific Configuration Options
 ============================================
 
-	CONFIG_ARCH - Identifies the arch/ subdirectory.  This sould
-	   be set to:
+    CONFIG_ARCH - Identifies the arch/ subdirectory.  This sould
+       be set to:
 
-	   CONFIG_ARCH=arm
+       CONFIG_ARCH=arm
 
-	CONFIG_ARCH_family - For use in C code:
+    CONFIG_ARCH_family - For use in C code:
 
-	   CONFIG_ARCH_ARM=y
+       CONFIG_ARCH_ARM=y
 
-	CONFIG_ARCH_architecture - For use in C code:
+    CONFIG_ARCH_architecture - For use in C code:
 
-	   CONFIG_ARCH_CORTEXM4=y
+       CONFIG_ARCH_CORTEXM4=y
 
-	CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
+    CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
-	   CONFIG_ARCH_CHIP=k40
+       CONFIG_ARCH_CHIP=k40
 
-	CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
-	   chip:
+    CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
+       chip:
 
-	   CONFIG_ARCH_CHIP_MK40X256VLQ100
+       CONFIG_ARCH_CHIP_MK40X256VLQ100
 
-	CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
-	   hence, the board that supports the particular chip or SoC.
+    CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
+       hence, the board that supports the particular chip or SoC.
 
-	   CONFIG_ARCH_BOARD=kwikstik-k40 (for the KwikStik-K40 development board)
+       CONFIG_ARCH_BOARD=kwikstik-k40 (for the KwikStik-K40 development board)
 
-	CONFIG_ARCH_BOARD_name - For use in C code
+    CONFIG_ARCH_BOARD_name - For use in C code
 
-	   CONFIG_ARCH_BOARD_KWIKSTIK_K40=y
+       CONFIG_ARCH_BOARD_KWIKSTIK_K40=y
 
-	CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
-	   of delay loops
+    CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
+       of delay loops
 
-	CONFIG_ENDIAN_BIG - define if big endian (default is little
-	   endian)
+    CONFIG_ENDIAN_BIG - define if big endian (default is little
+       endian)
 
-	CONFIG_DRAM_SIZE - Describes the installed DRAM (SRAM in this case):
+    CONFIG_DRAM_SIZE - Describes the installed DRAM (SRAM in this case):
 
-	   CONFIG_DRAM_SIZE=0x00010000 (64Kb)
+       CONFIG_DRAM_SIZE=0x00010000 (64Kb)
 
-	CONFIG_DRAM_START - The start address of installed DRAM
+    CONFIG_DRAM_START - The start address of installed DRAM
 
-	   CONFIG_DRAM_START=0x20000000
+       CONFIG_DRAM_START=0x20000000
 
-	CONFIG_ARCH_IRQPRIO - The Kinetis K40 supports interrupt prioritization
+    CONFIG_ARCH_IRQPRIO - The Kinetis K40 supports interrupt prioritization
 
-	   CONFIG_ARCH_IRQPRIO=y
+       CONFIG_ARCH_IRQPRIO=y
 
-	CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
-	   have LEDs
+    CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
+       have LEDs
 
-	CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
-	   stack. If defined, this symbol is the size of the interrupt
-	    stack in bytes.  If not defined, the user task stacks will be
-	  used during interrupt handling.
+    CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
+       stack. If defined, this symbol is the size of the interrupt
+        stack in bytes.  If not defined, the user task stacks will be
+      used during interrupt handling.
 
-	CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
+    CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 
-	CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
+    CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
 
-	CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
-	   cause a 100 second delay during boot-up.  This 100 second delay
-	   serves no purpose other than it allows you to calibratre
-	   CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
-	   the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
-	   the delay actually is 100 seconds.
+    CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
+       cause a 100 second delay during boot-up.  This 100 second delay
+       serves no purpose other than it allows you to calibratre
+       CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
+       the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
+       the delay actually is 100 seconds.
 
   Individual subsystems can be enabled:
 
     CONFIG_KINETIS_TRACE    -- Enable trace clocking on power up.
     CONFIG_KINETIS_FLEXBUS  -- Enable flexbus clocking on power up.
-  	CONFIG_KINETIS_UART0    -- Support UART0
-  	CONFIG_KINETIS_UART1    -- Support UART1
-  	CONFIG_KINETIS_UART2    -- Support UART2
-  	CONFIG_KINETIS_UART3    -- Support UART3
-  	CONFIG_KINETIS_UART4    -- Support UART4
-  	CONFIG_KINETIS_UART5    -- Support UART5
-  	CONFIG_KINETIS_ENET     -- Support Ethernet (K60 only)
-  	CONFIG_KINETIS_RNGB     -- Support the random number generator(K60 only)
+    CONFIG_KINETIS_UART0    -- Support UART0
+    CONFIG_KINETIS_UART1    -- Support UART1
+    CONFIG_KINETIS_UART2    -- Support UART2
+    CONFIG_KINETIS_UART3    -- Support UART3
+    CONFIG_KINETIS_UART4    -- Support UART4
+    CONFIG_KINETIS_UART5    -- Support UART5
+    CONFIG_KINETIS_ENET     -- Support Ethernet (K60 only)
+    CONFIG_KINETIS_RNGB     -- Support the random number generator(K60 only)
     CONFIG_KINETIS_FLEXCAN0 -- Support FlexCAN0
     CONFIG_KINETIS_FLEXCAN1 -- Support FlexCAN1
     CONFIG_KINETIS_SPI0     -- Support SPI0
@@ -380,8 +431,8 @@ KwikStik-K40-specific Configuration Options
     CONFIG_KINETIS_I2C0     -- Support I2C0
     CONFIG_KINETIS_I2C1     -- Support I2C1
     CONFIG_KINETIS_I2S      -- Support I2S
-  	CONFIG_KINETIS_DAC0     -- Support DAC0
-  	CONFIG_KINETIS_DAC1     -- Support DAC1
+    CONFIG_KINETIS_DAC0     -- Support DAC0
+    CONFIG_KINETIS_DAC1     -- Support DAC1
     CONFIG_KINETIS_ADC0     -- Support ADC0
     CONFIG_KINETIS_ADC1     -- Support ADC1
     CONFIG_KINETIS_CMP      -- Support CMP
@@ -429,15 +480,15 @@ KwikStik-K40-specific Configuration Options
 
   Kinetis K40 specific device driver settings
 
-	CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn (n=0..5) for the
+    CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn (n=0..5) for the
       console and ttys0 (default is the UART0).
-	CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received.
-	   This specific the size of the receive buffer
-	CONFIG_UARTn_TXBUFSIZE - Characters are buffered before
-	   being sent.  This specific the size of the transmit buffer
-	CONFIG_UARTn_BAUD - The configure BAUD of the UART.
-	CONFIG_UARTn_BITS - The number of bits.  Must be either 8 or 8.
-	CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
+    CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received.
+       This specific the size of the receive buffer
+    CONFIG_UARTn_TXBUFSIZE - Characters are buffered before
+       being sent.  This specific the size of the transmit buffer
+    CONFIG_UARTn_BAUD - The configure BAUD of the UART.
+    CONFIG_UARTn_BITS - The number of bits.  Must be either 8 or 8.
+    CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
 
   KwikStik-K40 LCD Hardware Configuration
 
@@ -462,10 +513,10 @@ Configurations
 Each KwikStik-K40 configuration is maintained in a sudirectory and
 can be selected as follow:
 
-	cd tools
-	./configure.sh kwikstik-k40/<subdir>
-	cd -
-	. ./setenv.sh
+    cd tools
+    ./configure.sh kwikstik-k40/<subdir>
+    cd -
+    . ./setenv.sh
 
 Where <subdir> is one of the following:
 
@@ -475,4 +526,4 @@ Where <subdir> is one of the following:
     examples/ostest.  By default, this project assumes that you are
     using the DFU bootloader.
 
-    CONFIG_KINETIS_BUILDROOT=y	  : NuttX buildroot under Linux or Cygwin
+    CONFIG_KINETIS_BUILDROOT=y      : NuttX buildroot under Linux or Cygwin
diff --git a/nuttx/configs/lincoln60/README.txt b/nuttx/configs/lincoln60/README.txt
index a699d5f33b..abbc572046 100644
--- a/nuttx/configs/lincoln60/README.txt
+++ b/nuttx/configs/lincoln60/README.txt
@@ -10,7 +10,9 @@ Contents
   Development Environment
   GNU Toolchain Options
   IDEs
-  NuttX buildroot Toolchain
+  NuttX EABI "buildroot" Toolchain
+  NuttX OABI "buildroot" Toolchain
+  NXFLAT Toolchain
   USB Device Controller Functions
   Lincoln 60 Configuration Options
   USB Host Configuration
@@ -150,8 +152,8 @@ IDEs
   Startup files will probably cause you some headaches.  The NuttX startup file
   is arch/arm/src/lpc17x/lpc17_vectors.S.
 
-NuttX buildroot Toolchain
-^^^^^^^^^^^^^^^^^^^^^^^^^
+NuttX EABI "buildroot" Toolchain
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
   A GNU GCC-based toolchain is assumed.  The files */setenv.sh should
   be modified to point to the correct path to the Cortex-M3 GCC toolchain (if
@@ -174,7 +176,7 @@ NuttX buildroot Toolchain
 
   4. cd <some-dir>/buildroot
 
-  5. cp configs/cortexm3-defconfig-4.3.3 .config
+  5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config
 
   6. make oldconfig
 
@@ -184,184 +186,232 @@ NuttX buildroot Toolchain
      the path to the newly built binaries.
 
   See the file configs/README.txt in the buildroot source tree.  That has more
-  detailed PLUS some special instructions that you will need to follow if you
+  details PLUS some special instructions that you will need to follow if you
   are building a Cortex-M3 toolchain for Cygwin under Windows.
 
-  NOTE: This is an OABI toolchain.
+NuttX OABI "buildroot" Toolchain
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+  The older, OABI buildroot toolchain is also available.  To use the OABI
+  toolchain:
+
+  1. When building the buildroot toolchain, either (1) modify the cortexm3-eabi-defconfig-4.6.3
+     configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
+     configuration such as cortexm3-defconfig-4.3.3
+
+  2. Modify the Make.defs file to use the OABI converntions:
+
+    +CROSSDEV = arm-nuttx-elf-
+    +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    -CROSSDEV = arm-nuttx-eabi-
+    -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+
+NXFLAT Toolchain
+^^^^^^^^^^^^^^^^
+
+  If you are *not* using the NuttX buildroot toolchain and you want to use
+  the NXFLAT tools, then you will still have to build a portion of the buildroot
+  tools -- just the NXFLAT tools.  The buildroot with the NXFLAT tools can
+  be downloaded from the NuttX SourceForge download site
+  (https://sourceforge.net/projects/nuttx/files/).
+ 
+  This GNU toolchain builds and executes in the Linux or Cygwin environment.
+
+  1. You must have already configured Nuttx in <some-dir>/nuttx.
+
+     cd tools
+     ./configure.sh lpcxpresso-lpc1768/<sub-dir>
+
+  2. Download the latest buildroot package into <some-dir>
+
+  3. unpack the buildroot tarball.  The resulting directory may
+     have versioning information on it like buildroot-x.y.z.  If so,
+     rename <some-dir>/buildroot-x.y.z to <some-dir>/buildroot.
+
+  4. cd <some-dir>/buildroot
+
+  5. cp configs/cortexm3-defconfig-nxflat .config
+
+  6. make oldconfig
+
+  7. make
+
+  8. Edit setenv.h, if necessary, so that the PATH variable includes
+     the path to the newly builtNXFLAT binaries.
 
 Lincoln 60 Configuration Options
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-	CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
-	   be set to:
+    CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
+       be set to:
 
-	   CONFIG_ARCH=arm
+       CONFIG_ARCH=arm
 
-	CONFIG_ARCH_family - For use in C code:
+    CONFIG_ARCH_family - For use in C code:
 
-	   CONFIG_ARCH_ARM=y
+       CONFIG_ARCH_ARM=y
 
-	CONFIG_ARCH_architecture - For use in C code:
+    CONFIG_ARCH_architecture - For use in C code:
 
-	   CONFIG_ARCH_CORTEXM3=y
+       CONFIG_ARCH_CORTEXM3=y
 
-	CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
+    CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
-	   CONFIG_ARCH_CHIP=lpc17xx
+       CONFIG_ARCH_CHIP=lpc17xx
 
-	CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
-	   chip:
+    CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
+       chip:
 
-	   CONFIG_ARCH_CHIP_LPC1768=y
+       CONFIG_ARCH_CHIP_LPC1768=y
 
-	CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
-	   hence, the board that supports the particular chip or SoC.
+    CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
+       hence, the board that supports the particular chip or SoC.
 
-	   CONFIG_ARCH_BOARD=lincoln60 (for the Lincoln 60 board)
+       CONFIG_ARCH_BOARD=lincoln60 (for the Lincoln 60 board)
 
-	CONFIG_ARCH_BOARD_name - For use in C code
+    CONFIG_ARCH_BOARD_name - For use in C code
 
-	   CONFIG_ARCH_BOARD_LINCOLN60=y
+       CONFIG_ARCH_BOARD_LINCOLN60=y
 
-	CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
-	   of delay loops
+    CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
+       of delay loops
 
-	CONFIG_ENDIAN_BIG - define if big endian (default is little
-	   endian)
+    CONFIG_ENDIAN_BIG - define if big endian (default is little
+       endian)
 
-	CONFIG_DRAM_SIZE - Describes the installed DRAM (CPU SRAM in this case):
+    CONFIG_DRAM_SIZE - Describes the installed DRAM (CPU SRAM in this case):
 
-	   CONFIG_DRAM_SIZE=(32*1024) (32Kb)
+       CONFIG_DRAM_SIZE=(32*1024) (32Kb)
 
-	   There is an additional 32Kb of SRAM in AHB SRAM banks 0 and 1.
+       There is an additional 32Kb of SRAM in AHB SRAM banks 0 and 1.
 
-	CONFIG_DRAM_START - The start address of installed DRAM
+    CONFIG_DRAM_START - The start address of installed DRAM
 
-	   CONFIG_DRAM_START=0x10000000
+       CONFIG_DRAM_START=0x10000000
 
-	CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization
+    CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization
 
-	   CONFIG_ARCH_IRQPRIO=y
+       CONFIG_ARCH_IRQPRIO=y
 
-	CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
-	   have LEDs
+    CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
+       have LEDs
 
-	CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
-	   stack. If defined, this symbol is the size of the interrupt
-	    stack in bytes.  If not defined, the user task stacks will be
-	  used during interrupt handling.
+    CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
+       stack. If defined, this symbol is the size of the interrupt
+        stack in bytes.  If not defined, the user task stacks will be
+      used during interrupt handling.
 
-	CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
+    CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 
-	CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
+    CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
 
-	CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
-	   cause a 100 second delay during boot-up.  This 100 second delay
-	   serves no purpose other than it allows you to calibratre
-	   CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
-	   the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
-	   the delay actually is 100 seconds.
+    CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
+       cause a 100 second delay during boot-up.  This 100 second delay
+       serves no purpose other than it allows you to calibratre
+       CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
+       the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
+       the delay actually is 100 seconds.
 
-	Individual subsystems can be enabled:
-	  CONFIG_LPC17_MAINOSC=y
-	  CONFIG_LPC17_PLL0=y
-	  CONFIG_LPC17_PLL1=n
-	  CONFIG_LPC17_ETHERNET=n
-	  CONFIG_LPC17_USBHOST=n
-	  CONFIG_LPC17_USBOTG=n
-	  CONFIG_LPC17_USBDEV=n
-	  CONFIG_LPC17_UART0=y
-	  CONFIG_LPC17_UART1=n
-	  CONFIG_LPC17_UART2=n
-	  CONFIG_LPC17_UART3=n
-	  CONFIG_LPC17_CAN1=n
-	  CONFIG_LPC17_CAN2=n
-	  CONFIG_LPC17_SPI=n
-	  CONFIG_LPC17_SSP0=n
-	  CONFIG_LPC17_SSP1=n
-	  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_PWM=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
-	  CONFIG_LPC17_FLASH=n
+    Individual subsystems can be enabled:
+      CONFIG_LPC17_MAINOSC=y
+      CONFIG_LPC17_PLL0=y
+      CONFIG_LPC17_PLL1=n
+      CONFIG_LPC17_ETHERNET=n
+      CONFIG_LPC17_USBHOST=n
+      CONFIG_LPC17_USBOTG=n
+      CONFIG_LPC17_USBDEV=n
+      CONFIG_LPC17_UART0=y
+      CONFIG_LPC17_UART1=n
+      CONFIG_LPC17_UART2=n
+      CONFIG_LPC17_UART3=n
+      CONFIG_LPC17_CAN1=n
+      CONFIG_LPC17_CAN2=n
+      CONFIG_LPC17_SPI=n
+      CONFIG_LPC17_SSP0=n
+      CONFIG_LPC17_SSP1=n
+      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_PWM=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
+      CONFIG_LPC17_FLASH=n
 
   LPC17xx specific device driver settings
 
-	CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the
-	   console and ttys0 (default is the UART0).
-	CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received.
-	   This specific the size of the receive buffer
-	CONFIG_UARTn_TXBUFSIZE - Characters are buffered before
-	   being sent.  This specific the size of the transmit buffer
-	CONFIG_UARTn_BAUD - The configure BAUD of the UART.  Must be
-	CONFIG_UARTn_BITS - The number of bits.  Must be either 7 or 8.
-	CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
-	CONFIG_UARTn_2STOP - Two stop bits
+    CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the
+       console and ttys0 (default is the UART0).
+    CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received.
+       This specific the size of the receive buffer
+    CONFIG_UARTn_TXBUFSIZE - Characters are buffered before
+       being sent.  This specific the size of the transmit buffer
+    CONFIG_UARTn_BAUD - The configure BAUD of the UART.  Must be
+    CONFIG_UARTn_BITS - The number of bits.  Must be either 7 or 8.
+    CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
+    CONFIG_UARTn_2STOP - Two stop bits
 
   LPC17xx specific CAN device driver settings.  These settings all
   require CONFIG_CAN:
 
-	CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
-	  Standard 11-bit IDs.
-	CONFIG_CAN1_BAUD - CAN1 BAUD rate.  Required if CONFIG_LPC17_CAN1 is defined.
-	CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_LPC17_CAN2 is defined.
-	CONFIG_CAN1_DIVISOR - CAN1 is clocked at CCLK divided by this number.
-	  (the CCLK frequency is divided by this number to get the CAN clock).
-	  Options = {1,2,4,6}. Default: 4.
-	CONFIG_CAN2_DIVISOR - CAN2 is clocked at CCLK divided by this number.
-	  (the CCLK frequency is divided by this number to get the CAN clock).
-	  Options = {1,2,4,6}. Default: 4.
-	CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
-	CONFIG_CAN_TSEG2 = the number of CAN time quanta in segment 2. Default: 7
+    CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
+      Standard 11-bit IDs.
+    CONFIG_CAN1_BAUD - CAN1 BAUD rate.  Required if CONFIG_LPC17_CAN1 is defined.
+    CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_LPC17_CAN2 is defined.
+    CONFIG_CAN1_DIVISOR - CAN1 is clocked at CCLK divided by this number.
+      (the CCLK frequency is divided by this number to get the CAN clock).
+      Options = {1,2,4,6}. Default: 4.
+    CONFIG_CAN2_DIVISOR - CAN2 is clocked at CCLK divided by this number.
+      (the CCLK frequency is divided by this number to get the CAN clock).
+      Options = {1,2,4,6}. Default: 4.
+    CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
+    CONFIG_CAN_TSEG2 = the number of CAN time quanta in segment 2. Default: 7
 
   LPC17xx specific PHY/Ethernet device driver settings.  These setting
   also require CONFIG_NET and CONFIG_LPC17_ETHERNET.
 
-	CONFIG_PHY_KS8721 - Selects Micrel KS8721 PHY
-	CONFIG_PHY_AUTONEG - Enable auto-negotion
-	CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed.
-	CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex
+    CONFIG_PHY_KS8721 - Selects Micrel KS8721 PHY
+    CONFIG_PHY_AUTONEG - Enable auto-negotion
+    CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed.
+    CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex
 
     CONFIG_NET_EMACRAM_SIZE - Size of EMAC RAM.  Default: 16Kb
-	CONFIG_NET_NTXDESC - Configured number of Tx descriptors. Default: 18
-	CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18
-	CONFIG_NET_PRIORITY - Ethernet interrupt priority.  The is default is
-	  the higest priority.
-	CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
-	CONFIG_NET_REGDEBUG - Enabled low level register debug.  Also needs
-	  CONFIG_DEBUG.
-	CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
-	  Also needs CONFIG_DEBUG.
-	CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
-	CONFIG_NET_MULTICAST - Enable receipt of multicast (and unicast) frames.
+    CONFIG_NET_NTXDESC - Configured number of Tx descriptors. Default: 18
+    CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18
+    CONFIG_NET_PRIORITY - Ethernet interrupt priority.  The is default is
+      the higest priority.
+    CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
+    CONFIG_NET_REGDEBUG - Enabled low level register debug.  Also needs
+      CONFIG_DEBUG.
+    CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
+      Also needs CONFIG_DEBUG.
+    CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
+    CONFIG_NET_MULTICAST - Enable receipt of multicast (and unicast) frames.
       Automatically set if CONFIG_NET_IGMP is selected.
 
   LPC17xx USB Device Configuration
 
-	CONFIG_LPC17_USBDEV_FRAME_INTERRUPT
-	  Handle USB Start-Of-Frame events. 
-	  Enable reading SOF from interrupt handler vs. simply reading on demand.
-	  Probably a bad idea... Unless there is some issue with sampling the SOF
-	  from hardware asynchronously.
-	CONFIG_LPC17_USBDEV_EPFAST_INTERRUPT
-	  Enable high priority interrupts.  I have no idea why you might want to
-	  do that
-	CONFIG_LPC17_USBDEV_NDMADESCRIPTORS
-	  Number of DMA descriptors to allocate in SRAM.
-	CONFIG_LPC17_USBDEV_DMA
-	  Enable lpc17xx-specific DMA support
+    CONFIG_LPC17_USBDEV_FRAME_INTERRUPT
+      Handle USB Start-Of-Frame events. 
+      Enable reading SOF from interrupt handler vs. simply reading on demand.
+      Probably a bad idea... Unless there is some issue with sampling the SOF
+      from hardware asynchronously.
+    CONFIG_LPC17_USBDEV_EPFAST_INTERRUPT
+      Enable high priority interrupts.  I have no idea why you might want to
+      do that
+    CONFIG_LPC17_USBDEV_NDMADESCRIPTORS
+      Number of DMA descriptors to allocate in SRAM.
+    CONFIG_LPC17_USBDEV_DMA
+      Enable lpc17xx-specific DMA support
     CONFIG_LPC17_USBDEV_NOVBUS
       Define if the hardware implementation does not support the VBUS signal
     CONFIG_LPC17_USBDEV_NOLED
@@ -425,10 +475,10 @@ Configurations
 Each Lincoln 60 configuration is maintained in a sudirectory and can be selected
 as follow:
 
-	cd tools
-	./configure.sh lincoln60/<subdir>
-	cd -
-	. ./setenv.sh
+    cd tools
+    ./configure.sh lincoln60/<subdir>
+    cd -
+    . ./setenv.sh
 
 Where <subdir> is one of the following:
 
diff --git a/nuttx/configs/lm3s6432-s2e/README.txt b/nuttx/configs/lm3s6432-s2e/README.txt
index 2266e99e25..10ceda15ac 100644
--- a/nuttx/configs/lm3s6432-s2e/README.txt
+++ b/nuttx/configs/lm3s6432-s2e/README.txt
@@ -11,7 +11,9 @@ Contents
   Development Environment
   GNU Toolchain Options
   IDEs
-  NuttX buildroot Toolchain
+  NuttX EABI "buildroot" Toolchain
+  NuttX OABI "buildroot" Toolchain
+  NXFLFAT Toolchain
   Stellaris MDL-S2E Reference Design Configuration Options
   Configurations
 
@@ -176,8 +178,8 @@ IDEs
   Startup files will probably cause you some headaches.  The NuttX startup file
   is arch/arm/src/lm3s/lm3s_vectors.S.
 
-NuttX buildroot Toolchain
-^^^^^^^^^^^^^^^^^^^^^^^^^
+NuttX EABI "buildroot" Toolchain
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
   A GNU GCC-based toolchain is assumed.  The files */setenv.sh should
   be modified to point to the correct path to the Cortex-M3 GCC toolchain (if
@@ -204,7 +206,7 @@ NuttX buildroot Toolchain
 
   4. cd <some-dir>/buildroot
 
-  5. cp configs/cortexm3-defconfig-4.3.3 .config
+  5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config
 
   6. make oldconfig
 
@@ -214,142 +216,189 @@ NuttX buildroot Toolchain
      the path to the newly built binaries.
 
   See the file configs/README.txt in the buildroot source tree.  That has more
-  detailed PLUS some special instructions that you will need to follow if you
+  details PLUS some special instructions that you will need to follow if you
   are building a Cortex-M3 toolchain for Cygwin under Windows.
 
-  NOTE: This is an OABI toolchain.
+NuttX OABI "buildroot" Toolchain
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+  The older, OABI buildroot toolchain is also available.  To use the OABI
+  toolchain:
+
+  1. When building the buildroot toolchain, either (1) modify the cortexm3-eabi-defconfig-4.6.3
+     configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
+     configuration such as cortexm3-defconfig-4.3.3
+
+  2. Modify the Make.defs file to use the OABI converntions:
+
+    +CROSSDEV = arm-nuttx-elf-
+    +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    -CROSSDEV = arm-nuttx-eabi-
+    -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+
+NXFLAT Toolchain
+^^^^^^^^^^^^^^^^
+
+  If you are *not* using the NuttX buildroot toolchain and you want to use
+  the NXFLAT tools, then you will still have to build a portion of the buildroot
+  tools -- just the NXFLAT tools.  The buildroot with the NXFLAT tools can
+  be downloaded from the NuttX SourceForge download site
+  (https://sourceforge.net/projects/nuttx/files/).
+ 
+  This GNU toolchain builds and executes in the Linux or Cygwin environment.
+
+  1. You must have already configured Nuttx in <some-dir>/nuttx.
+
+     cd tools
+     ./configure.sh lpcxpresso-lpc1768/<sub-dir>
+
+  2. Download the latest buildroot package into <some-dir>
+
+  3. unpack the buildroot tarball.  The resulting directory may
+     have versioning information on it like buildroot-x.y.z.  If so,
+     rename <some-dir>/buildroot-x.y.z to <some-dir>/buildroot.
+
+  4. cd <some-dir>/buildroot
+
+  5. cp configs/cortexm3-defconfig-nxflat .config
+
+  6. make oldconfig
+
+  7. make
+
+  8. Edit setenv.h, if necessary, so that the PATH variable includes
+     the path to the newly builtNXFLAT binaries.
 
 Stellaris MDL-S2E Reference Design Configuration Options
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-	CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
-	   be set to:
+    CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
+       be set to:
 
-	   CONFIG_ARCH=arm
+       CONFIG_ARCH=arm
 
-	CONFIG_ARCH_family - For use in C code:
+    CONFIG_ARCH_family - For use in C code:
 
-	   CONFIG_ARCH_ARM=y
+       CONFIG_ARCH_ARM=y
 
-	CONFIG_ARCH_architecture - For use in C code:
+    CONFIG_ARCH_architecture - For use in C code:
 
-	   CONFIG_ARCH_CORTEXM3=y
+       CONFIG_ARCH_CORTEXM3=y
 
-	CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
+    CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
-	   CONFIG_ARCH_CHIP=lm3s
+       CONFIG_ARCH_CHIP=lm3s
 
-	CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
-	   chip:
+    CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
+       chip:
 
-	   CONFIG_ARCH_CHIP_LM3S6432
+       CONFIG_ARCH_CHIP_LM3S6432
 
-	CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
-	   hence, the board that supports the particular chip or SoC.
+    CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
+       hence, the board that supports the particular chip or SoC.
 
-	   CONFIG_ARCH_BOARD=lm3s6432-s2e (for the Stellaris MDL-S2E Reference Design)
+       CONFIG_ARCH_BOARD=lm3s6432-s2e (for the Stellaris MDL-S2E Reference Design)
 
-	CONFIG_ARCH_BOARD_name - For use in C code
+    CONFIG_ARCH_BOARD_name - For use in C code
 
-	   CONFIG_ARCH_BOARD_LM3S6432S2E
+       CONFIG_ARCH_BOARD_LM3S6432S2E
 
-	CONFIG_ARCH_LOOPSPERMSEC - As supplied, calibrated for correct operation
-	   of delay loops assuming 50MHz CPU frequency.
+    CONFIG_ARCH_LOOPSPERMSEC - As supplied, calibrated for correct operation
+       of delay loops assuming 50MHz CPU frequency.
 
-	CONFIG_ENDIAN_BIG - define if big endian (default is little
-	   endian)
+    CONFIG_ENDIAN_BIG - define if big endian (default is little
+       endian)
 
-	CONFIG_DRAM_SIZE - Describes the installed DRAM (SRAM in this case):
+    CONFIG_DRAM_SIZE - Describes the installed DRAM (SRAM in this case):
 
-	   CONFIG_DRAM_SIZE=0x00010000 (64Kb)
+       CONFIG_DRAM_SIZE=0x00010000 (64Kb)
 
-	CONFIG_DRAM_START - The start address of installed DRAM
+    CONFIG_DRAM_START - The start address of installed DRAM
 
-	   CONFIG_DRAM_START=0x20000000
+       CONFIG_DRAM_START=0x20000000
 
-	CONFIG_ARCH_IRQPRIO - The LM3S6918 supports interrupt prioritization
+    CONFIG_ARCH_IRQPRIO - The LM3S6918 supports interrupt prioritization
 
-	   CONFIG_ARCH_IRQPRIO=y
+       CONFIG_ARCH_IRQPRIO=y
 
-	CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
-	   have LEDs
+    CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
+       have LEDs
 
-	CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
-	   stack. If defined, this symbol is the size of the interrupt
-	    stack in bytes.  If not defined, the user task stacks will be
-	  used during interrupt handling.
+    CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
+       stack. If defined, this symbol is the size of the interrupt
+        stack in bytes.  If not defined, the user task stacks will be
+      used during interrupt handling.
 
-	CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
+    CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 
-	CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
+    CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
 
-	CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
-	   cause a 100 second delay during boot-up.  This 100 second delay
-	   serves no purpose other than it allows you to calibratre
-	   CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
-	   the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
-	   the delay actually is 100 seconds.
+    CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
+       cause a 100 second delay during boot-up.  This 100 second delay
+       serves no purpose other than it allows you to calibratre
+       CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
+       the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
+       the delay actually is 100 seconds.
 
   There are configurations for disabling support for interrupts GPIO ports.
   GPIOH and GPIOJ must be disabled because they do not exist on the LM3S6432.
   Additional interrupt support can be disabled if desired to reduce memory
   footprint - GPIOs C-G are not pinned out on the MDL-S2E board.
 
-	CONFIG_LM3S_DISABLE_GPIOA_IRQS=n
-	CONFIG_LM3S_DISABLE_GPIOB_IRQS=n
-	CONFIG_LM3S_DISABLE_GPIOC_IRQS=y
-	CONFIG_LM3S_DISABLE_GPIOD_IRQS=y
-	CONFIG_LM3S_DISABLE_GPIOE_IRQS=y
-	CONFIG_LM3S_DISABLE_GPIOF_IRQS=y
-	CONFIG_LM3S_DISABLE_GPIOG_IRQS=y
-	CONFIG_LM3S_DISABLE_GPIOH_IRQS=y
-	CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
+    CONFIG_LM3S_DISABLE_GPIOA_IRQS=n
+    CONFIG_LM3S_DISABLE_GPIOB_IRQS=n
+    CONFIG_LM3S_DISABLE_GPIOC_IRQS=y
+    CONFIG_LM3S_DISABLE_GPIOD_IRQS=y
+    CONFIG_LM3S_DISABLE_GPIOE_IRQS=y
+    CONFIG_LM3S_DISABLE_GPIOF_IRQS=y
+    CONFIG_LM3S_DISABLE_GPIOG_IRQS=y
+    CONFIG_LM3S_DISABLE_GPIOH_IRQS=y
+    CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
  
   LM3S6432 specific device driver settings
 
-	CONFIG_UARTn_DISABLE
-	   The TX and RX pins for UART1 share I/O pins with the TX and RX pins
-	   for SSI0.  To avoid conflicts, only one of SSI0 and UART1 should
-	   be enabled in a configuration.
-	CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the
-	   console and ttys0 (default is UART1).
-	CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received.
-	   This specific the size of the receive buffer
-	CONFIG_UARTn_TXBUFSIZE - Characters are buffered before
-	   being sent.  This specific the size of the transmit buffer
-	CONFIG_UARTn_BAUD - The configure BAUD of the UART.  Must be
-	CONFIG_UARTn_BITS - The number of bits.  Must be either 7 or 8.
-	CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
-	CONFIG_UARTn_2STOP - Two stop bits
+    CONFIG_UARTn_DISABLE
+       The TX and RX pins for UART1 share I/O pins with the TX and RX pins
+       for SSI0.  To avoid conflicts, only one of SSI0 and UART1 should
+       be enabled in a configuration.
+    CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the
+       console and ttys0 (default is UART1).
+    CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received.
+       This specific the size of the receive buffer
+    CONFIG_UARTn_TXBUFSIZE - Characters are buffered before
+       being sent.  This specific the size of the transmit buffer
+    CONFIG_UARTn_BAUD - The configure BAUD of the UART.  Must be
+    CONFIG_UARTn_BITS - The number of bits.  Must be either 7 or 8.
+    CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
+    CONFIG_UARTn_2STOP - Two stop bits
 
-	CONFIG_SSI0_DISABLE - Select to disable support for SSI0
-	  The TX and RX pins for SSI0 share I/O pins with the TX and RX pins
-	  for UART1.  To avoid conflicts, only one of SSI0 and UART1 should
-	  be enabled in a configuration.
-	CONFIG_SSI1_DISABLE - Select to disable support for SSI1
-	  Note that the LM3S6432 only has one SSI, so SSI1 should always be
-	  disabled.
-	CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support.
-	  Poll-waiting is recommended if the interrupt rate would be to
-	  high in the interrupt driven case.
-	CONFIG_SSI_TXLIMIT - Write this many words to the Tx FIFO before
-	  emptying the Rx FIFO.  If the SPI frequency is high and this
-	  value is large, then larger values of this setting may cause
-	  Rx FIFO overrun errors.  Default: half of the Tx FIFO size (4).
+    CONFIG_SSI0_DISABLE - Select to disable support for SSI0
+      The TX and RX pins for SSI0 share I/O pins with the TX and RX pins
+      for UART1.  To avoid conflicts, only one of SSI0 and UART1 should
+      be enabled in a configuration.
+    CONFIG_SSI1_DISABLE - Select to disable support for SSI1
+      Note that the LM3S6432 only has one SSI, so SSI1 should always be
+      disabled.
+    CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support.
+      Poll-waiting is recommended if the interrupt rate would be to
+      high in the interrupt driven case.
+    CONFIG_SSI_TXLIMIT - Write this many words to the Tx FIFO before
+      emptying the Rx FIFO.  If the SPI frequency is high and this
+      value is large, then larger values of this setting may cause
+      Rx FIFO overrun errors.  Default: half of the Tx FIFO size (4).
 
-	CONFIG_LM3S_ETHERNET - This must be set (along with CONFIG_NET)
-	  to build the LM3S Ethernet driver
-	CONFIG_LM3S_ETHLEDS - Enable to use Ethernet LEDs on the board.
-	CONFIG_LM3S_BOARDMAC - This should be set in order to use the
-	  MAC address configured in the flash USER registers.
-	CONFIG_LM3S_ETHHDUPLEX - Set to force half duplex operation
-	CONFIG_LM3S_ETHNOAUTOCRC - Set to suppress auto-CRC generation
-	CONFIG_LM3S_ETHNOPAD - Set to suppress Tx padding
-	CONFIG_LM3S_MULTICAST - Set to enable multicast frames
-	CONFIG_LM3S_PROMISCUOUS - Set to enable promiscuous mode
-	CONFIG_LM3S_BADCRC - Set to enable bad CRC rejection.
-	CONFIG_LM3S_DUMPPACKET - Dump each packet received/sent to the console.
+    CONFIG_LM3S_ETHERNET - This must be set (along with CONFIG_NET)
+      to build the LM3S Ethernet driver
+    CONFIG_LM3S_ETHLEDS - Enable to use Ethernet LEDs on the board.
+    CONFIG_LM3S_BOARDMAC - This should be set in order to use the
+      MAC address configured in the flash USER registers.
+    CONFIG_LM3S_ETHHDUPLEX - Set to force half duplex operation
+    CONFIG_LM3S_ETHNOAUTOCRC - Set to suppress auto-CRC generation
+    CONFIG_LM3S_ETHNOPAD - Set to suppress Tx padding
+    CONFIG_LM3S_MULTICAST - Set to enable multicast frames
+    CONFIG_LM3S_PROMISCUOUS - Set to enable promiscuous mode
+    CONFIG_LM3S_BADCRC - Set to enable bad CRC rejection.
+    CONFIG_LM3S_DUMPPACKET - Dump each packet received/sent to the console.
 
 Configurations
 ^^^^^^^^^^^^^^
@@ -357,10 +406,10 @@ Configurations
 Each Stellaris MDL-S2E Reference Design configuration is maintained in a
 sudirectory and can be selected as follow:
 
-	cd tools
-	./configure.sh lm3s6432-s2e/<subdir>
-	cd -
-	. ./setenv.sh
+    cd tools
+    ./configure.sh lm3s6432-s2e/<subdir>
+    cd -
+    . ./setenv.sh
 
 Where <subdir> is one of the following:
 
diff --git a/nuttx/configs/lm3s6965-ek/README.txt b/nuttx/configs/lm3s6965-ek/README.txt
index fa0d1dad85..fc70b75fc0 100644
--- a/nuttx/configs/lm3s6965-ek/README.txt
+++ b/nuttx/configs/lm3s6965-ek/README.txt
@@ -10,7 +10,9 @@ Contents
   Development Environment
   GNU Toolchain Options
   IDEs
-  NuttX buildroot Toolchain
+  NuttX EABI "buildroot" Toolchain
+  NuttX OABI "buildroot" Toolchain
+  NXFLAT Toolchain
   USB Device Controller Functions
   OLED
   Stellaris LM3S6965 Evaluation Kit Configuration Options
@@ -210,8 +212,8 @@ IDEs
   Startup files will probably cause you some headaches.  The NuttX startup file
   is arch/arm/src/lm3s/lm3s_vectors.S.
 
-NuttX buildroot Toolchain
-^^^^^^^^^^^^^^^^^^^^^^^^^
+NuttX EABI "buildroot" Toolchain
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
   A GNU GCC-based toolchain is assumed.  The files */setenv.sh should
   be modified to point to the correct path to the Cortex-M3 GCC toolchain (if
@@ -234,7 +236,7 @@ NuttX buildroot Toolchain
 
   4. cd <some-dir>/buildroot
 
-  5. cp configs/cortexm3-defconfig-4.3.3 .config
+  5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config
 
   6. make oldconfig
 
@@ -244,11 +246,61 @@ NuttX buildroot Toolchain
      the path to the newly built binaries.
 
   See the file configs/README.txt in the buildroot source tree.  That has more
-  detailed PLUS some special instructions that you will need to follow if you
+  details PLUS some special instructions that you will need to follow if you
   are building a Cortex-M3 toolchain for Cygwin under Windows.
 
   NOTE: This is an OABI toolchain.
 
+NuttX OABI "buildroot" Toolchain
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+  The older, OABI buildroot toolchain is also available.  To use the OABI
+  toolchain:
+
+  1. When building the buildroot toolchain, either (1) modify the cortexm3-eabi-defconfig-4.6.3
+     configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
+     configuration such as cortexm3-defconfig-4.3.3
+
+  2. Modify the Make.defs file to use the OABI converntions:
+
+    +CROSSDEV = arm-nuttx-elf-
+    +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    -CROSSDEV = arm-nuttx-eabi-
+    -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+
+NXFLAT Toolchain
+^^^^^^^^^^^^^^^^
+
+  If you are *not* using the NuttX buildroot toolchain and you want to use
+  the NXFLAT tools, then you will still have to build a portion of the buildroot
+  tools -- just the NXFLAT tools.  The buildroot with the NXFLAT tools can
+  be downloaded from the NuttX SourceForge download site
+  (https://sourceforge.net/projects/nuttx/files/).
+ 
+  This GNU toolchain builds and executes in the Linux or Cygwin environment.
+
+  1. You must have already configured Nuttx in <some-dir>/nuttx.
+
+     cd tools
+     ./configure.sh lpcxpresso-lpc1768/<sub-dir>
+
+  2. Download the latest buildroot package into <some-dir>
+
+  3. unpack the buildroot tarball.  The resulting directory may
+     have versioning information on it like buildroot-x.y.z.  If so,
+     rename <some-dir>/buildroot-x.y.z to <some-dir>/buildroot.
+
+  4. cd <some-dir>/buildroot
+
+  5. cp configs/cortexm3-defconfig-nxflat .config
+
+  6. make oldconfig
+
+  7. make
+
+  8. Edit setenv.h, if necessary, so that the PATH variable includes
+     the path to the newly builtNXFLAT binaries.
+
 USB Device Controller Functions
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -291,124 +343,124 @@ USB Device Controller Functions
 Stellaris LM3S6965 Evaluation Kit Configuration Options
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-	CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
-	   be set to:
+    CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
+       be set to:
 
-	   CONFIG_ARCH=arm
+       CONFIG_ARCH=arm
 
-	CONFIG_ARCH_family - For use in C code:
+    CONFIG_ARCH_family - For use in C code:
 
-	   CONFIG_ARCH_ARM=y
+       CONFIG_ARCH_ARM=y
 
-	CONFIG_ARCH_architecture - For use in C code:
+    CONFIG_ARCH_architecture - For use in C code:
 
-	   CONFIG_ARCH_CORTEXM3=y
+       CONFIG_ARCH_CORTEXM3=y
 
-	CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
+    CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
-	   CONFIG_ARCH_CHIP=lm3s
+       CONFIG_ARCH_CHIP=lm3s
 
-	CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
-	   chip:
+    CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
+       chip:
 
-	   CONFIG_ARCH_CHIP_LM3S6965
+       CONFIG_ARCH_CHIP_LM3S6965
 
-	CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
-	   hence, the board that supports the particular chip or SoC.
+    CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
+       hence, the board that supports the particular chip or SoC.
 
-	   CONFIG_ARCH_BOARD=lm3s6965-ek (for the Stellaris LM3S6965 Evaluation Kit)
+       CONFIG_ARCH_BOARD=lm3s6965-ek (for the Stellaris LM3S6965 Evaluation Kit)
 
-	CONFIG_ARCH_BOARD_name - For use in C code
+    CONFIG_ARCH_BOARD_name - For use in C code
 
-	   CONFIG_ARCH_BOARD_LM3S6965EK
+       CONFIG_ARCH_BOARD_LM3S6965EK
 
-	CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
-	   of delay loops
+    CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
+       of delay loops
 
-	CONFIG_ENDIAN_BIG - define if big endian (default is little
-	   endian)
+    CONFIG_ENDIAN_BIG - define if big endian (default is little
+       endian)
 
-	CONFIG_DRAM_SIZE - Describes the installed DRAM (SRAM in this case):
+    CONFIG_DRAM_SIZE - Describes the installed DRAM (SRAM in this case):
 
-	   CONFIG_DRAM_SIZE=0x00010000 (64Kb)
+       CONFIG_DRAM_SIZE=0x00010000 (64Kb)
 
-	CONFIG_DRAM_START - The start address of installed DRAM
+    CONFIG_DRAM_START - The start address of installed DRAM
 
-	   CONFIG_DRAM_START=0x20000000
+       CONFIG_DRAM_START=0x20000000
 
-	CONFIG_ARCH_IRQPRIO - The LM3S6918 supports interrupt prioritization
+    CONFIG_ARCH_IRQPRIO - The LM3S6918 supports interrupt prioritization
 
-	   CONFIG_ARCH_IRQPRIO=y
+       CONFIG_ARCH_IRQPRIO=y
 
-	CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
-	   have LEDs
+    CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
+       have LEDs
 
-	CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
-	   stack. If defined, this symbol is the size of the interrupt
-	    stack in bytes.  If not defined, the user task stacks will be
-	  used during interrupt handling.
+    CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
+       stack. If defined, this symbol is the size of the interrupt
+        stack in bytes.  If not defined, the user task stacks will be
+      used during interrupt handling.
 
-	CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
+    CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 
-	CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
+    CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
 
-	CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
-	   cause a 100 second delay during boot-up.  This 100 second delay
-	   serves no purpose other than it allows you to calibratre
-	   CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
-	   the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
-	   the delay actually is 100 seconds.
+    CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
+       cause a 100 second delay during boot-up.  This 100 second delay
+       serves no purpose other than it allows you to calibratre
+       CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
+       the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
+       the delay actually is 100 seconds.
 
   There are configurations for disabling support for interrupts GPIO ports.
   GPIOJ must be disabled because it does not exist on the LM3S6918.
   Additional interrupt support can be disabled if desired to reduce memory
   footprint.
 
-	CONFIG_LM3S_DISABLE_GPIOA_IRQS=n
-	CONFIG_LM3S_DISABLE_GPIOB_IRQS=n
-	CONFIG_LM3S_DISABLE_GPIOC_IRQS=n
-	CONFIG_LM3S_DISABLE_GPIOD_IRQS=n
-	CONFIG_LM3S_DISABLE_GPIOE_IRQS=n
-	CONFIG_LM3S_DISABLE_GPIOF_IRQS=n
-	CONFIG_LM3S_DISABLE_GPIOG_IRQS=n
-	CONFIG_LM3S_DISABLE_GPIOH_IRQS=n
-	CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
+    CONFIG_LM3S_DISABLE_GPIOA_IRQS=n
+    CONFIG_LM3S_DISABLE_GPIOB_IRQS=n
+    CONFIG_LM3S_DISABLE_GPIOC_IRQS=n
+    CONFIG_LM3S_DISABLE_GPIOD_IRQS=n
+    CONFIG_LM3S_DISABLE_GPIOE_IRQS=n
+    CONFIG_LM3S_DISABLE_GPIOF_IRQS=n
+    CONFIG_LM3S_DISABLE_GPIOG_IRQS=n
+    CONFIG_LM3S_DISABLE_GPIOH_IRQS=n
+    CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
  
   LM3S6818 specific device driver settings
 
-	CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the
-	   console and ttys0 (default is the UART0).
-	CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received.
-	   This specific the size of the receive buffer
-	CONFIG_UARTn_TXBUFSIZE - Characters are buffered before
-	   being sent.  This specific the size of the transmit buffer
-	CONFIG_UARTn_BAUD - The configure BAUD of the UART.  Must be
-	CONFIG_UARTn_BITS - The number of bits.  Must be either 7 or 8.
-	CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
-	CONFIG_UARTn_2STOP - Two stop bits
+    CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the
+       console and ttys0 (default is the UART0).
+    CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received.
+       This specific the size of the receive buffer
+    CONFIG_UARTn_TXBUFSIZE - Characters are buffered before
+       being sent.  This specific the size of the transmit buffer
+    CONFIG_UARTn_BAUD - The configure BAUD of the UART.  Must be
+    CONFIG_UARTn_BITS - The number of bits.  Must be either 7 or 8.
+    CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
+    CONFIG_UARTn_2STOP - Two stop bits
 
-	CONFIG_SSI0_DISABLE - Select to disable support for SSI0
-	CONFIG_SSI1_DISABLE - Select to disable support for SSI1
-	CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support.
-	  Poll-waiting is recommended if the interrupt rate would be to
-	  high in the interrupt driven case.
-	CONFIG_SSI_TXLIMIT - Write this many words to the Tx FIFO before
-	  emptying the Rx FIFO.  If the SPI frequency is high and this
-	  value is large, then larger values of this setting may cause
-	  Rx FIFO overrun errors.  Default: half of the Tx FIFO size (4).
+    CONFIG_SSI0_DISABLE - Select to disable support for SSI0
+    CONFIG_SSI1_DISABLE - Select to disable support for SSI1
+    CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support.
+      Poll-waiting is recommended if the interrupt rate would be to
+      high in the interrupt driven case.
+    CONFIG_SSI_TXLIMIT - Write this many words to the Tx FIFO before
+      emptying the Rx FIFO.  If the SPI frequency is high and this
+      value is large, then larger values of this setting may cause
+      Rx FIFO overrun errors.  Default: half of the Tx FIFO size (4).
 
-	CONFIG_LM3S_ETHERNET - This must be set (along with CONFIG_NET)
-	  to build the LM3S Ethernet driver
-	CONFIG_LM3S_ETHLEDS - Enable to use Ethernet LEDs on the board.
-	CONFIG_LM3S_BOARDMAC - If the board-specific logic can provide
-	  a MAC address (via lm3s_ethernetmac()), then this should be selected.
-	CONFIG_LM3S_ETHHDUPLEX - Set to force half duplex operation
-	CONFIG_LM3S_ETHNOAUTOCRC - Set to suppress auto-CRC generation
-	CONFIG_LM3S_ETHNOPAD - Set to suppress Tx padding
-	CONFIG_LM3S_MULTICAST - Set to enable multicast frames
-	CONFIG_LM3S_PROMISCUOUS - Set to enable promiscuous mode
-	CONFIG_LM3S_BADCRC - Set to enable bad CRC rejection.
-	CONFIG_LM3S_DUMPPACKET - Dump each packet received/sent to the console.
+    CONFIG_LM3S_ETHERNET - This must be set (along with CONFIG_NET)
+      to build the LM3S Ethernet driver
+    CONFIG_LM3S_ETHLEDS - Enable to use Ethernet LEDs on the board.
+    CONFIG_LM3S_BOARDMAC - If the board-specific logic can provide
+      a MAC address (via lm3s_ethernetmac()), then this should be selected.
+    CONFIG_LM3S_ETHHDUPLEX - Set to force half duplex operation
+    CONFIG_LM3S_ETHNOAUTOCRC - Set to suppress auto-CRC generation
+    CONFIG_LM3S_ETHNOPAD - Set to suppress Tx padding
+    CONFIG_LM3S_MULTICAST - Set to enable multicast frames
+    CONFIG_LM3S_PROMISCUOUS - Set to enable promiscuous mode
+    CONFIG_LM3S_BADCRC - Set to enable bad CRC rejection.
+    CONFIG_LM3S_DUMPPACKET - Dump each packet received/sent to the console.
 
 Configurations
 ^^^^^^^^^^^^^^
@@ -416,10 +468,10 @@ Configurations
 Each Stellaris LM3S6965 Evaluation Kit configuration is maintained in a
 sudirectory and can be selected as follow:
 
-	cd tools
-	./configure.sh lm3s6965-ek/<subdir>
-	cd -
-	. ./setenv.sh
+    cd tools
+    ./configure.sh lm3s6965-ek/<subdir>
+    cd -
+    . ./setenv.sh
 
 Where <subdir> is one of the following:
 
diff --git a/nuttx/configs/lm3s8962-ek/README.txt b/nuttx/configs/lm3s8962-ek/README.txt
index 6d6d17feed..043e5ceb38 100644
--- a/nuttx/configs/lm3s8962-ek/README.txt
+++ b/nuttx/configs/lm3s8962-ek/README.txt
@@ -10,7 +10,9 @@ Contents
   Development Environment
   GNU Toolchain Options
   IDEs
-  NuttX buildroot Toolchain
+  NuttX EABI "buildroot" Toolchain
+  NuttX OABI "buildroot" Toolchain
+  NXFLAT Toolchain
   USB Device Controller Functions
   OLED
   Stellaris LM3S8962 Evaluation Kit Configuration Options
@@ -194,8 +196,8 @@ IDEs
   Startup files will probably cause you some headaches.  The NuttX startup file
   is arch/arm/src/lm3s/lm3s_vectors.S.
 
-NuttX buildroot Toolchain
-^^^^^^^^^^^^^^^^^^^^^^^^^
+NuttX EABI "buildroot" Toolchain
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
   A GNU GCC-based toolchain is assumed.  The files */setenv.sh should
   be modified to point to the correct path to the Cortex-M3 GCC toolchain (if
@@ -218,7 +220,7 @@ NuttX buildroot Toolchain
 
   4. cd <some-dir>/buildroot
 
-  5. cp configs/cortexm3-defconfig-4.3.3 .config
+  5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config
 
   6. make oldconfig
 
@@ -228,11 +230,61 @@ NuttX buildroot Toolchain
      the path to the newly built binaries.
 
   See the file configs/README.txt in the buildroot source tree.  That has more
-  detailed PLUS some special instructions that you will need to follow if you
+  details PLUS some special instructions that you will need to follow if you
   are building a Cortex-M3 toolchain for Cygwin under Windows.
 
   NOTE: This is an OABI toolchain.
 
+NuttX OABI "buildroot" Toolchain
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+  The older, OABI buildroot toolchain is also available.  To use the OABI
+  toolchain:
+
+  1. When building the buildroot toolchain, either (1) modify the cortexm3-eabi-defconfig-4.6.3
+     configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
+     configuration such as cortexm3-defconfig-4.3.3
+
+  2. Modify the Make.defs file to use the OABI converntions:
+
+    +CROSSDEV = arm-nuttx-elf-
+    +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    -CROSSDEV = arm-nuttx-eabi-
+    -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+
+NXFLAT Toolchain
+^^^^^^^^^^^^^^^^
+
+  If you are *not* using the NuttX buildroot toolchain and you want to use
+  the NXFLAT tools, then you will still have to build a portion of the buildroot
+  tools -- just the NXFLAT tools.  The buildroot with the NXFLAT tools can
+  be downloaded from the NuttX SourceForge download site
+  (https://sourceforge.net/projects/nuttx/files/).
+ 
+  This GNU toolchain builds and executes in the Linux or Cygwin environment.
+
+  1. You must have already configured Nuttx in <some-dir>/nuttx.
+
+     cd tools
+     ./configure.sh lpcxpresso-lpc1768/<sub-dir>
+
+  2. Download the latest buildroot package into <some-dir>
+
+  3. unpack the buildroot tarball.  The resulting directory may
+     have versioning information on it like buildroot-x.y.z.  If so,
+     rename <some-dir>/buildroot-x.y.z to <some-dir>/buildroot.
+
+  4. cd <some-dir>/buildroot
+
+  5. cp configs/cortexm3-defconfig-nxflat .config
+
+  6. make oldconfig
+
+  7. make
+
+  8. Edit setenv.h, if necessary, so that the PATH variable includes
+     the path to the newly builtNXFLAT binaries.
+
 USB Device Controller Functions
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -275,124 +327,124 @@ USB Device Controller Functions
 Stellaris LM3S8962 Evaluation Kit Configuration Options
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-	CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
-	   be set to:
+    CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
+       be set to:
 
-	   CONFIG_ARCH=arm
+       CONFIG_ARCH=arm
 
-	CONFIG_ARCH_family - For use in C code:
+    CONFIG_ARCH_family - For use in C code:
 
-	   CONFIG_ARCH_ARM=y
+       CONFIG_ARCH_ARM=y
 
-	CONFIG_ARCH_architecture - For use in C code:
+    CONFIG_ARCH_architecture - For use in C code:
 
-	   CONFIG_ARCH_CORTEXM3=y
+       CONFIG_ARCH_CORTEXM3=y
 
-	CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
+    CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
-	   CONFIG_ARCH_CHIP=lm3s
+       CONFIG_ARCH_CHIP=lm3s
 
-	CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
-	   chip:
+    CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
+       chip:
 
-	   CONFIG_ARCH_CHIP_LM3S8962
+       CONFIG_ARCH_CHIP_LM3S8962
 
-	CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
-	   hence, the board that supports the particular chip or SoC.
+    CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
+       hence, the board that supports the particular chip or SoC.
 
-	   CONFIG_ARCH_BOARD=lm3s8962-ek (for the Stellaris LM3S8962 Evaluation Kit)
+       CONFIG_ARCH_BOARD=lm3s8962-ek (for the Stellaris LM3S8962 Evaluation Kit)
 
-	CONFIG_ARCH_BOARD_name - For use in C code
+    CONFIG_ARCH_BOARD_name - For use in C code
 
-	   CONFIG_ARCH_BOARD_LM3S8962EK
+       CONFIG_ARCH_BOARD_LM3S8962EK
 
-	CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
-	   of delay loops
+    CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
+       of delay loops
 
-	CONFIG_ENDIAN_BIG - define if big endian (default is little
-	   endian)
+    CONFIG_ENDIAN_BIG - define if big endian (default is little
+       endian)
 
-	CONFIG_DRAM_SIZE - Describes the installed DRAM (SRAM in this case):
+    CONFIG_DRAM_SIZE - Describes the installed DRAM (SRAM in this case):
 
-	   CONFIG_DRAM_SIZE=0x00010000 (64Kb)
+       CONFIG_DRAM_SIZE=0x00010000 (64Kb)
 
-	CONFIG_DRAM_START - The start address of installed DRAM
+    CONFIG_DRAM_START - The start address of installed DRAM
 
-	   CONFIG_DRAM_START=0x20000000
+       CONFIG_DRAM_START=0x20000000
 
-	CONFIG_ARCH_IRQPRIO - The LM3S6918 supports interrupt prioritization
+    CONFIG_ARCH_IRQPRIO - The LM3S6918 supports interrupt prioritization
 
-	   CONFIG_ARCH_IRQPRIO=y
+       CONFIG_ARCH_IRQPRIO=y
 
-	CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
-	   have LEDs
+    CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
+       have LEDs
 
-	CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
-	   stack. If defined, this symbol is the size of the interrupt
-	    stack in bytes.  If not defined, the user task stacks will be
-	  used during interrupt handling.
+    CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
+       stack. If defined, this symbol is the size of the interrupt
+        stack in bytes.  If not defined, the user task stacks will be
+      used during interrupt handling.
 
-	CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
+    CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 
-	CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
+    CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
 
-	CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
-	   cause a 100 second delay during boot-up.  This 100 second delay
-	   serves no purpose other than it allows you to calibratre
-	   CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
-	   the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
-	   the delay actually is 100 seconds.
+    CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
+       cause a 100 second delay during boot-up.  This 100 second delay
+       serves no purpose other than it allows you to calibratre
+       CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
+       the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
+       the delay actually is 100 seconds.
 
   There are configurations for disabling support for interrupts GPIO ports.
   GPIOJ must be disabled because it does not exist on the LM3S6918.
   Additional interrupt support can be disabled if desired to reduce memory
   footprint.
 
-	CONFIG_LM3S_DISABLE_GPIOA_IRQS=n
-	CONFIG_LM3S_DISABLE_GPIOB_IRQS=n
-	CONFIG_LM3S_DISABLE_GPIOC_IRQS=n
-	CONFIG_LM3S_DISABLE_GPIOD_IRQS=n
-	CONFIG_LM3S_DISABLE_GPIOE_IRQS=n
-	CONFIG_LM3S_DISABLE_GPIOF_IRQS=n
-	CONFIG_LM3S_DISABLE_GPIOG_IRQS=n
-	CONFIG_LM3S_DISABLE_GPIOH_IRQS=n
-	CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
+    CONFIG_LM3S_DISABLE_GPIOA_IRQS=n
+    CONFIG_LM3S_DISABLE_GPIOB_IRQS=n
+    CONFIG_LM3S_DISABLE_GPIOC_IRQS=n
+    CONFIG_LM3S_DISABLE_GPIOD_IRQS=n
+    CONFIG_LM3S_DISABLE_GPIOE_IRQS=n
+    CONFIG_LM3S_DISABLE_GPIOF_IRQS=n
+    CONFIG_LM3S_DISABLE_GPIOG_IRQS=n
+    CONFIG_LM3S_DISABLE_GPIOH_IRQS=n
+    CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
  
   LM3S6818 specific device driver settings
 
-	CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the
-	   console and ttys0 (default is the UART0).
-	CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received.
-	   This specific the size of the receive buffer
-	CONFIG_UARTn_TXBUFSIZE - Characters are buffered before
-	   being sent.  This specific the size of the transmit buffer
-	CONFIG_UARTn_BAUD - The configure BAUD of the UART.  Must be
-	CONFIG_UARTn_BITS - The number of bits.  Must be either 7 or 8.
-	CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
-	CONFIG_UARTn_2STOP - Two stop bits
+    CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the
+       console and ttys0 (default is the UART0).
+    CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received.
+       This specific the size of the receive buffer
+    CONFIG_UARTn_TXBUFSIZE - Characters are buffered before
+       being sent.  This specific the size of the transmit buffer
+    CONFIG_UARTn_BAUD - The configure BAUD of the UART.  Must be
+    CONFIG_UARTn_BITS - The number of bits.  Must be either 7 or 8.
+    CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
+    CONFIG_UARTn_2STOP - Two stop bits
 
-	CONFIG_SSI0_DISABLE - Select to disable support for SSI0
-	CONFIG_SSI1_DISABLE - Select to disable support for SSI1
-	CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support.
-	  Poll-waiting is recommended if the interrupt rate would be to
-	  high in the interrupt driven case.
-	CONFIG_SSI_TXLIMIT - Write this many words to the Tx FIFO before
-	  emptying the Rx FIFO.  If the SPI frequency is high and this
-	  value is large, then larger values of this setting may cause
-	  Rx FIFO overrun errors.  Default: half of the Tx FIFO size (4).
+    CONFIG_SSI0_DISABLE - Select to disable support for SSI0
+    CONFIG_SSI1_DISABLE - Select to disable support for SSI1
+    CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support.
+      Poll-waiting is recommended if the interrupt rate would be to
+      high in the interrupt driven case.
+    CONFIG_SSI_TXLIMIT - Write this many words to the Tx FIFO before
+      emptying the Rx FIFO.  If the SPI frequency is high and this
+      value is large, then larger values of this setting may cause
+      Rx FIFO overrun errors.  Default: half of the Tx FIFO size (4).
 
-	CONFIG_LM3S_ETHERNET - This must be set (along with CONFIG_NET)
-	  to build the LM3S Ethernet driver
-	CONFIG_LM3S_ETHLEDS - Enable to use Ethernet LEDs on the board.
-	CONFIG_LM3S_BOARDMAC - If the board-specific logic can provide
-	  a MAC address (via lm3s_ethernetmac()), then this should be selected.
-	CONFIG_LM3S_ETHHDUPLEX - Set to force half duplex operation
-	CONFIG_LM3S_ETHNOAUTOCRC - Set to suppress auto-CRC generation
-	CONFIG_LM3S_ETHNOPAD - Set to suppress Tx padding
-	CONFIG_LM3S_MULTICAST - Set to enable multicast frames
-	CONFIG_LM3S_PROMISCUOUS - Set to enable promiscuous mode
-	CONFIG_LM3S_BADCRC - Set to enable bad CRC rejection.
-	CONFIG_LM3S_DUMPPACKET - Dump each packet received/sent to the console.
+    CONFIG_LM3S_ETHERNET - This must be set (along with CONFIG_NET)
+      to build the LM3S Ethernet driver
+    CONFIG_LM3S_ETHLEDS - Enable to use Ethernet LEDs on the board.
+    CONFIG_LM3S_BOARDMAC - If the board-specific logic can provide
+      a MAC address (via lm3s_ethernetmac()), then this should be selected.
+    CONFIG_LM3S_ETHHDUPLEX - Set to force half duplex operation
+    CONFIG_LM3S_ETHNOAUTOCRC - Set to suppress auto-CRC generation
+    CONFIG_LM3S_ETHNOPAD - Set to suppress Tx padding
+    CONFIG_LM3S_MULTICAST - Set to enable multicast frames
+    CONFIG_LM3S_PROMISCUOUS - Set to enable promiscuous mode
+    CONFIG_LM3S_BADCRC - Set to enable bad CRC rejection.
+    CONFIG_LM3S_DUMPPACKET - Dump each packet received/sent to the console.
 
 Configurations
 ^^^^^^^^^^^^^^
@@ -400,10 +452,10 @@ Configurations
 Each Stellaris LM3S8962 Evaluation Kit configuration is maintained in a
 sudirectory and can be selected as follow:
 
-	cd tools
-	./configure.sh lm3s8962-ek/<subdir>
-	cd -
-	. ./setenv.sh
+    cd tools
+    ./configure.sh lm3s8962-ek/<subdir>
+    cd -
+    . ./setenv.sh
 
 Where <subdir> is one of the following:
 
diff --git a/nuttx/configs/lpc4330-xplorer/README.txt b/nuttx/configs/lpc4330-xplorer/README.txt
index 0d9ef87f27..a613edada1 100644
--- a/nuttx/configs/lpc4330-xplorer/README.txt
+++ b/nuttx/configs/lpc4330-xplorer/README.txt
@@ -19,7 +19,9 @@ Contents
     Command Line Flash Programming
     Executing from SPIFI
     USB DFU Booting
-  - NuttX buildroot Toolchain
+  - NuttX EABI "buildroot" Toolchain
+  - NuttX OABI "buildroot" Toolchain
+  - NXFLAT Toolchain
   - Serial Console
   - FPU
   - LPC4330-Xplorer Configuration Options
@@ -462,8 +464,8 @@ Code Red IDE/Tools
 
   To be provided.
 
-NuttX buildroot Toolchain
-=========================
+NuttX EABI "buildroot" Toolchain
+================================
 
   A GNU GCC-based toolchain is assumed.  The files */setenv.sh should
   be modified to point to the correct path to the Cortex-M3 GCC toolchain (if
@@ -486,7 +488,7 @@ NuttX buildroot Toolchain
 
   4. cd <some-dir>/buildroot
 
-  5. cp configs/cortexm3-defconfig-4.3.3 .config
+  5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config
 
   6. make oldconfig
 
@@ -496,10 +498,58 @@ NuttX buildroot Toolchain
      the path to the newly built binaries.
 
   See the file configs/README.txt in the buildroot source tree.  That has more
-  detailed PLUS some special instructions that you will need to follow if you
+  details PLUS some special instructions that you will need to follow if you
   are building a Cortex-M3 toolchain for Cygwin under Windows.
 
-  NOTE: This is an OABI toolchain.
+NuttX OABI "buildroot" Toolchain
+================================
+
+  The older, OABI buildroot toolchain is also available.  To use the OABI
+  toolchain:
+
+  1. When building the buildroot toolchain, either (1) modify the cortexm3-eabi-defconfig-4.6.3
+     configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
+     configuration such as cortexm3-defconfig-4.3.3
+
+  2. Modify the Make.defs file to use the OABI converntions:
+
+    +CROSSDEV = arm-nuttx-elf-
+    +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    -CROSSDEV = arm-nuttx-eabi-
+    -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+
+NXFLAT Toolchain
+================
+
+  If you are *not* using the NuttX buildroot toolchain and you want to use
+  the NXFLAT tools, then you will still have to build a portion of the buildroot
+  tools -- just the NXFLAT tools.  The buildroot with the NXFLAT tools can
+  be downloaded from the NuttX SourceForge download site
+  (https://sourceforge.net/projects/nuttx/files/).
+ 
+  This GNU toolchain builds and executes in the Linux or Cygwin environment.
+
+  1. You must have already configured Nuttx in <some-dir>/nuttx.
+
+     cd tools
+     ./configure.sh lpcxpresso-lpc1768/<sub-dir>
+
+  2. Download the latest buildroot package into <some-dir>
+
+  3. unpack the buildroot tarball.  The resulting directory may
+     have versioning information on it like buildroot-x.y.z.  If so,
+     rename <some-dir>/buildroot-x.y.z to <some-dir>/buildroot.
+
+  4. cd <some-dir>/buildroot
+
+  5. cp configs/cortexm3-defconfig-nxflat .config
+
+  6. make oldconfig
+
+  7. make
+
+  8. Edit setenv.h, if necessary, so that the PATH variable includes
+     the path to the newly builtNXFLAT binaries.
 
 Serial Console
 ==============
diff --git a/nuttx/configs/lpcxpresso-lpc1768/README.txt b/nuttx/configs/lpcxpresso-lpc1768/README.txt
index 402d528816..65f58d5527 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/README.txt
+++ b/nuttx/configs/lpcxpresso-lpc1768/README.txt
@@ -11,7 +11,9 @@ Contents
   Embedded Artist's Base Board
   Development Environment
   GNU Toolchain Options
-  NuttX buildroot Toolchain
+  NuttX EABI "buildroot" Toolchain
+  NuttX OABI "buildroot" Toolchain
+  NXFLAT Toolchain
   Code Red IDE
   LEDs
   LPCXpresso Configuration Options
@@ -406,8 +408,8 @@ Code Red IDE
   All of the above steps are automated in the bash script flash.sh that can
   be found in the configs/lpcxpresso/tools directory.
 
-NuttX buildroot Toolchain
-^^^^^^^^^^^^^^^^^^^^^^^^^
+NuttX EABI "buildroot" Toolchain
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
   A GNU GCC-based toolchain is assumed.  The files */setenv.sh should
   be modified to point to the correct path to the Cortex-M3 GCC toolchain (if
@@ -430,7 +432,7 @@ NuttX buildroot Toolchain
 
   4. cd <some-dir>/buildroot
 
-  5. cp configs/cortexm3-defconfig-4.3.3 .config
+  5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config
 
   6. make oldconfig
 
@@ -440,10 +442,25 @@ NuttX buildroot Toolchain
      the path to the newly built binaries.
 
   See the file configs/README.txt in the buildroot source tree.  That has more
-  detailed PLUS some special instructions that you will need to follow if you
+  details PLUS some special instructions that you will need to follow if you
   are building a Cortex-M3 toolchain for Cygwin under Windows.
 
-  NOTE: This is an OABI toolchain.
+NuttX OABI "buildroot" Toolchain
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+  The older, OABI buildroot toolchain is also available.  To use the OABI
+  toolchain:
+
+  1. When building the buildroot toolchain, either (1) modify the cortexm3-eabi-defconfig-4.6.3
+     configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
+     configuration such as cortexm3-defconfig-4.3.3
+
+  2. Modify the Make.defs file to use the OABI converntions:
+
+    +CROSSDEV = arm-nuttx-elf-
+    +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    -CROSSDEV = arm-nuttx-eabi-
+    -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
 
 NXFLAT Toolchain
 ^^^^^^^^^^^^^^^^
diff --git a/nuttx/configs/mbed/README.txt b/nuttx/configs/mbed/README.txt
index 2d53e72745..601c9a0b25 100644
--- a/nuttx/configs/mbed/README.txt
+++ b/nuttx/configs/mbed/README.txt
@@ -9,7 +9,9 @@ Contents
   Development Environment
   GNU Toolchain Options
   IDEs
-  NuttX buildroot Toolchain
+  NuttX EABI "buildroot" Toolchain
+  NuttX OABI "buildroot" Toolchain
+  NXFLAT Toolchain
   USB Device Controller Functions
   mbed Configuration Options
   USB Host Configuration
@@ -120,8 +122,8 @@ IDEs
   Startup files will probably cause you some headaches.  The NuttX startup file
   is arch/arm/src/lpc17x/lpc17_vectors.S.
 
-NuttX buildroot Toolchain
-^^^^^^^^^^^^^^^^^^^^^^^^^
+NuttX EABI "buildroot" Toolchain
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
   A GNU GCC-based toolchain is assumed.  The files */setenv.sh should
   be modified to point to the correct path to the Cortex-M3 GCC toolchain (if
@@ -144,7 +146,7 @@ NuttX buildroot Toolchain
 
   4. cd <some-dir>/buildroot
 
-  5. cp configs/cortexm3-defconfig-4.3.3 .config
+  5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config
 
   6. make oldconfig
 
@@ -154,184 +156,232 @@ NuttX buildroot Toolchain
      the path to the newly built binaries.
 
   See the file configs/README.txt in the buildroot source tree.  That has more
-  detailed PLUS some special instructions that you will need to follow if you
+  details PLUS some special instructions that you will need to follow if you
   are building a Cortex-M3 toolchain for Cygwin under Windows.
 
-  NOTE: This is an OABI toolchain.
+NuttX OABI "buildroot" Toolchain
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+  The older, OABI buildroot toolchain is also available.  To use the OABI
+  toolchain:
+
+  1. When building the buildroot toolchain, either (1) modify the cortexm3-eabi-defconfig-4.6.3
+     configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
+     configuration such as cortexm3-defconfig-4.3.3
+
+  2. Modify the Make.defs file to use the OABI converntions:
+
+    +CROSSDEV = arm-nuttx-elf-
+    +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    -CROSSDEV = arm-nuttx-eabi-
+    -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+
+NXFLAT Toolchain
+^^^^^^^^^^^^^^^^
+
+  If you are *not* using the NuttX buildroot toolchain and you want to use
+  the NXFLAT tools, then you will still have to build a portion of the buildroot
+  tools -- just the NXFLAT tools.  The buildroot with the NXFLAT tools can
+  be downloaded from the NuttX SourceForge download site
+  (https://sourceforge.net/projects/nuttx/files/).
+ 
+  This GNU toolchain builds and executes in the Linux or Cygwin environment.
+
+  1. You must have already configured Nuttx in <some-dir>/nuttx.
+
+     cd tools
+     ./configure.sh lpcxpresso-lpc1768/<sub-dir>
+
+  2. Download the latest buildroot package into <some-dir>
+
+  3. unpack the buildroot tarball.  The resulting directory may
+     have versioning information on it like buildroot-x.y.z.  If so,
+     rename <some-dir>/buildroot-x.y.z to <some-dir>/buildroot.
+
+  4. cd <some-dir>/buildroot
+
+  5. cp configs/cortexm3-defconfig-nxflat .config
+
+  6. make oldconfig
+
+  7. make
+
+  8. Edit setenv.h, if necessary, so that the PATH variable includes
+     the path to the newly builtNXFLAT binaries.
 
 mbed Configuration Options
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-	CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
-	   be set to:
+    CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
+       be set to:
 
-	   CONFIG_ARCH=arm
+       CONFIG_ARCH=arm
 
-	CONFIG_ARCH_family - For use in C code:
+    CONFIG_ARCH_family - For use in C code:
 
-	   CONFIG_ARCH_ARM=y
+       CONFIG_ARCH_ARM=y
 
-	CONFIG_ARCH_architecture - For use in C code:
+    CONFIG_ARCH_architecture - For use in C code:
 
-	   CONFIG_ARCH_CORTEXM3=y
+       CONFIG_ARCH_CORTEXM3=y
 
-	CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
+    CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
-	   CONFIG_ARCH_CHIP=lpc17xx
+       CONFIG_ARCH_CHIP=lpc17xx
 
-	CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
-	   chip:
+    CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
+       chip:
 
-	   CONFIG_ARCH_CHIP_LPC1768=y
+       CONFIG_ARCH_CHIP_LPC1768=y
 
-	CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
-	   hence, the board that supports the particular chip or SoC.
+    CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
+       hence, the board that supports the particular chip or SoC.
 
-	   CONFIG_ARCH_BOARD=mbed (for the mbed.org board)
+       CONFIG_ARCH_BOARD=mbed (for the mbed.org board)
 
-	CONFIG_ARCH_BOARD_name - For use in C code
+    CONFIG_ARCH_BOARD_name - For use in C code
 
-	   CONFIG_ARCH_BOARD_MBED=y
+       CONFIG_ARCH_BOARD_MBED=y
 
-	CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
-	   of delay loops
+    CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
+       of delay loops
 
-	CONFIG_ENDIAN_BIG - define if big endian (default is little
-	   endian)
+    CONFIG_ENDIAN_BIG - define if big endian (default is little
+       endian)
 
-	CONFIG_DRAM_SIZE - Describes the installed DRAM (CPU SRAM in this case):
+    CONFIG_DRAM_SIZE - Describes the installed DRAM (CPU SRAM in this case):
 
-	   CONFIG_DRAM_SIZE=(32*1024) (32Kb)
+       CONFIG_DRAM_SIZE=(32*1024) (32Kb)
 
-	   There is an additional 32Kb of SRAM in AHB SRAM banks 0 and 1.
+       There is an additional 32Kb of SRAM in AHB SRAM banks 0 and 1.
 
-	CONFIG_DRAM_START - The start address of installed DRAM
+    CONFIG_DRAM_START - The start address of installed DRAM
 
-	   CONFIG_DRAM_START=0x10000000
+       CONFIG_DRAM_START=0x10000000
 
-	CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization
+    CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization
 
-	   CONFIG_ARCH_IRQPRIO=y
+       CONFIG_ARCH_IRQPRIO=y
 
-	CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
-	   have LEDs
+    CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
+       have LEDs
 
-	CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
-	   stack. If defined, this symbol is the size of the interrupt
-	    stack in bytes.  If not defined, the user task stacks will be
-	  used during interrupt handling.
+    CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
+       stack. If defined, this symbol is the size of the interrupt
+        stack in bytes.  If not defined, the user task stacks will be
+      used during interrupt handling.
 
-	CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
+    CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 
-	CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
+    CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
 
-	CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
-	   cause a 100 second delay during boot-up.  This 100 second delay
-	   serves no purpose other than it allows you to calibratre
-	   CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
-	   the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
-	   the delay actually is 100 seconds.
+    CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
+       cause a 100 second delay during boot-up.  This 100 second delay
+       serves no purpose other than it allows you to calibratre
+       CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
+       the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
+       the delay actually is 100 seconds.
 
-	Individual subsystems can be enabled:
-	  CONFIG_LPC17_MAINOSC=y
-	  CONFIG_LPC17_PLL0=y
-	  CONFIG_LPC17_PLL1=n
-	  CONFIG_LPC17_ETHERNET=n
-	  CONFIG_LPC17_USBHOST=n
-	  CONFIG_LPC17_USBOTG=n
-	  CONFIG_LPC17_USBDEV=n
-	  CONFIG_LPC17_UART0=y
-	  CONFIG_LPC17_UART1=n
-	  CONFIG_LPC17_UART2=n
-	  CONFIG_LPC17_UART3=n
-	  CONFIG_LPC17_CAN1=n
-	  CONFIG_LPC17_CAN2=n
-	  CONFIG_LPC17_SPI=n
-	  CONFIG_LPC17_SSP0=n
-	  CONFIG_LPC17_SSP1=n
-	  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_PWM=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
-	  CONFIG_LPC17_FLASH=n
+    Individual subsystems can be enabled:
+      CONFIG_LPC17_MAINOSC=y
+      CONFIG_LPC17_PLL0=y
+      CONFIG_LPC17_PLL1=n
+      CONFIG_LPC17_ETHERNET=n
+      CONFIG_LPC17_USBHOST=n
+      CONFIG_LPC17_USBOTG=n
+      CONFIG_LPC17_USBDEV=n
+      CONFIG_LPC17_UART0=y
+      CONFIG_LPC17_UART1=n
+      CONFIG_LPC17_UART2=n
+      CONFIG_LPC17_UART3=n
+      CONFIG_LPC17_CAN1=n
+      CONFIG_LPC17_CAN2=n
+      CONFIG_LPC17_SPI=n
+      CONFIG_LPC17_SSP0=n
+      CONFIG_LPC17_SSP1=n
+      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_PWM=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
+      CONFIG_LPC17_FLASH=n
 
   LPC17xx specific device driver settings
 
-	CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the
-	   console and ttys0 (default is the UART0).
-	CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received.
-	   This specific the size of the receive buffer
-	CONFIG_UARTn_TXBUFSIZE - Characters are buffered before
-	   being sent.  This specific the size of the transmit buffer
-	CONFIG_UARTn_BAUD - The configure BAUD of the UART.  Must be
-	CONFIG_UARTn_BITS - The number of bits.  Must be either 7 or 8.
-	CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
-	CONFIG_UARTn_2STOP - Two stop bits
+    CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the
+       console and ttys0 (default is the UART0).
+    CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received.
+       This specific the size of the receive buffer
+    CONFIG_UARTn_TXBUFSIZE - Characters are buffered before
+       being sent.  This specific the size of the transmit buffer
+    CONFIG_UARTn_BAUD - The configure BAUD of the UART.  Must be
+    CONFIG_UARTn_BITS - The number of bits.  Must be either 7 or 8.
+    CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
+    CONFIG_UARTn_2STOP - Two stop bits
 
   LPC17xx specific CAN device driver settings.  These settings all
   require CONFIG_CAN:
 
-	CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
-	  Standard 11-bit IDs.
-	CONFIG_CAN1_BAUD - CAN1 BAUD rate.  Required if CONFIG_LPC17_CAN1 is defined.
-	CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_LPC17_CAN2 is defined.
-	CONFIG_CAN1_DIVISOR - CAN1 is clocked at CCLK divided by this number.
-	  (the CCLK frequency is divided by this number to get the CAN clock).
-	  Options = {1,2,4,6}. Default: 4.
-	CONFIG_CAN2_DIVISOR - CAN2 is clocked at CCLK divided by this number.
-	  (the CCLK frequency is divided by this number to get the CAN clock).
-	  Options = {1,2,4,6}. Default: 4.
-	CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
-	CONFIG_CAN_TSEG2 = the number of CAN time quanta in segment 2. Default: 7
+    CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
+      Standard 11-bit IDs.
+    CONFIG_CAN1_BAUD - CAN1 BAUD rate.  Required if CONFIG_LPC17_CAN1 is defined.
+    CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_LPC17_CAN2 is defined.
+    CONFIG_CAN1_DIVISOR - CAN1 is clocked at CCLK divided by this number.
+      (the CCLK frequency is divided by this number to get the CAN clock).
+      Options = {1,2,4,6}. Default: 4.
+    CONFIG_CAN2_DIVISOR - CAN2 is clocked at CCLK divided by this number.
+      (the CCLK frequency is divided by this number to get the CAN clock).
+      Options = {1,2,4,6}. Default: 4.
+    CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
+    CONFIG_CAN_TSEG2 = the number of CAN time quanta in segment 2. Default: 7
 
   LPC17xx specific PHY/Ethernet device driver settings.  These setting
   also require CONFIG_NET and CONFIG_LPC17_ETHERNET.
 
-	CONFIG_PHY_KS8721 - Selects Micrel KS8721 PHY
-	CONFIG_PHY_AUTONEG - Enable auto-negotion
-	CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed.
-	CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex
+    CONFIG_PHY_KS8721 - Selects Micrel KS8721 PHY
+    CONFIG_PHY_AUTONEG - Enable auto-negotion
+    CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed.
+    CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex
 
     CONFIG_NET_EMACRAM_SIZE - Size of EMAC RAM.  Default: 16Kb
-	CONFIG_NET_NTXDESC - Configured number of Tx descriptors. Default: 18
-	CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18
-	CONFIG_NET_PRIORITY - Ethernet interrupt priority.  The is default is
-	  the higest priority.
-	CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
-	CONFIG_NET_REGDEBUG - Enabled low level register debug.  Also needs
-	  CONFIG_DEBUG.
-	CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
-	  Also needs CONFIG_DEBUG.
-	CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
-	CONFIG_NET_MULTICAST - Enable receipt of multicast (and unicast) frames.
+    CONFIG_NET_NTXDESC - Configured number of Tx descriptors. Default: 18
+    CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18
+    CONFIG_NET_PRIORITY - Ethernet interrupt priority.  The is default is
+      the higest priority.
+    CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
+    CONFIG_NET_REGDEBUG - Enabled low level register debug.  Also needs
+      CONFIG_DEBUG.
+    CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
+      Also needs CONFIG_DEBUG.
+    CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
+    CONFIG_NET_MULTICAST - Enable receipt of multicast (and unicast) frames.
       Automatically set if CONFIG_NET_IGMP is selected.
 
   LPC17xx USB Device Configuration
 
-	CONFIG_LPC17_USBDEV_FRAME_INTERRUPT
-	  Handle USB Start-Of-Frame events. 
-	  Enable reading SOF from interrupt handler vs. simply reading on demand.
-	  Probably a bad idea... Unless there is some issue with sampling the SOF
-	  from hardware asynchronously.
-	CONFIG_LPC17_USBDEV_EPFAST_INTERRUPT
-	  Enable high priority interrupts.  I have no idea why you might want to
-	  do that
-	CONFIG_LPC17_USBDEV_NDMADESCRIPTORS
-	  Number of DMA descriptors to allocate in SRAM.
-	CONFIG_LPC17_USBDEV_DMA
-	  Enable lpc17xx-specific DMA support
+    CONFIG_LPC17_USBDEV_FRAME_INTERRUPT
+      Handle USB Start-Of-Frame events. 
+      Enable reading SOF from interrupt handler vs. simply reading on demand.
+      Probably a bad idea... Unless there is some issue with sampling the SOF
+      from hardware asynchronously.
+    CONFIG_LPC17_USBDEV_EPFAST_INTERRUPT
+      Enable high priority interrupts.  I have no idea why you might want to
+      do that
+    CONFIG_LPC17_USBDEV_NDMADESCRIPTORS
+      Number of DMA descriptors to allocate in SRAM.
+    CONFIG_LPC17_USBDEV_DMA
+      Enable lpc17xx-specific DMA support
     CONFIG_LPC17_USBDEV_NOVBUS
       Define if the hardware implementation does not support the VBUS signal
     CONFIG_LPC17_USBDEV_NOLED
@@ -396,10 +446,10 @@ Configurations
 Each mbed configuration is maintained in a sudirectory and can be selected
 as follow:
 
-	cd tools
-	./configure.sh mbed/<subdir>
-	cd -
-	. ./setenv.sh
+    cd tools
+    ./configure.sh mbed/<subdir>
+    cd -
+    . ./setenv.sh
 
 Where <subdir> is one of the following:
 
diff --git a/nuttx/configs/mcu123-lpc214x/README.txt b/nuttx/configs/mcu123-lpc214x/README.txt
index b819abf368..65d177cc1e 100644
--- a/nuttx/configs/mcu123-lpc214x/README.txt
+++ b/nuttx/configs/mcu123-lpc214x/README.txt
@@ -113,7 +113,7 @@ NuttX buildroot Toolchain
 
   4. cd <some-dir>/buildroot
 
-  5. cp configs/cortexm3-defconfig-4.3.3 .config
+  5. cp configs/arm7tdmi-defconfig-4.3.3 .config
 
   6. make oldconfig
 
diff --git a/nuttx/configs/nucleus2g/README.txt b/nuttx/configs/nucleus2g/README.txt
index e2389339ea..01b6adef71 100644
--- a/nuttx/configs/nucleus2g/README.txt
+++ b/nuttx/configs/nucleus2g/README.txt
@@ -11,7 +11,9 @@ Contents
   Development Environment
   GNU Toolchain Options
   IDEs
-  NuttX buildroot Toolchain
+  NuttX EABI "buildroot" Toolchain
+  NuttX OABI "buildroot" Toolchain
+  NXFLAT Toolchain
   LEDs
   Nucleus 2G Configuration Options
   Configurations
@@ -180,8 +182,8 @@ IDEs
   Startup files will probably cause you some headaches.  The NuttX startup file
   is arch/arm/src/lpc17x/lpc17_vectors.S.
 
-NuttX buildroot Toolchain
-^^^^^^^^^^^^^^^^^^^^^^^^^
+NuttX EABI "buildroot" Toolchain
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
   A GNU GCC-based toolchain is assumed.  The files */setenv.sh should
   be modified to point to the correct path to the Cortex-M3 GCC toolchain (if
@@ -204,7 +206,7 @@ NuttX buildroot Toolchain
 
   4. cd <some-dir>/buildroot
 
-  5. cp configs/cortexm3-defconfig-4.3.3 .config
+  5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config
 
   6. make oldconfig
 
@@ -214,10 +216,58 @@ NuttX buildroot Toolchain
      the path to the newly built binaries.
 
   See the file configs/README.txt in the buildroot source tree.  That has more
-  detailed PLUS some special instructions that you will need to follow if you
+  details PLUS some special instructions that you will need to follow if you
   are building a Cortex-M3 toolchain for Cygwin under Windows.
 
-  NOTE: This is an OABI toolchain.
+NuttX OABI "buildroot" Toolchain
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+  The older, OABI buildroot toolchain is also available.  To use the OABI
+  toolchain:
+
+  1. When building the buildroot toolchain, either (1) modify the cortexm3-eabi-defconfig-4.6.3
+     configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
+     configuration such as cortexm3-defconfig-4.3.3
+
+  2. Modify the Make.defs file to use the OABI converntions:
+
+    +CROSSDEV = arm-nuttx-elf-
+    +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    -CROSSDEV = arm-nuttx-eabi-
+    -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+
+NXFLAT Toolchain
+^^^^^^^^^^^^^^^^
+
+  If you are *not* using the NuttX buildroot toolchain and you want to use
+  the NXFLAT tools, then you will still have to build a portion of the buildroot
+  tools -- just the NXFLAT tools.  The buildroot with the NXFLAT tools can
+  be downloaded from the NuttX SourceForge download site
+  (https://sourceforge.net/projects/nuttx/files/).
+ 
+  This GNU toolchain builds and executes in the Linux or Cygwin environment.
+
+  1. You must have already configured Nuttx in <some-dir>/nuttx.
+
+     cd tools
+     ./configure.sh lpcxpresso-lpc1768/<sub-dir>
+
+  2. Download the latest buildroot package into <some-dir>
+
+  3. unpack the buildroot tarball.  The resulting directory may
+     have versioning information on it like buildroot-x.y.z.  If so,
+     rename <some-dir>/buildroot-x.y.z to <some-dir>/buildroot.
+
+  4. cd <some-dir>/buildroot
+
+  5. cp configs/cortexm3-defconfig-nxflat .config
+
+  6. make oldconfig
+
+  7. make
+
+  8. Edit setenv.h, if necessary, so that the PATH variable includes
+     the path to the newly builtNXFLAT binaries.
 
 LEDs
 ^^^^
@@ -274,176 +324,176 @@ LEDs
 Nucleus 2G Configuration Options
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-	CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
-	   be set to:
+    CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
+       be set to:
 
-	   CONFIG_ARCH=arm
+       CONFIG_ARCH=arm
 
-	CONFIG_ARCH_family - For use in C code:
+    CONFIG_ARCH_family - For use in C code:
 
-	   CONFIG_ARCH_ARM=y
+       CONFIG_ARCH_ARM=y
 
-	CONFIG_ARCH_architecture - For use in C code:
+    CONFIG_ARCH_architecture - For use in C code:
 
-	   CONFIG_ARCH_CORTEXM3=y
+       CONFIG_ARCH_CORTEXM3=y
 
-	CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
+    CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
-	   CONFIG_ARCH_CHIP=lpc17xx
+       CONFIG_ARCH_CHIP=lpc17xx
 
-	CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
-	   chip:
+    CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
+       chip:
 
-	   CONFIG_ARCH_CHIP_LPC1768=y
+       CONFIG_ARCH_CHIP_LPC1768=y
 
-	CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
-	   hence, the board that supports the particular chip or SoC.
+    CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
+       hence, the board that supports the particular chip or SoC.
 
-	   CONFIG_ARCH_BOARD=nucleus2g (for the Nucleus 2G)
+       CONFIG_ARCH_BOARD=nucleus2g (for the Nucleus 2G)
 
-	CONFIG_ARCH_BOARD_name - For use in C code
+    CONFIG_ARCH_BOARD_name - For use in C code
 
-	   CONFIG_ARCH_BOARD_NUCLEUS2G=y
+       CONFIG_ARCH_BOARD_NUCLEUS2G=y
 
-	CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
-	   of delay loops
+    CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
+       of delay loops
 
-	CONFIG_ENDIAN_BIG - define if big endian (default is little
-	   endian)
+    CONFIG_ENDIAN_BIG - define if big endian (default is little
+       endian)
 
-	CONFIG_DRAM_SIZE - Describes the installed DRAM (CPU SRAM in this case):
+    CONFIG_DRAM_SIZE - Describes the installed DRAM (CPU SRAM in this case):
 
-	   CONFIG_DRAM_SIZE=(32*1024) (32Kb)
+       CONFIG_DRAM_SIZE=(32*1024) (32Kb)
 
-	   There is an additional 32Kb of SRAM in AHB SRAM banks 0 and 1.
+       There is an additional 32Kb of SRAM in AHB SRAM banks 0 and 1.
 
-	CONFIG_DRAM_START - The start address of installed DRAM
+    CONFIG_DRAM_START - The start address of installed DRAM
 
-	   CONFIG_DRAM_START=0x10000000
+       CONFIG_DRAM_START=0x10000000
 
-	CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization
+    CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization
 
-	   CONFIG_ARCH_IRQPRIO=y
+       CONFIG_ARCH_IRQPRIO=y
 
-	CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
-	   have LEDs
+    CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
+       have LEDs
 
-	CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
-	   stack. If defined, this symbol is the size of the interrupt
-	    stack in bytes.  If not defined, the user task stacks will be
-	  used during interrupt handling.
+    CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
+       stack. If defined, this symbol is the size of the interrupt
+        stack in bytes.  If not defined, the user task stacks will be
+      used during interrupt handling.
 
-	CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
+    CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 
-	CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
+    CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
 
-	CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
-	   cause a 100 second delay during boot-up.  This 100 second delay
-	   serves no purpose other than it allows you to calibratre
-	   CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
-	   the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
-	   the delay actually is 100 seconds.
+    CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
+       cause a 100 second delay during boot-up.  This 100 second delay
+       serves no purpose other than it allows you to calibratre
+       CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
+       the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
+       the delay actually is 100 seconds.
 
-	Individual subsystems can be enabled:
-	  CONFIG_LPC17_MAINOSC=y
-	  CONFIG_LPC17_PLL0=y
-	  CONFIG_LPC17_PLL1=n
-	  CONFIG_LPC17_ETHERNET=n
-	  CONFIG_LPC17_USBHOST=n
-	  CONFIG_LPC17_USBOTG=n
-	  CONFIG_LPC17_USBDEV=n
-	  CONFIG_LPC17_UART0=y
-	  CONFIG_LPC17_UART1=n
-	  CONFIG_LPC17_UART2=n
-	  CONFIG_LPC17_UART3=n
-	  CONFIG_LPC17_CAN1=n
-	  CONFIG_LPC17_CAN2=n
-	  CONFIG_LPC17_SPI=n
-	  CONFIG_LPC17_SSP0=n
-	  CONFIG_LPC17_SSP1=n
-	  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_PWM=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
-	  CONFIG_LPC17_FLASH=n
+    Individual subsystems can be enabled:
+      CONFIG_LPC17_MAINOSC=y
+      CONFIG_LPC17_PLL0=y
+      CONFIG_LPC17_PLL1=n
+      CONFIG_LPC17_ETHERNET=n
+      CONFIG_LPC17_USBHOST=n
+      CONFIG_LPC17_USBOTG=n
+      CONFIG_LPC17_USBDEV=n
+      CONFIG_LPC17_UART0=y
+      CONFIG_LPC17_UART1=n
+      CONFIG_LPC17_UART2=n
+      CONFIG_LPC17_UART3=n
+      CONFIG_LPC17_CAN1=n
+      CONFIG_LPC17_CAN2=n
+      CONFIG_LPC17_SPI=n
+      CONFIG_LPC17_SSP0=n
+      CONFIG_LPC17_SSP1=n
+      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_PWM=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
+      CONFIG_LPC17_FLASH=n
 
   LPC17xx specific device driver settings
 
-	CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the
-	   console and ttys0 (default is the UART0).
-	CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received.
-	   This specific the size of the receive buffer
-	CONFIG_UARTn_TXBUFSIZE - Characters are buffered before
-	   being sent.  This specific the size of the transmit buffer
-	CONFIG_UARTn_BAUD - The configure BAUD of the UART.  Must be
-	CONFIG_UARTn_BITS - The number of bits.  Must be either 7 or 8.
-	CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
-	CONFIG_UARTn_2STOP - Two stop bits
+    CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the
+       console and ttys0 (default is the UART0).
+    CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received.
+       This specific the size of the receive buffer
+    CONFIG_UARTn_TXBUFSIZE - Characters are buffered before
+       being sent.  This specific the size of the transmit buffer
+    CONFIG_UARTn_BAUD - The configure BAUD of the UART.  Must be
+    CONFIG_UARTn_BITS - The number of bits.  Must be either 7 or 8.
+    CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
+    CONFIG_UARTn_2STOP - Two stop bits
 
   LPC17xx specific CAN device driver settings.  These settings all
   require CONFIG_CAN:
 
-	CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
-	  Standard 11-bit IDs.
-	CONFIG_CAN1_BAUD - CAN1 BAUD rate.  Required if CONFIG_LPC17_CAN1 is defined.
-	CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_LPC17_CAN2 is defined.
-	CONFIG_CAN1_DIVISOR - CAN1 is clocked at CCLK divided by this number.
-	  (the CCLK frequency is divided by this number to get the CAN clock).
-	  Options = {1,2,4,6}. Default: 4.
-	CONFIG_CAN2_DIVISOR - CAN2 is clocked at CCLK divided by this number.
-	  (the CCLK frequency is divided by this number to get the CAN clock).
-	  Options = {1,2,4,6}. Default: 4.
-	CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
-	CONFIG_CAN_TSEG2 = the number of CAN time quanta in segment 2. Default: 7
+    CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
+      Standard 11-bit IDs.
+    CONFIG_CAN1_BAUD - CAN1 BAUD rate.  Required if CONFIG_LPC17_CAN1 is defined.
+    CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_LPC17_CAN2 is defined.
+    CONFIG_CAN1_DIVISOR - CAN1 is clocked at CCLK divided by this number.
+      (the CCLK frequency is divided by this number to get the CAN clock).
+      Options = {1,2,4,6}. Default: 4.
+    CONFIG_CAN2_DIVISOR - CAN2 is clocked at CCLK divided by this number.
+      (the CCLK frequency is divided by this number to get the CAN clock).
+      Options = {1,2,4,6}. Default: 4.
+    CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
+    CONFIG_CAN_TSEG2 = the number of CAN time quanta in segment 2. Default: 7
 
   LPC17xx specific PHY/Ethernet device driver settings.  These setting
   also require CONFIG_NET and CONFIG_LPC17_ETHERNET.
 
-	CONFIG_PHY_KS8721 - Selects Micrel KS8721 PHY
-	CONFIG_PHY_AUTONEG - Enable auto-negotion
-	CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed.
-	CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex
+    CONFIG_PHY_KS8721 - Selects Micrel KS8721 PHY
+    CONFIG_PHY_AUTONEG - Enable auto-negotion
+    CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed.
+    CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex
 
     CONFIG_NET_EMACRAM_SIZE - Size of EMAC RAM.  Default: 16Kb
-	CONFIG_NET_NTXDESC - Configured number of Tx descriptors. Default: 18
-	CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18
-	CONFIG_NET_PRIORITY - Ethernet interrupt priority.  The is default is
-	  the higest priority.
-	CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
-	CONFIG_NET_REGDEBUG - Enabled low level register debug.  Also needs
-	  CONFIG_DEBUG.
-	CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
-	  Also needs CONFIG_DEBUG.
-	CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
-	CONFIG_NET_MULTICAST - Enable receipt of multicast (and unicast) frames.
+    CONFIG_NET_NTXDESC - Configured number of Tx descriptors. Default: 18
+    CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18
+    CONFIG_NET_PRIORITY - Ethernet interrupt priority.  The is default is
+      the higest priority.
+    CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
+    CONFIG_NET_REGDEBUG - Enabled low level register debug.  Also needs
+      CONFIG_DEBUG.
+    CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
+      Also needs CONFIG_DEBUG.
+    CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
+    CONFIG_NET_MULTICAST - Enable receipt of multicast (and unicast) frames.
       Automatically set if CONFIG_NET_IGMP is selected.
 
   LPC17xx USB Device Configuration
 
-	CONFIG_LPC17_USBDEV_FRAME_INTERRUPT
-	  Handle USB Start-Of-Frame events. 
-	  Enable reading SOF from interrupt handler vs. simply reading on demand.
-	  Probably a bad idea... Unless there is some issue with sampling the SOF
-	  from hardware asynchronously.
-	CONFIG_LPC17_USBDEV_EPFAST_INTERRUPT
-	  Enable high priority interrupts.  I have no idea why you might want to
-	  do that
-	CONFIG_LPC17_USBDEV_NDMADESCRIPTORS
-	  Number of DMA descriptors to allocate in SRAM.
-	CONFIG_LPC17_USBDEV_DMA
-	  Enable lpc17xx-specific DMA support
+    CONFIG_LPC17_USBDEV_FRAME_INTERRUPT
+      Handle USB Start-Of-Frame events. 
+      Enable reading SOF from interrupt handler vs. simply reading on demand.
+      Probably a bad idea... Unless there is some issue with sampling the SOF
+      from hardware asynchronously.
+    CONFIG_LPC17_USBDEV_EPFAST_INTERRUPT
+      Enable high priority interrupts.  I have no idea why you might want to
+      do that
+    CONFIG_LPC17_USBDEV_NDMADESCRIPTORS
+      Number of DMA descriptors to allocate in SRAM.
+    CONFIG_LPC17_USBDEV_DMA
+      Enable lpc17xx-specific DMA support
     CONFIG_LPC17_USBDEV_NOVBUS
       Define if the hardware implementation does not support the VBUS signal
     CONFIG_LPC17_USBDEV_NOLED
@@ -472,10 +522,10 @@ Configurations
 Each Nucleus 2G configuration is maintained in a
 sudirectory and can be selected as follow:
 
-	cd tools
-	./configure.sh nucleus2g/<subdir>
-	cd -
-	. ./setenv.sh
+    cd tools
+    ./configure.sh nucleus2g/<subdir>
+    cd -
+    . ./setenv.sh
 
 Where <subdir> is one of the following:
 
diff --git a/nuttx/configs/olimex-lpc1766stk/README.txt b/nuttx/configs/olimex-lpc1766stk/README.txt
index a8bea4d0ef..96692688c5 100644
--- a/nuttx/configs/olimex-lpc1766stk/README.txt
+++ b/nuttx/configs/olimex-lpc1766stk/README.txt
@@ -10,7 +10,9 @@ Contents
   Development Environment
   GNU Toolchain Options
   IDEs
-  NuttX buildroot Toolchain
+  NuttX EABI "buildroot" Toolchain
+  NuttX OABI "buildroot" Toolchain
+  NXFLAT Toolchain
   LEDs
   Using OpenOCD and GDB with an FT2232 JTAG emulator
   Olimex LPC1766-STK Configuration Options
@@ -268,8 +270,8 @@ IDEs
   Startup files will probably cause you some headaches.  The NuttX startup file
   is arch/arm/src/lpc17x/lpc17_vectors.S.
 
-NuttX buildroot Toolchain
-^^^^^^^^^^^^^^^^^^^^^^^^^
+NuttX EABI "buildroot" Toolchain
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
   A GNU GCC-based toolchain is assumed.  The files */setenv.sh should
   be modified to point to the correct path to the Cortex-M3 GCC toolchain (if
@@ -292,7 +294,7 @@ NuttX buildroot Toolchain
 
   4. cd <some-dir>/buildroot
 
-  5. cp configs/cortexm3-defconfig-4.3.3 .config
+  5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config
 
   6. make oldconfig
 
@@ -302,10 +304,58 @@ NuttX buildroot Toolchain
      the path to the newly built binaries.
 
   See the file configs/README.txt in the buildroot source tree.  That has more
-  detailed PLUS some special instructions that you will need to follow if you
+  details PLUS some special instructions that you will need to follow if you
   are building a Cortex-M3 toolchain for Cygwin under Windows.
 
-  NOTE: This is an OABI toolchain.
+NuttX OABI "buildroot" Toolchain
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+  The older, OABI buildroot toolchain is also available.  To use the OABI
+  toolchain:
+
+  1. When building the buildroot toolchain, either (1) modify the cortexm3-eabi-defconfig-4.6.3
+     configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
+     configuration such as cortexm3-defconfig-4.3.3
+
+  2. Modify the Make.defs file to use the OABI converntions:
+
+    +CROSSDEV = arm-nuttx-elf-
+    +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    -CROSSDEV = arm-nuttx-eabi-
+    -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+
+NXFLAT Toolchain
+^^^^^^^^^^^^^^^^
+
+  If you are *not* using the NuttX buildroot toolchain and you want to use
+  the NXFLAT tools, then you will still have to build a portion of the buildroot
+  tools -- just the NXFLAT tools.  The buildroot with the NXFLAT tools can
+  be downloaded from the NuttX SourceForge download site
+  (https://sourceforge.net/projects/nuttx/files/).
+ 
+  This GNU toolchain builds and executes in the Linux or Cygwin environment.
+
+  1. You must have already configured Nuttx in <some-dir>/nuttx.
+
+     cd tools
+     ./configure.sh lpcxpresso-lpc1768/<sub-dir>
+
+  2. Download the latest buildroot package into <some-dir>
+
+  3. unpack the buildroot tarball.  The resulting directory may
+     have versioning information on it like buildroot-x.y.z.  If so,
+     rename <some-dir>/buildroot-x.y.z to <some-dir>/buildroot.
+
+  4. cd <some-dir>/buildroot
+
+  5. cp configs/cortexm3-defconfig-nxflat .config
+
+  6. make oldconfig
+
+  7. make
+
+  8. Edit setenv.h, if necessary, so that the PATH variable includes
+     the path to the newly builtNXFLAT binaries.
 
 LEDs
 ^^^^
@@ -570,177 +620,177 @@ Using OpenOCD and GDB with an FT2232 JTAG emulator
 Olimex LPC1766-STK Configuration Options
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-	CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
-	   be set to:
+    CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
+       be set to:
 
-	   CONFIG_ARCH=arm
+       CONFIG_ARCH=arm
 
-	CONFIG_ARCH_family - For use in C code:
+    CONFIG_ARCH_family - For use in C code:
 
-	   CONFIG_ARCH_ARM=y
+       CONFIG_ARCH_ARM=y
 
-	CONFIG_ARCH_architecture - For use in C code:
+    CONFIG_ARCH_architecture - For use in C code:
 
-	   CONFIG_ARCH_CORTEXM3=y
+       CONFIG_ARCH_CORTEXM3=y
 
-	CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
+    CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
-	   CONFIG_ARCH_CHIP=lpc17xx
+       CONFIG_ARCH_CHIP=lpc17xx
 
-	CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
-	   chip:
+    CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
+       chip:
 
-	   CONFIG_ARCH_CHIP_LPC1766=y
+       CONFIG_ARCH_CHIP_LPC1766=y
 
-	CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
-	   hence, the board that supports the particular chip or SoC.
+    CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
+       hence, the board that supports the particular chip or SoC.
 
-	   CONFIG_ARCH_BOARD=olimex-lpc1766stk (for the Olimex LPC1766-STK)
+       CONFIG_ARCH_BOARD=olimex-lpc1766stk (for the Olimex LPC1766-STK)
 
-	CONFIG_ARCH_BOARD_name - For use in C code
+    CONFIG_ARCH_BOARD_name - For use in C code
 
-	   CONFIG_ARCH_BOARD_LPC1766STK=y
+       CONFIG_ARCH_BOARD_LPC1766STK=y
 
-	CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
-	   of delay loops
+    CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
+       of delay loops
 
-	CONFIG_ENDIAN_BIG - define if big endian (default is little
-	   endian)
+    CONFIG_ENDIAN_BIG - define if big endian (default is little
+       endian)
 
-	CONFIG_DRAM_SIZE - Describes the installed DRAM (CPU SRAM in this case):
+    CONFIG_DRAM_SIZE - Describes the installed DRAM (CPU SRAM in this case):
 
-	   CONFIG_DRAM_SIZE=(32*1024) (32Kb)
+       CONFIG_DRAM_SIZE=(32*1024) (32Kb)
 
-	   There is an additional 32Kb of SRAM in AHB SRAM banks 0 and 1.
+       There is an additional 32Kb of SRAM in AHB SRAM banks 0 and 1.
 
-	CONFIG_DRAM_START - The start address of installed DRAM
+    CONFIG_DRAM_START - The start address of installed DRAM
 
-	   CONFIG_DRAM_START=0x10000000
+       CONFIG_DRAM_START=0x10000000
 
-	CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization
+    CONFIG_ARCH_IRQPRIO - The LPC17xx supports interrupt prioritization
 
-	   CONFIG_ARCH_IRQPRIO=y
+       CONFIG_ARCH_IRQPRIO=y
 
-	CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
-	   have LEDs
+    CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
+       have LEDs
 
-	CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
-	   stack. If defined, this symbol is the size of the interrupt
-	    stack in bytes.  If not defined, the user task stacks will be
-	  used during interrupt handling.
+    CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
+       stack. If defined, this symbol is the size of the interrupt
+        stack in bytes.  If not defined, the user task stacks will be
+      used during interrupt handling.
 
-	CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
+    CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 
-	CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
+    CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
 
-	CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
-	   cause a 100 second delay during boot-up.  This 100 second delay
-	   serves no purpose other than it allows you to calibratre
-	   CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
-	   the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
-	   the delay actually is 100 seconds.
+    CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
+       cause a 100 second delay during boot-up.  This 100 second delay
+       serves no purpose other than it allows you to calibratre
+       CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
+       the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
+       the delay actually is 100 seconds.
 
-	Individual subsystems can be enabled:
-	
-	  CONFIG_LPC17_MAINOSC=y
-	  CONFIG_LPC17_PLL0=y
-	  CONFIG_LPC17_PLL1=n
-	  CONFIG_LPC17_ETHERNET=n
-	  CONFIG_LPC17_USBHOST=n
-	  CONFIG_LPC17_USBOTG=n
-	  CONFIG_LPC17_USBDEV=n
-	  CONFIG_LPC17_UART0=y
-	  CONFIG_LPC17_UART1=n
-	  CONFIG_LPC17_UART2=n
-	  CONFIG_LPC17_UART3=n
-	  CONFIG_LPC17_CAN1=n
-	  CONFIG_LPC17_CAN2=n
-	  CONFIG_LPC17_SPI=n
-	  CONFIG_LPC17_SSP0=n
-	  CONFIG_LPC17_SSP1=n
-	  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_PWM=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
-	  CONFIG_LPC17_FLASH=n
+    Individual subsystems can be enabled:
+    
+      CONFIG_LPC17_MAINOSC=y
+      CONFIG_LPC17_PLL0=y
+      CONFIG_LPC17_PLL1=n
+      CONFIG_LPC17_ETHERNET=n
+      CONFIG_LPC17_USBHOST=n
+      CONFIG_LPC17_USBOTG=n
+      CONFIG_LPC17_USBDEV=n
+      CONFIG_LPC17_UART0=y
+      CONFIG_LPC17_UART1=n
+      CONFIG_LPC17_UART2=n
+      CONFIG_LPC17_UART3=n
+      CONFIG_LPC17_CAN1=n
+      CONFIG_LPC17_CAN2=n
+      CONFIG_LPC17_SPI=n
+      CONFIG_LPC17_SSP0=n
+      CONFIG_LPC17_SSP1=n
+      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_PWM=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
+      CONFIG_LPC17_FLASH=n
 
   LPC17xx specific device driver settings
 
-	CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the
-	   console and ttys0 (default is the UART0).
-	CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received.
-	   This specific the size of the receive buffer
-	CONFIG_UARTn_TXBUFSIZE - Characters are buffered before
-	   being sent.  This specific the size of the transmit buffer
-	CONFIG_UARTn_BAUD - The configure BAUD of the UART.  Must be
-	CONFIG_UARTn_BITS - The number of bits.  Must be either 7 or 8.
-	CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
-	CONFIG_UARTn_2STOP - Two stop bits
+    CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the
+       console and ttys0 (default is the UART0).
+    CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received.
+       This specific the size of the receive buffer
+    CONFIG_UARTn_TXBUFSIZE - Characters are buffered before
+       being sent.  This specific the size of the transmit buffer
+    CONFIG_UARTn_BAUD - The configure BAUD of the UART.  Must be
+    CONFIG_UARTn_BITS - The number of bits.  Must be either 7 or 8.
+    CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
+    CONFIG_UARTn_2STOP - Two stop bits
 
   LPC17xx specific CAN device driver settings.  These settings all
   require CONFIG_CAN:
 
-	CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
-	  Standard 11-bit IDs.
-	CONFIG_CAN1_BAUD - CAN1 BAUD rate.  Required if CONFIG_LPC17_CAN1 is defined.
-	CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_LPC17_CAN2 is defined.
-	CONFIG_CAN1_DIVISOR - CAN1 is clocked at CCLK divided by this number.
-	  (the CCLK frequency is divided by this number to get the CAN clock).
-	  Options = {1,2,4,6}. Default: 4.
-	CONFIG_CAN2_DIVISOR - CAN2 is clocked at CCLK divided by this number.
-	  (the CCLK frequency is divided by this number to get the CAN clock).
-	  Options = {1,2,4,6}. Default: 4.
-	CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
-	CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
+    CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
+      Standard 11-bit IDs.
+    CONFIG_CAN1_BAUD - CAN1 BAUD rate.  Required if CONFIG_LPC17_CAN1 is defined.
+    CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_LPC17_CAN2 is defined.
+    CONFIG_CAN1_DIVISOR - CAN1 is clocked at CCLK divided by this number.
+      (the CCLK frequency is divided by this number to get the CAN clock).
+      Options = {1,2,4,6}. Default: 4.
+    CONFIG_CAN2_DIVISOR - CAN2 is clocked at CCLK divided by this number.
+      (the CCLK frequency is divided by this number to get the CAN clock).
+      Options = {1,2,4,6}. Default: 4.
+    CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
+    CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
 
   LPC17xx specific PHY/Ethernet device driver settings.  These setting
   also require CONFIG_NET and CONFIG_LPC17_ETHERNET.
 
-	CONFIG_PHY_KS8721 - Selects Micrel KS8721 PHY
-	CONFIG_PHY_AUTONEG - Enable auto-negotion
-	CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed.
-	CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex
+    CONFIG_PHY_KS8721 - Selects Micrel KS8721 PHY
+    CONFIG_PHY_AUTONEG - Enable auto-negotion
+    CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed.
+    CONFIG_PHY_FDUPLEX - Select full (vs. half) duplex
 
     CONFIG_NET_EMACRAM_SIZE - Size of EMAC RAM.  Default: 16Kb
-	CONFIG_NET_NTXDESC - Configured number of Tx descriptors. Default: 18
-	CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18
-	CONFIG_NET_PRIORITY - Ethernet interrupt priority.  The is default is
-	  the higest priority.
-	CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
-	CONFIG_NET_REGDEBUG - Enabled low level register debug.  Also needs
-	  CONFIG_DEBUG.
-	CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
-	  Also needs CONFIG_DEBUG.
-	CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
-	CONFIG_NET_MULTICAST - Enable receipt of multicast (and unicast) frames.
-	  Automatically set if CONFIG_NET_IGMP is selected.
+    CONFIG_NET_NTXDESC - Configured number of Tx descriptors. Default: 18
+    CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18
+    CONFIG_NET_PRIORITY - Ethernet interrupt priority.  The is default is
+      the higest priority.
+    CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
+    CONFIG_NET_REGDEBUG - Enabled low level register debug.  Also needs
+      CONFIG_DEBUG.
+    CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
+      Also needs CONFIG_DEBUG.
+    CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
+    CONFIG_NET_MULTICAST - Enable receipt of multicast (and unicast) frames.
+      Automatically set if CONFIG_NET_IGMP is selected.
 
   LPC17xx USB Device Configuration
 
-	CONFIG_LPC17_USBDEV_FRAME_INTERRUPT
-	  Handle USB Start-Of-Frame events. 
-	  Enable reading SOF from interrupt handler vs. simply reading on demand.
-	  Probably a bad idea... Unless there is some issue with sampling the SOF
-	  from hardware asynchronously.
-	CONFIG_LPC17_USBDEV_EPFAST_INTERRUPT
-	  Enable high priority interrupts.  I have no idea why you might want to
-	  do that
-	CONFIG_LPC17_USBDEV_NDMADESCRIPTORS
-	  Number of DMA descriptors to allocate in SRAM.
-	CONFIG_LPC17_USBDEV_DMA
-	  Enable lpc17xx-specific DMA support
+    CONFIG_LPC17_USBDEV_FRAME_INTERRUPT
+      Handle USB Start-Of-Frame events. 
+      Enable reading SOF from interrupt handler vs. simply reading on demand.
+      Probably a bad idea... Unless there is some issue with sampling the SOF
+      from hardware asynchronously.
+    CONFIG_LPC17_USBDEV_EPFAST_INTERRUPT
+      Enable high priority interrupts.  I have no idea why you might want to
+      do that
+    CONFIG_LPC17_USBDEV_NDMADESCRIPTORS
+      Number of DMA descriptors to allocate in SRAM.
+    CONFIG_LPC17_USBDEV_DMA
+      Enable lpc17xx-specific DMA support
     CONFIG_LPC17_USBDEV_NOVBUS
       Define if the hardware implementation does not support the VBUS signal
     CONFIG_LPC17_USBDEV_NOLED
@@ -800,10 +850,10 @@ Configurations
 Each Olimex LPC1766-STK configuration is maintained in a
 sudirectory and can be selected as follow:
 
-	cd tools
-	./configure.sh olimex-lpc1766stk/<subdir>
-	cd -
-	. ./setenv.sh
+    cd tools
+    ./configure.sh olimex-lpc1766stk/<subdir>
+    cd -
+    . ./setenv.sh
 
 Where <subdir> is one of the following:
 
diff --git a/nuttx/configs/sam3u-ek/README.txt b/nuttx/configs/sam3u-ek/README.txt
index 435e30a494..b13c689457 100644
--- a/nuttx/configs/sam3u-ek/README.txt
+++ b/nuttx/configs/sam3u-ek/README.txt
@@ -10,7 +10,9 @@ Contents
   - Development Environment
   - GNU Toolchain Options
   - IDEs
-  - NuttX buildroot Toolchain
+  - NuttX EABI "buildroot" Toolchain
+  - NuttX OABI "buildroot" Toolchain
+  - NXFLAT Toolchain
   - LEDs
   - SAM3U-EK-specific Configuration Options
   - Configurations
@@ -42,7 +44,7 @@ GNU Toolchain Options
     CONFIG_SAM3U_CODESOURCERYW=y  : CodeSourcery under Windows
     CONFIG_SAM3U_CODESOURCERYL=y  : CodeSourcery under Linux
     CONFIG_SAM3U_DEVKITARM=y      : devkitARM under Windows
-    CONFIG_SAM3U_BUILDROOT=y	  : NuttX buildroot under Linux or Cygwin (default)
+    CONFIG_SAM3U_BUILDROOT=y      : NuttX buildroot under Linux or Cygwin (default)
 
   If you are not using CONFIG_SAM3U_BUILDROOT, then you may also have to modify
   the PATH in the setenv.h file if your make cannot find the tools.
@@ -123,8 +125,8 @@ IDEs
   one time from the Cygwin command line in order to obtain the pre-built
   startup object needed by RIDE.
 
-NuttX buildroot Toolchain
-^^^^^^^^^^^^^^^^^^^^^^^^^
+NuttX EABI "buildroot" Toolchain
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
   A GNU GCC-based toolchain is assumed.  The files */setenv.sh should
   be modified to point to the correct path to the Cortex-M3 GCC toolchain (if
@@ -147,7 +149,7 @@ NuttX buildroot Toolchain
 
   4. cd <some-dir>/buildroot
 
-  5. cp configs/cortexm3-defconfig-4.3.3 .config
+  5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config
 
   6. make oldconfig
 
@@ -157,9 +159,59 @@ NuttX buildroot Toolchain
      the path to the newly built binaries.
 
   See the file configs/README.txt in the buildroot source tree.  That has more
-  detailed PLUS some special instructions that you will need to follow if you are
+  details PLUS some special instructions that you will need to follow if you are
   building a Cortex-M3 toolchain for Cygwin under Windows.
 
+NuttX OABI "buildroot" Toolchain
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+  The older, OABI buildroot toolchain is also available.  To use the OABI
+  toolchain:
+
+  1. When building the buildroot toolchain, either (1) modify the cortexm3-eabi-defconfig-4.6.3
+     configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
+     configuration such as cortexm3-defconfig-4.3.3
+
+  2. Modify the Make.defs file to use the OABI converntions:
+
+    +CROSSDEV = arm-nuttx-elf-
+    +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    -CROSSDEV = arm-nuttx-eabi-
+    -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+
+NXFLAT Toolchain
+^^^^^^^^^^^^^^^^
+
+  If you are *not* using the NuttX buildroot toolchain and you want to use
+  the NXFLAT tools, then you will still have to build a portion of the buildroot
+  tools -- just the NXFLAT tools.  The buildroot with the NXFLAT tools can
+  be downloaded from the NuttX SourceForge download site
+  (https://sourceforge.net/projects/nuttx/files/).
+ 
+  This GNU toolchain builds and executes in the Linux or Cygwin environment.
+
+  1. You must have already configured Nuttx in <some-dir>/nuttx.
+
+     cd tools
+     ./configure.sh lpcxpresso-lpc1768/<sub-dir>
+
+  2. Download the latest buildroot package into <some-dir>
+
+  3. unpack the buildroot tarball.  The resulting directory may
+     have versioning information on it like buildroot-x.y.z.  If so,
+     rename <some-dir>/buildroot-x.y.z to <some-dir>/buildroot.
+
+  4. cd <some-dir>/buildroot
+
+  5. cp configs/cortexm3-defconfig-nxflat .config
+
+  6. make oldconfig
+
+  7. make
+
+  8. Edit setenv.h, if necessary, so that the PATH variable includes
+     the path to the newly builtNXFLAT binaries.
+
 LEDs
 ^^^^
 
@@ -167,16 +219,16 @@ The SAM3U-EK board has four LEDs labeled LD1, LD2, LD3 and LD4 on the
 the board.  Usage of these LEDs is defined in include/board.h and src/up_leds.c.
 They are encoded as follows:
 
-	SYMBOL				Meaning		LED0*	LED1	LED2
-	-------------------	-----------------------	-------	-------	-------
-	LED_STARTED		NuttX has been started	OFF	OFF	OFF
-	LED_HEAPALLOCATE	Heap has been allocated	OFF	OFF	ON
-	LED_IRQSENABLED		Interrupts enabled	OFF	ON	OFF
-	LED_STACKCREATED	Idle stack created	OFF	ON	ON
-	LED_INIRQ		In an interrupt**	N/C	FLASH   N/C
-	LED_SIGNAL		In a signal handler***  N/C	N/C	FLASH
-	LED_ASSERTION		An assertion failed	FLASH	N/C	N/C
-	LED_PANIC		The system has crashed	FLASH	N/C	N/C
+    SYMBOL              Meaning                 LED0*   LED1    LED2
+    ------------------- ----------------------- ------- ------- -------
+    LED_STARTED         NuttX has been started  OFF     OFF     OFF
+    LED_HEAPALLOCATE    Heap has been allocated OFF     OFF     ON
+    LED_IRQSENABLED     Interrupts enabled      OFF     ON      OFF
+    LED_STACKCREATED    Idle stack created      OFF     ON      ON
+    LED_INIRQ           In an interrupt**       N/C     FLASH   N/C
+    LED_SIGNAL          In a signal handler***  N/C     N/C     FLASH
+    LED_ASSERTION       An assertion failed     FLASH   N/C     N/C
+    LED_PANIC           The system has crashed  FLASH   N/C     N/C
 
   * If LED1 and LED2 are statically on, then NuttX probably failed to boot
     and these LEDs will give you some indication of where the failure was
@@ -188,116 +240,116 @@ They are encoded as follows:
 SAM3U-EK-specific Configuration Options
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-	CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
-	   be set to:
+    CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
+       be set to:
 
-	   CONFIG_ARCH=arm
+       CONFIG_ARCH=arm
 
-	CONFIG_ARCH_family - For use in C code:
+    CONFIG_ARCH_family - For use in C code:
 
-	   CONFIG_ARCH_ARM=y
+       CONFIG_ARCH_ARM=y
 
-	CONFIG_ARCH_architecture - For use in C code:
+    CONFIG_ARCH_architecture - For use in C code:
 
-	   CONFIG_ARCH_CORTEXM3=y
+       CONFIG_ARCH_CORTEXM3=y
 
-	CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
+    CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
-	   CONFIG_ARCH_CHIP=sam3u
+       CONFIG_ARCH_CHIP=sam3u
 
-	CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
-	   chip:
+    CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
+       chip:
 
-	   CONFIG_ARCH_CHIP_AT91SAM3U4
+       CONFIG_ARCH_CHIP_AT91SAM3U4
 
-	CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
-	   hence, the board that supports the particular chip or SoC.
+    CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
+       hence, the board that supports the particular chip or SoC.
 
-	   CONFIG_ARCH_BOARD=sam3u_ek (for the SAM3U-EK development board)
+       CONFIG_ARCH_BOARD=sam3u_ek (for the SAM3U-EK development board)
 
-	CONFIG_ARCH_BOARD_name - For use in C code
+    CONFIG_ARCH_BOARD_name - For use in C code
 
-	   CONFIG_ARCH_BOARD_SAM3UEK=y
+       CONFIG_ARCH_BOARD_SAM3UEK=y
 
-	CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
-	   of delay loops
+    CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
+       of delay loops
 
-	CONFIG_ENDIAN_BIG - define if big endian (default is little
-	   endian)
+    CONFIG_ENDIAN_BIG - define if big endian (default is little
+       endian)
 
-	CONFIG_DRAM_SIZE - Describes the installed DRAM (SRAM in this case):
+    CONFIG_DRAM_SIZE - Describes the installed DRAM (SRAM in this case):
 
-	   CONFIG_DRAM_SIZE=0x0000c000 (48Kb)
+       CONFIG_DRAM_SIZE=0x0000c000 (48Kb)
 
-	CONFIG_DRAM_START - The start address of installed DRAM
+    CONFIG_DRAM_START - The start address of installed DRAM
 
-	   CONFIG_DRAM_START=0x20000000
+       CONFIG_DRAM_START=0x20000000
 
-	CONFIG_ARCH_IRQPRIO - The SAM3UF103Z supports interrupt prioritization
+    CONFIG_ARCH_IRQPRIO - The SAM3UF103Z supports interrupt prioritization
 
-	   CONFIG_ARCH_IRQPRIO=y
+       CONFIG_ARCH_IRQPRIO=y
 
-	CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
-	   have LEDs
+    CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
+       have LEDs
 
-	CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
-	   stack. If defined, this symbol is the size of the interrupt
-	    stack in bytes.  If not defined, the user task stacks will be
-	  used during interrupt handling.
+    CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
+       stack. If defined, this symbol is the size of the interrupt
+        stack in bytes.  If not defined, the user task stacks will be
+      used during interrupt handling.
 
-	CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
+    CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 
-	CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
+    CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
 
-	CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
-	   cause a 100 second delay during boot-up.  This 100 second delay
-	   serves no purpose other than it allows you to calibratre
-	   CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
-	   the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
-	   the delay actually is 100 seconds.
+    CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
+       cause a 100 second delay during boot-up.  This 100 second delay
+       serves no purpose other than it allows you to calibratre
+       CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
+       the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
+       the delay actually is 100 seconds.
 
   Individual subsystems can be enabled:
 
-	CONFIG_SAM3U_DMA
-	CONFIG_SAM3U_HSMCI
-	CONFIG_SAM3U_NAND
-	CONFIG_SAM3U_SPI
-	CONFIG_SAM3U_UART
-	CONFIG_SAM3U_USART0
-	CONFIG_SAM3U_USART1
-	CONFIG_SAM3U_USART2
-	CONFIG_SAM3U_USART3
+    CONFIG_SAM3U_DMA
+    CONFIG_SAM3U_HSMCI
+    CONFIG_SAM3U_NAND
+    CONFIG_SAM3U_SPI
+    CONFIG_SAM3U_UART
+    CONFIG_SAM3U_USART0
+    CONFIG_SAM3U_USART1
+    CONFIG_SAM3U_USART2
+    CONFIG_SAM3U_USART3
 
   Some subsystems can be configured to operate in different ways. The drivers
   need to know how to configure the subsystem.
 
-	CONFIG_GPIOA_IRQ
-	CONFIG_GPIOB_IRQ
-	CONFIG_GPIOC_IRQ
-	CONFIG_USART0_ISUART
-	CONFIG_USART1_ISUART
-	CONFIG_USART2_ISUART
-	CONFIG_USART3_ISUART
+    CONFIG_GPIOA_IRQ
+    CONFIG_GPIOB_IRQ
+    CONFIG_GPIOC_IRQ
+    CONFIG_USART0_ISUART
+    CONFIG_USART1_ISUART
+    CONFIG_USART2_ISUART
+    CONFIG_USART3_ISUART
 
   AT91SAM3U specific device driver settings
 
-	CONFIG_U[S]ARTn_SERIAL_CONSOLE - selects the USARTn (n=0,1,2,3) or UART
+    CONFIG_U[S]ARTn_SERIAL_CONSOLE - selects the USARTn (n=0,1,2,3) or UART
            m (m=4,5) for the console and ttys0 (default is the USART1).
-	CONFIG_U[S]ARTn_RXBUFSIZE - Characters are buffered as received.
-	   This specific the size of the receive buffer
-	CONFIG_U[S]ARTn_TXBUFSIZE - Characters are buffered before
-	   being sent.  This specific the size of the transmit buffer
-	CONFIG_U[S]ARTn_BAUD - The configure BAUD of the UART.  Must be
-	CONFIG_U[S]ARTn_BITS - The number of bits.  Must be either 7 or 8.
-	CONFIG_U[S]ARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
-	CONFIG_U[S]ARTn_2STOP - Two stop bits
+    CONFIG_U[S]ARTn_RXBUFSIZE - Characters are buffered as received.
+       This specific the size of the receive buffer
+    CONFIG_U[S]ARTn_TXBUFSIZE - Characters are buffered before
+       being sent.  This specific the size of the transmit buffer
+    CONFIG_U[S]ARTn_BAUD - The configure BAUD of the UART.  Must be
+    CONFIG_U[S]ARTn_BITS - The number of bits.  Must be either 7 or 8.
+    CONFIG_U[S]ARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
+    CONFIG_U[S]ARTn_2STOP - Two stop bits
 
   LCD Options.  Other than the standard LCD configuration options
   (see configs/README.txt), the SAM3U-EK driver also supports:
 
-	CONFIG_LCD_PORTRAIT - Present the display in the standard 240x320
-	   "Portrait" orientation.  Default:  The display is rotated to
-	   support a 320x240 "Landscape" orientation.
+    CONFIG_LCD_PORTRAIT - Present the display in the standard 240x320
+       "Portrait" orientation.  Default:  The display is rotated to
+       support a 320x240 "Landscape" orientation.
 
 Configurations
 ^^^^^^^^^^^^^^
@@ -305,10 +357,10 @@ Configurations
 Each SAM3U-EK configuration is maintained in a sudirectory and
 can be selected as follow:
 
-	cd tools
-	./configure.sh sam3u-ek/<subdir>
-	cd -
-	. ./setenv.sh
+    cd tools
+    ./configure.sh sam3u-ek/<subdir>
+    cd -
+    . ./setenv.sh
 
 Before sourcing the setenv.sh file above, you should examine it and perform
 edits as necessary so that BUILDROOT_BIN is the correct path to the directory
@@ -317,7 +369,7 @@ than holds your toolchain binaries.
 And then build NuttX by simply typing the following.  At the conclusion of
 the make, the nuttx binary will reside in an ELF file called, simply, nuttx.
 
-	make
+    make
 
 The <subdir> that is provided above as an argument to the tools/configure.sh
 must be is one of the following:
@@ -328,7 +380,7 @@ must be is one of the following:
     are built separately.  This build requires a special make command; not
     just 'make' but make with the following two arguments:
 
-	    make pass1 pass2
+        make pass1 pass2
 
     This is required because in the normal case (just 'make'), make will
     create all dependencies then execute the pass1 and pass2 targets.  But
@@ -336,16 +388,16 @@ must be is one of the following:
     This specall make command ('make pass1 pass2') will make the dependencies
     separately for each pass.
 
-	At there end of the build, there four files will top-level build
-	directory:
+    At there end of the build, there four files will top-level build
+    directory:
 
-	nuttx_user.elf	- The pass1 ELF file
-	nuttx			- The pass2 ELF file
-	nuttx_user.hex	- The pass1 Intel HEX format file
-	nuttx.hex		- The pass2 Intel HEX file
+    nuttx_user.elf    - The pass1 ELF file
+    nuttx            - The pass2 ELF file
+    nuttx_user.hex    - The pass1 Intel HEX format file
+    nuttx.hex        - The pass2 Intel HEX file
 
-	The J-Link program will except files in .hex, .mot, .srec, and .bin
-	formats.
+    The J-Link program will except files in .hex, .mot, .srec, and .bin
+    formats.
 
   nsh:
     Configures the NuttShell (nsh) located at examples/nsh.  The
diff --git a/nuttx/configs/stm3210e-eval/README.txt b/nuttx/configs/stm3210e-eval/README.txt
index f68ce26ded..704fadb62c 100644
--- a/nuttx/configs/stm3210e-eval/README.txt
+++ b/nuttx/configs/stm3210e-eval/README.txt
@@ -10,7 +10,9 @@ Contents
   - Development Environment
   - GNU Toolchain Options
   - IDEs
-  - NuttX buildroot Toolchain
+  - NuttX EABI "buildroot" Toolchain
+  - NuttX OABI "buildroot" Toolchain
+  - NXFLAT Toolchain
   - DFU and JTAG
   - OpenOCD
   - LEDs
@@ -131,8 +133,8 @@ IDEs
   one time from the Cygwin command line in order to obtain the pre-built
   startup object needed by RIDE.
 
-NuttX buildroot Toolchain
-=========================
+NuttX EABI "buildroot" Toolchain
+================================
 
   A GNU GCC-based toolchain is assumed.  The files */setenv.sh should
   be modified to point to the correct path to the Cortex-M3 GCC toolchain (if
@@ -155,7 +157,7 @@ NuttX buildroot Toolchain
 
   4. cd <some-dir>/buildroot
 
-  5. cp configs/cortexm3-defconfig-4.3.3 .config
+  5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config
 
   6. make oldconfig
 
@@ -165,9 +167,59 @@ NuttX buildroot Toolchain
      the path to the newly built binaries.
 
   See the file configs/README.txt in the buildroot source tree.  That has more
-  detailed PLUS some special instructions that you will need to follow if you are
+  details PLUS some special instructions that you will need to follow if you are
   building a Cortex-M3 toolchain for Cygwin under Windows.
 
+NuttX OABI "buildroot" Toolchain
+================================
+
+  The older, OABI buildroot toolchain is also available.  To use the OABI
+  toolchain:
+
+  1. When building the buildroot toolchain, either (1) modify the cortexm3-eabi-defconfig-4.6.3
+     configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
+     configuration such as cortexm3-defconfig-4.3.3
+
+  2. Modify the Make.defs file to use the OABI converntions:
+
+    +CROSSDEV = arm-nuttx-elf-
+    +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    -CROSSDEV = arm-nuttx-eabi-
+    -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+
+NXFLAT Toolchain
+================
+
+  If you are *not* using the NuttX buildroot toolchain and you want to use
+  the NXFLAT tools, then you will still have to build a portion of the buildroot
+  tools -- just the NXFLAT tools.  The buildroot with the NXFLAT tools can
+  be downloaded from the NuttX SourceForge download site
+  (https://sourceforge.net/projects/nuttx/files/).
+ 
+  This GNU toolchain builds and executes in the Linux or Cygwin environment.
+
+  1. You must have already configured Nuttx in <some-dir>/nuttx.
+
+     cd tools
+     ./configure.sh lpcxpresso-lpc1768/<sub-dir>
+
+  2. Download the latest buildroot package into <some-dir>
+
+  3. unpack the buildroot tarball.  The resulting directory may
+     have versioning information on it like buildroot-x.y.z.  If so,
+     rename <some-dir>/buildroot-x.y.z to <some-dir>/buildroot.
+
+  4. cd <some-dir>/buildroot
+
+  5. cp configs/cortexm3-defconfig-nxflat .config
+
+  6. make oldconfig
+
+  7. make
+
+  8. Edit setenv.h, if necessary, so that the PATH variable includes
+     the path to the newly builtNXFLAT binaries.
+
 DFU and JTAG
 ============
 
diff --git a/nuttx/configs/stm3220g-eval/README.txt b/nuttx/configs/stm3220g-eval/README.txt
index 22038893e6..79311150d3 100644
--- a/nuttx/configs/stm3220g-eval/README.txt
+++ b/nuttx/configs/stm3220g-eval/README.txt
@@ -10,7 +10,9 @@ Contents
   - Development Environment
   - GNU Toolchain Options
   - IDEs
-  - NuttX buildroot Toolchain
+  - NuttX EABI "buildroot" Toolchain
+  - NuttX OABI "buildroot" Toolchain
+  - NXFLAT Toolchain
   - STM3220G-EVAL-specific Configuration Options
   - LEDs
   - Ethernet
@@ -170,8 +172,8 @@ IDEs
   one time from the Cygwin command line in order to obtain the pre-built
   startup object needed by RIDE.
 
-NuttX buildroot Toolchain
-=========================
+NuttX EABI "buildroot" Toolchain
+================================
 
   A GNU GCC-based toolchain is assumed.  The files */setenv.sh should
   be modified to point to the correct path to the Cortex-M3 GCC toolchain (if
@@ -194,7 +196,7 @@ NuttX buildroot Toolchain
 
   4. cd <some-dir>/buildroot
 
-  5. cp configs/cortexm3-defconfig-4.3.3 .config
+  5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config
 
   6. make oldconfig
 
@@ -204,9 +206,59 @@ NuttX buildroot Toolchain
      the path to the newly built binaries.
 
   See the file configs/README.txt in the buildroot source tree.  That has more
-  detailed PLUS some special instructions that you will need to follow if you are
+  details PLUS some special instructions that you will need to follow if you are
   building a Cortex-M3 toolchain for Cygwin under Windows.
 
+NuttX OABI "buildroot" Toolchain
+================================
+
+  The older, OABI buildroot toolchain is also available.  To use the OABI
+  toolchain:
+
+  1. When building the buildroot toolchain, either (1) modify the cortexm3-eabi-defconfig-4.6.3
+     configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
+     configuration such as cortexm3-defconfig-4.3.3
+
+  2. Modify the Make.defs file to use the OABI converntions:
+
+    +CROSSDEV = arm-nuttx-elf-
+    +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    -CROSSDEV = arm-nuttx-eabi-
+    -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+
+NXFLAT Toolchain
+================
+
+  If you are *not* using the NuttX buildroot toolchain and you want to use
+  the NXFLAT tools, then you will still have to build a portion of the buildroot
+  tools -- just the NXFLAT tools.  The buildroot with the NXFLAT tools can
+  be downloaded from the NuttX SourceForge download site
+  (https://sourceforge.net/projects/nuttx/files/).
+ 
+  This GNU toolchain builds and executes in the Linux or Cygwin environment.
+
+  1. You must have already configured Nuttx in <some-dir>/nuttx.
+
+     cd tools
+     ./configure.sh lpcxpresso-lpc1768/<sub-dir>
+
+  2. Download the latest buildroot package into <some-dir>
+
+  3. unpack the buildroot tarball.  The resulting directory may
+     have versioning information on it like buildroot-x.y.z.  If so,
+     rename <some-dir>/buildroot-x.y.z to <some-dir>/buildroot.
+
+  4. cd <some-dir>/buildroot
+
+  5. cp configs/cortexm3-defconfig-nxflat .config
+
+  6. make oldconfig
+
+  7. make
+
+  8. Edit setenv.h, if necessary, so that the PATH variable includes
+     the path to the newly builtNXFLAT binaries.
+
 Ethernet
 ========
 
diff --git a/nuttx/configs/stm3240g-eval/README.txt b/nuttx/configs/stm3240g-eval/README.txt
index a1a596bae2..d77609e126 100644
--- a/nuttx/configs/stm3240g-eval/README.txt
+++ b/nuttx/configs/stm3240g-eval/README.txt
@@ -10,7 +10,9 @@ Contents
   - Development Environment
   - GNU Toolchain Options
   - IDEs
-  - NuttX buildroot Toolchain
+  - NuttX EABI "buildroot" Toolchain
+  - NuttX OABI "buildroot" Toolchain
+  - NXFLAT Toolchain
   - STM3240G-EVAL-specific Configuration Options
   - LEDs
   - Ethernet
@@ -177,8 +179,8 @@ IDEs
   one time from the Cygwin command line in order to obtain the pre-built
   startup object needed by RIDE.
 
-NuttX buildroot Toolchain
-=========================
+NuttX EABI "buildroot" Toolchain
+================================
 
   A GNU GCC-based toolchain is assumed.  The files */setenv.sh should
   be modified to point to the correct path to the Cortex-M3 GCC toolchain (if
@@ -201,7 +203,7 @@ NuttX buildroot Toolchain
 
   4. cd <some-dir>/buildroot
 
-  5. cp configs/cortexm3-defconfig-4.3.3 .config
+  5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config
 
   6. make oldconfig
 
@@ -211,9 +213,59 @@ NuttX buildroot Toolchain
      the path to the newly built binaries.
 
   See the file configs/README.txt in the buildroot source tree.  That has more
-  detailed PLUS some special instructions that you will need to follow if you are
+  details PLUS some special instructions that you will need to follow if you are
   building a Cortex-M3 toolchain for Cygwin under Windows.
 
+NuttX OABI "buildroot" Toolchain
+================================
+
+  The older, OABI buildroot toolchain is also available.  To use the OABI
+  toolchain:
+
+  1. When building the buildroot toolchain, either (1) modify the cortexm3-eabi-defconfig-4.6.3
+     configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
+     configuration such as cortexm3-defconfig-4.3.3
+
+  2. Modify the Make.defs file to use the OABI converntions:
+
+    +CROSSDEV = arm-nuttx-elf-
+    +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    -CROSSDEV = arm-nuttx-eabi-
+    -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+
+NXFLAT Toolchain
+================
+
+  If you are *not* using the NuttX buildroot toolchain and you want to use
+  the NXFLAT tools, then you will still have to build a portion of the buildroot
+  tools -- just the NXFLAT tools.  The buildroot with the NXFLAT tools can
+  be downloaded from the NuttX SourceForge download site
+  (https://sourceforge.net/projects/nuttx/files/).
+ 
+  This GNU toolchain builds and executes in the Linux or Cygwin environment.
+
+  1. You must have already configured Nuttx in <some-dir>/nuttx.
+
+     cd tools
+     ./configure.sh lpcxpresso-lpc1768/<sub-dir>
+
+  2. Download the latest buildroot package into <some-dir>
+
+  3. unpack the buildroot tarball.  The resulting directory may
+     have versioning information on it like buildroot-x.y.z.  If so,
+     rename <some-dir>/buildroot-x.y.z to <some-dir>/buildroot.
+
+  4. cd <some-dir>/buildroot
+
+  5. cp configs/cortexm3-defconfig-nxflat .config
+
+  6. make oldconfig
+
+  7. make
+
+  8. Edit setenv.h, if necessary, so that the PATH variable includes
+     the path to the newly builtNXFLAT binaries.
+
 Ethernet
 ========
 
diff --git a/nuttx/configs/stm32f4discovery/README.txt b/nuttx/configs/stm32f4discovery/README.txt
index baf5184e30..65b4bf7527 100644
--- a/nuttx/configs/stm32f4discovery/README.txt
+++ b/nuttx/configs/stm32f4discovery/README.txt
@@ -10,7 +10,9 @@ Contents
   - Development Environment
   - GNU Toolchain Options
   - IDEs
-  - NuttX buildroot Toolchain
+  - NuttX EABI "buildroot" Toolchain
+  - NuttX OABI "buildroot" Toolchain
+  - NXFLAT Toolchain
   - LEDs
   - PWM
   - UARTs
@@ -174,8 +176,8 @@ IDEs
   one time from the Cygwin command line in order to obtain the pre-built
   startup object needed by RIDE.
 
-NuttX buildroot Toolchain
-=========================
+NuttX EABI "buildroot" Toolchain
+================================
 
   A GNU GCC-based toolchain is assumed.  The files */setenv.sh should
   be modified to point to the correct path to the Cortex-M3 GCC toolchain (if
@@ -198,7 +200,7 @@ NuttX buildroot Toolchain
 
   4. cd <some-dir>/buildroot
 
-  5. cp configs/cortexm3-defconfig-4.3.3 .config
+  5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config
 
   6. make oldconfig
 
@@ -208,9 +210,59 @@ NuttX buildroot Toolchain
      the path to the newly built binaries.
 
   See the file configs/README.txt in the buildroot source tree.  That has more
-  detailed PLUS some special instructions that you will need to follow if you are
+  details PLUS some special instructions that you will need to follow if you are
   building a Cortex-M3 toolchain for Cygwin under Windows.
 
+NuttX OABI "buildroot" Toolchain
+================================
+
+  The older, OABI buildroot toolchain is also available.  To use the OABI
+  toolchain:
+
+  1. When building the buildroot toolchain, either (1) modify the cortexm3-eabi-defconfig-4.6.3
+     configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
+     configuration such as cortexm3-defconfig-4.3.3
+
+  2. Modify the Make.defs file to use the OABI converntions:
+
+    +CROSSDEV = arm-nuttx-elf-
+    +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    -CROSSDEV = arm-nuttx-eabi-
+    -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+
+NXFLAT Toolchain
+================
+
+  If you are *not* using the NuttX buildroot toolchain and you want to use
+  the NXFLAT tools, then you will still have to build a portion of the buildroot
+  tools -- just the NXFLAT tools.  The buildroot with the NXFLAT tools can
+  be downloaded from the NuttX SourceForge download site
+  (https://sourceforge.net/projects/nuttx/files/).
+ 
+  This GNU toolchain builds and executes in the Linux or Cygwin environment.
+
+  1. You must have already configured Nuttx in <some-dir>/nuttx.
+
+     cd tools
+     ./configure.sh lpcxpresso-lpc1768/<sub-dir>
+
+  2. Download the latest buildroot package into <some-dir>
+
+  3. unpack the buildroot tarball.  The resulting directory may
+     have versioning information on it like buildroot-x.y.z.  If so,
+     rename <some-dir>/buildroot-x.y.z to <some-dir>/buildroot.
+
+  4. cd <some-dir>/buildroot
+
+  5. cp configs/cortexm3-defconfig-nxflat .config
+
+  6. make oldconfig
+
+  7. make
+
+  8. Edit setenv.h, if necessary, so that the PATH variable includes
+     the path to the newly builtNXFLAT binaries.
+
 LEDs
 ====
 
diff --git a/nuttx/configs/twr-k60n512/README.txt b/nuttx/configs/twr-k60n512/README.txt
index ccf81508c5..3ac70cf7eb 100644
--- a/nuttx/configs/twr-k60n512/README.txt
+++ b/nuttx/configs/twr-k60n512/README.txt
@@ -23,7 +23,9 @@ Contents
   o Development Environment
   o GNU Toolchain Options
   o IDEs
-  o NuttX buildroot Toolchain
+  o NuttX EABI "buildroot" Toolchain
+  o NuttX OABI "buildroot" Toolchain
+  o NXFLAT Toolchain
   
 Kinetis TWR-K60N512 Features:
 =============================
@@ -264,17 +266,17 @@ The TWR-K60N100 board has four LEDs labeled D2..D4 on the board.  Usage of
 these LEDs is defined in include/board.h and src/up_leds.c.  They are encoded
 as follows:
 
-	SYMBOL				Meaning					LED1*	LED2	LED3	LED4
-	-------------------	-----------------------	-------	-------	-------	------
-	LED_STARTED			NuttX has been started	ON		OFF		OFF		OFF
-	LED_HEAPALLOCATE	Heap has been allocated	OFF		ON		OFF		OFF
-	LED_IRQSENABLED		Interrupts enabled		ON		ON		OFF		OFF
-	LED_STACKCREATED	Idle stack created		OFF		OFF		ON		OFF
-	LED_INIRQ			In an interrupt**		ON		N/C		N/C		OFF
-	LED_SIGNAL			In a signal handler***  N/C		ON		N/C		OFF
-	LED_ASSERTION		An assertion failed		ON		ON		N/C		OFF
-	LED_PANIC			The system has crashed	N/C		N/C		N/C		ON
-    LED_IDLE            STM32 is is sleep mode  (Optional, not used)
+    SYMBOL                Meaning                  LED1*    LED2    LED3    LED4
+    -------------------   -----------------------  -------  ------- ------- ------
+    LED_STARTED           NuttX has been started   ON       OFF     OFF     OFF
+    LED_HEAPALLOCATE      Heap has been allocated  OFF      ON      OFF     OFF
+    LED_IRQSENABLED       Interrupts enabled       ON       ON      OFF     OFF
+    LED_STACKCREATED      Idle stack created       OFF      OFF     ON      OFF
+    LED_INIRQ             In an interrupt**        ON       N/C     N/C     OFF
+    LED_SIGNAL            In a signal handler***   N/C      ON      N/C     OFF
+    LED_ASSERTION         An assertion failed      ON       ON      N/C     OFF
+    LED_PANIC             The system has crashed   N/C      N/C      N/C    ON
+    LED_IDLE              STM32 is is sleep mode   (Optional, not used)
 
   * If LED1, LED2, LED3 are statically on, then NuttX probably failed to boot
     and these LEDs will give you some indication of where the failure was
@@ -308,7 +310,7 @@ GNU Toolchain Options
     CONFIG_KINETIS_CODESOURCERYW=y  : CodeSourcery under Windows
     CONFIG_KINETIS_CODESOURCERYL=y  : CodeSourcery under Linux
     CONFIG_KINETIS_DEVKITARM=y      : devkitARM under Windows
-    CONFIG_KINETIS_BUILDROOT=y	    : NuttX buildroot under Linux or Cygwin (default)
+    CONFIG_KINETIS_BUILDROOT=y      : NuttX buildroot under Linux or Cygwin (default)
 
   If you are not using CONFIG_KINETIS_BUILDROOT, then you may also have to modify
   the PATH in the setenv.h file if your make cannot find the tools.
@@ -386,8 +388,8 @@ IDEs
   Startup files will probably cause you some headaches.  The NuttX startup file
   is arch/arm/src/kinetis/k40_vectors.S.
 
-NuttX buildroot Toolchain
-=========================
+NuttX EABI "buildroot" Toolchain
+================================
 
   A GNU GCC-based toolchain is assumed.  The files */setenv.sh should
   be modified to point to the correct path to the Cortex-M4 GCC toolchain (if
@@ -397,8 +399,7 @@ NuttX buildroot Toolchain
   SourceForge download site (https://sourceforge.net/projects/nuttx/files/buildroot/).
   This GNU toolchain builds and executes in the Linux or Cygwin environment.
 
-  NOTE:  The NuttX toolchain is an OABI toolchain (vs. the more common EABI)
-  and does not include optimizations for Cortex-M4 (ARMv7E-M).
+  NOTE:  The NuttX toolchain may not include optimizations for Cortex-M4 (ARMv7E-M).
 
   1. You must have already configured Nuttx in <some-dir>/nuttx.
 
@@ -413,7 +414,7 @@ NuttX buildroot Toolchain
 
   4. cd <some-dir>/buildroot
 
-  5. cp configs/cortexm3-defconfig-4.3.3 .config
+  5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config
 
   6. make oldconfig
 
@@ -423,92 +424,142 @@ NuttX buildroot Toolchain
      the path to the newly built binaries.
 
   See the file configs/README.txt in the buildroot source tree.  That has more
-  detailed PLUS some special instructions that you will need to follow if you are
+  details PLUS some special instructions that you will need to follow if you are
   building a Cortex-M4 toolchain for Cygwin under Windows.
 
+NuttX OABI "buildroot" Toolchain
+================================
+
+  The older, OABI buildroot toolchain is also available.  To use the OABI
+  toolchain:
+
+  1. When building the buildroot toolchain, either (1) modify the cortexm3-eabi-defconfig-4.6.3
+     configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
+     configuration such as cortexm3-defconfig-4.3.3
+
+  2. Modify the Make.defs file to use the OABI converntions:
+
+    +CROSSDEV = arm-nuttx-elf-
+    +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    -CROSSDEV = arm-nuttx-eabi-
+    -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+
+NXFLAT Toolchain
+================
+
+  If you are *not* using the NuttX buildroot toolchain and you want to use
+  the NXFLAT tools, then you will still have to build a portion of the buildroot
+  tools -- just the NXFLAT tools.  The buildroot with the NXFLAT tools can
+  be downloaded from the NuttX SourceForge download site
+  (https://sourceforge.net/projects/nuttx/files/).
+ 
+  This GNU toolchain builds and executes in the Linux or Cygwin environment.
+
+  1. You must have already configured Nuttx in <some-dir>/nuttx.
+
+     cd tools
+     ./configure.sh lpcxpresso-lpc1768/<sub-dir>
+
+  2. Download the latest buildroot package into <some-dir>
+
+  3. unpack the buildroot tarball.  The resulting directory may
+     have versioning information on it like buildroot-x.y.z.  If so,
+     rename <some-dir>/buildroot-x.y.z to <some-dir>/buildroot.
+
+  4. cd <some-dir>/buildroot
+
+  5. cp configs/cortexm3-defconfig-nxflat .config
+
+  6. make oldconfig
+
+  7. make
+
+  8. Edit setenv.h, if necessary, so that the PATH variable includes
+     the path to the newly builtNXFLAT binaries.
+
 TWR-K60N512-specific Configuration Options
 ==========================================
 
-	CONFIG_ARCH - Identifies the arch/ subdirectory.  This sould
-	   be set to:
+    CONFIG_ARCH - Identifies the arch/ subdirectory.  This sould
+       be set to:
 
-	   CONFIG_ARCH=arm
+       CONFIG_ARCH=arm
 
-	CONFIG_ARCH_family - For use in C code:
+    CONFIG_ARCH_family - For use in C code:
 
-	   CONFIG_ARCH_ARM=y
+       CONFIG_ARCH_ARM=y
 
-	CONFIG_ARCH_architecture - For use in C code:
+    CONFIG_ARCH_architecture - For use in C code:
 
-	   CONFIG_ARCH_CORTEXM4=y
+       CONFIG_ARCH_CORTEXM4=y
 
-	CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
+    CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
-	   CONFIG_ARCH_CHIP=k40
+       CONFIG_ARCH_CHIP=k40
 
-	CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
-	   chip:
+    CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
+       chip:
 
-	   CONFIG_ARCH_CHIP_MK60N512VMD100
+       CONFIG_ARCH_CHIP_MK60N512VMD100
 
-	CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
-	   hence, the board that supports the particular chip or SoC.
+    CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
+       hence, the board that supports the particular chip or SoC.
 
-	   CONFIG_ARCH_BOARD=twr-k60n512 (for the TWR-K60N512 development board)
+       CONFIG_ARCH_BOARD=twr-k60n512 (for the TWR-K60N512 development board)
 
-	CONFIG_ARCH_BOARD_name - For use in C code
+    CONFIG_ARCH_BOARD_name - For use in C code
 
-	   CONFIG_ARCH_BOARD_TWR_K60N512=y
+       CONFIG_ARCH_BOARD_TWR_K60N512=y
 
-	CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
-	   of delay loops
+    CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
+       of delay loops
 
-	CONFIG_ENDIAN_BIG - define if big endian (default is little
-	   endian)
+    CONFIG_ENDIAN_BIG - define if big endian (default is little
+       endian)
 
-	CONFIG_DRAM_SIZE - Describes the installed DRAM (SRAM in this case):
+    CONFIG_DRAM_SIZE - Describes the installed DRAM (SRAM in this case):
 
-	   CONFIG_DRAM_SIZE=0x00010000 (64Kb)
+       CONFIG_DRAM_SIZE=0x00010000 (64Kb)
 
-	CONFIG_DRAM_START - The start address of installed DRAM
+    CONFIG_DRAM_START - The start address of installed DRAM
 
-	   CONFIG_DRAM_START=0x20000000
+       CONFIG_DRAM_START=0x20000000
 
-	CONFIG_ARCH_IRQPRIO - The Kinetis K60 supports interrupt prioritization
+    CONFIG_ARCH_IRQPRIO - The Kinetis K60 supports interrupt prioritization
 
-	   CONFIG_ARCH_IRQPRIO=y
+       CONFIG_ARCH_IRQPRIO=y
 
-	CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
-	   have LEDs
+    CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
+       have LEDs
 
-	CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
-	   stack. If defined, this symbol is the size of the interrupt
-	    stack in bytes.  If not defined, the user task stacks will be
-	  used during interrupt handling.
+    CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
+       stack. If defined, this symbol is the size of the interrupt
+        stack in bytes.  If not defined, the user task stacks will be
+      used during interrupt handling.
 
-	CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
+    CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 
-	CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
+    CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
 
-	CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
-	   cause a 100 second delay during boot-up.  This 100 second delay
-	   serves no purpose other than it allows you to calibratre
-	   CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
-	   the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
-	   the delay actually is 100 seconds.
+    CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
+       cause a 100 second delay during boot-up.  This 100 second delay
+       serves no purpose other than it allows you to calibratre
+       CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
+       the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
+       the delay actually is 100 seconds.
 
   Individual subsystems can be enabled:
 
     CONFIG_KINETIS_TRACE    -- Enable trace clocking on power up.
     CONFIG_KINETIS_FLEXBUS  -- Enable flexbus clocking on power up.
-  	CONFIG_KINETIS_UART0    -- Support UART0
-  	CONFIG_KINETIS_UART1    -- Support UART1
-  	CONFIG_KINETIS_UART2    -- Support UART2
-  	CONFIG_KINETIS_UART3    -- Support UART3
-  	CONFIG_KINETIS_UART4    -- Support UART4
-  	CONFIG_KINETIS_UART5    -- Support UART5
-  	CONFIG_KINETIS_ENET     -- Support Ethernet (K60 only)
-  	CONFIG_KINETIS_RNGB     -- Support the random number generator(K60 only)
+      CONFIG_KINETIS_UART0    -- Support UART0
+      CONFIG_KINETIS_UART1    -- Support UART1
+      CONFIG_KINETIS_UART2    -- Support UART2
+      CONFIG_KINETIS_UART3    -- Support UART3
+      CONFIG_KINETIS_UART4    -- Support UART4
+      CONFIG_KINETIS_UART5    -- Support UART5
+      CONFIG_KINETIS_ENET     -- Support Ethernet (K60 only)
+      CONFIG_KINETIS_RNGB     -- Support the random number generator(K60 only)
     CONFIG_KINETIS_FLEXCAN0 -- Support FlexCAN0
     CONFIG_KINETIS_FLEXCAN1 -- Support FlexCAN1
     CONFIG_KINETIS_SPI0     -- Support SPI0
@@ -517,8 +568,8 @@ TWR-K60N512-specific Configuration Options
     CONFIG_KINETIS_I2C0     -- Support I2C0
     CONFIG_KINETIS_I2C1     -- Support I2C1
     CONFIG_KINETIS_I2S      -- Support I2S
-  	CONFIG_KINETIS_DAC0     -- Support DAC0
-  	CONFIG_KINETIS_DAC1     -- Support DAC1
+      CONFIG_KINETIS_DAC0     -- Support DAC0
+      CONFIG_KINETIS_DAC1     -- Support DAC1
     CONFIG_KINETIS_ADC0     -- Support ADC0
     CONFIG_KINETIS_ADC1     -- Support ADC1
     CONFIG_KINETIS_CMP      -- Support CMP
@@ -571,15 +622,15 @@ TWR-K60N512-specific Configuration Options
 
   Kinetis K60 specific device driver settings
 
-	CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn (n=0..5) for the
+    CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn (n=0..5) for the
       console and ttys0 (default is the UART0).
-	CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received.
-	   This specific the size of the receive buffer
-	CONFIG_UARTn_TXBUFSIZE - Characters are buffered before
-	   being sent.  This specific the size of the transmit buffer
-	CONFIG_UARTn_BAUD - The configure BAUD of the UART.
-	CONFIG_UARTn_BITS - The number of bits.  Must be either 8 or 8.
-	CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
+    CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received.
+       This specific the size of the receive buffer
+    CONFIG_UARTn_TXBUFSIZE - Characters are buffered before
+       being sent.  This specific the size of the transmit buffer
+    CONFIG_UARTn_BAUD - The configure BAUD of the UART.
+    CONFIG_UARTn_BITS - The number of bits.  Must be either 8 or 8.
+    CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
 
   Kenetis ethernet controller settings
 
@@ -596,10 +647,10 @@ Configurations
 Each TWR-K60N512 configuration is maintained in a sudirectory and
 can be selected as follow:
 
-	cd tools
-	./configure.sh twr-k60n512/<subdir>
-	cd -
-	. ./setenv.sh
+    cd tools
+    ./configure.sh twr-k60n512/<subdir>
+    cd -
+    . ./setenv.sh
 
 Where <subdir> is one of the following:
 
@@ -609,7 +660,7 @@ Where <subdir> is one of the following:
     examples/ostest.  By default, this project assumes that you are
     using the DFU bootloader.
 
-    CONFIG_KINETIS_BUILDROOT=y	  : NuttX buildroot under Linux or Cygwin
+    CONFIG_KINETIS_BUILDROOT=y      : NuttX buildroot under Linux or Cygwin
 
   nsh:
   ---
@@ -618,7 +669,7 @@ Where <subdir> is one of the following:
     Support for the board's SPI-based MicroSD card is included
     (but not passing tests as of this writing).
 
-	NOTE: An SDHC driver is underwork and can be enabled in the NSH
+    NOTE: An SDHC driver is underwork and can be enabled in the NSH
     configuration for further testing be setting the following
     configuration faluesas follows:
 
diff --git a/nuttx/configs/vsn/README.txt b/nuttx/configs/vsn/README.txt
index 0a8b02dbc3..b05ffa5dde 100644
--- a/nuttx/configs/vsn/README.txt
+++ b/nuttx/configs/vsn/README.txt
@@ -11,7 +11,9 @@ Contents
   - Development Environment
   - GNU Toolchain Options
   - IDEs
-  - NuttX buildroot Toolchain
+  - NuttX EABI "buildroot" Toolchain
+  - NuttX OABI "buildroot" Toolchain
+  - NXFLAT Toolchain
   - DFU
   - LEDs
   - VSN-specific Configuration Options
@@ -47,7 +49,7 @@ GNU Toolchain Options
     CONFIG_STM32_CODESOURCERYL=y  : CodeSourcery under Linux
     CONFIG_STM32_DEVKITARM=y      : devkitARM under Windows
     CONFIG_STM32_RAISONANCE=y     : Raisonance RIDE7 under Windows
-    CONFIG_STM32_BUILDROOT=y	  : NuttX buildroot under Linux or Cygwin (default)
+    CONFIG_STM32_BUILDROOT=y      : NuttX buildroot under Linux or Cygwin (default)
 
   If you are not using CONFIG_STM32_BUILDROOT, then you may also have to modify
   the PATH in the setenv.h file if your make cannot find the tools.
@@ -128,8 +130,8 @@ IDEs
   one time from the Cygwin command line in order to obtain the pre-built
   startup object needed by RIDE.
 
-NuttX buildroot Toolchain
-^^^^^^^^^^^^^^^^^^^^^^^^^
+NuttX EABI "buildroot" Toolchain
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
   A GNU GCC-based toolchain is assumed.  The files */setenv.sh should
   be modified to point to the correct path to the Cortex-M3 GCC toolchain (if
@@ -152,7 +154,7 @@ NuttX buildroot Toolchain
 
   4. cd <some-dir>/buildroot
 
-  5. cp configs/cortexm3-defconfig-4.3.3 .config
+  5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config
 
   6. make oldconfig
 
@@ -162,77 +164,126 @@ NuttX buildroot Toolchain
      the path to the newly built binaries.
 
   See the file configs/README.txt in the buildroot source tree.  That has more
-  detailed PLUS some special instructions that you will need to follow if you are
+  details PLUS some special instructions that you will need to follow if you are
   building a Cortex-M3 toolchain for Cygwin under Windows.
 
+NuttX OABI "buildroot" Toolchain
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+  The older, OABI buildroot toolchain is also available.  To use the OABI
+  toolchain:
+
+  1. When building the buildroot toolchain, either (1) modify the cortexm3-eabi-defconfig-4.6.3
+     configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
+     configuration such as cortexm3-defconfig-4.3.3
+
+  2. Modify the Make.defs file to use the OABI converntions:
+
+    +CROSSDEV = arm-nuttx-elf-
+    +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    -CROSSDEV = arm-nuttx-eabi-
+    -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+
+NXFLAT Toolchain
+^^^^^^^^^^^^^^^^
+
+  If you are *not* using the NuttX buildroot toolchain and you want to use
+  the NXFLAT tools, then you will still have to build a portion of the buildroot
+  tools -- just the NXFLAT tools.  The buildroot with the NXFLAT tools can
+  be downloaded from the NuttX SourceForge download site
+  (https://sourceforge.net/projects/nuttx/files/).
+ 
+  This GNU toolchain builds and executes in the Linux or Cygwin environment.
+
+  1. You must have already configured Nuttx in <some-dir>/nuttx.
+
+     cd tools
+     ./configure.sh lpcxpresso-lpc1768/<sub-dir>
+
+  2. Download the latest buildroot package into <some-dir>
+
+  3. unpack the buildroot tarball.  The resulting directory may
+     have versioning information on it like buildroot-x.y.z.  If so,
+     rename <some-dir>/buildroot-x.y.z to <some-dir>/buildroot.
+
+  4. cd <some-dir>/buildroot
+
+  5. cp configs/cortexm3-defconfig-nxflat .config
+
+  6. make oldconfig
+
+  7. make
+
+  8. Edit setenv.h, if necessary, so that the PATH variable includes
+     the path to the newly builtNXFLAT binaries.
 
 VSN-specific Configuration Options
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-	CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
-	   be set to:
+    CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
+       be set to:
 
-	   CONFIG_ARCH=arm
+       CONFIG_ARCH=arm
 
-	CONFIG_ARCH_family - For use in C code:
+    CONFIG_ARCH_family - For use in C code:
 
-	   CONFIG_ARCH_ARM=y
+       CONFIG_ARCH_ARM=y
 
-	CONFIG_ARCH_architecture - For use in C code:
+    CONFIG_ARCH_architecture - For use in C code:
 
-	   CONFIG_ARCH_CORTEXM3=y
+       CONFIG_ARCH_CORTEXM3=y
 
-	CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
+    CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
-	   CONFIG_ARCH_CHIP=stm32
+       CONFIG_ARCH_CHIP=stm32
 
-	CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
-	   chip:
+    CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
+       chip:
 
-	   CONFIG_ARCH_CHIP_STM32F103RET6
+       CONFIG_ARCH_CHIP_STM32F103RET6
 
-	CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
-	   hence, the board that supports the particular chip or SoC.
+    CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
+       hence, the board that supports the particular chip or SoC.
 
-	   CONFIG_ARCH_BOARD=vsn (for the VSN development board)
+       CONFIG_ARCH_BOARD=vsn (for the VSN development board)
 
-	CONFIG_ARCH_BOARD_name - For use in C code
-	
-	   CONFIG_ARCH_BOARD_VSN=y
+    CONFIG_ARCH_BOARD_name - For use in C code
+    
+       CONFIG_ARCH_BOARD_VSN=y
 
-	CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
-	   of delay loops
+    CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
+       of delay loops
 
-	CONFIG_ENDIAN_BIG - define if big endian (default is little
-	   endian)
+    CONFIG_ENDIAN_BIG - define if big endian (default is little
+       endian)
 
-	CONFIG_DRAM_SIZE - Describes the installed DRAM (SRAM in this case):
+    CONFIG_DRAM_SIZE - Describes the installed DRAM (SRAM in this case):
 
-	   CONFIG_DRAM_SIZE=0x00010000 (64Kb)
+       CONFIG_DRAM_SIZE=0x00010000 (64Kb)
 
-	CONFIG_DRAM_START - The start address of installed DRAM
+    CONFIG_DRAM_START - The start address of installed DRAM
 
-	   CONFIG_DRAM_START=0x20000000
+       CONFIG_DRAM_START=0x20000000
 
-	CONFIG_ARCH_IRQPRIO - The STM32F103Z supports interrupt prioritization
+    CONFIG_ARCH_IRQPRIO - The STM32F103Z supports interrupt prioritization
 
-	   CONFIG_ARCH_IRQPRIO=y
+       CONFIG_ARCH_IRQPRIO=y
 
-	CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
-	   stack. If defined, this symbol is the size of the interrupt
-	    stack in bytes.  If not defined, the user task stacks will be
-	  used during interrupt handling.
+    CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
+       stack. If defined, this symbol is the size of the interrupt
+        stack in bytes.  If not defined, the user task stacks will be
+      used during interrupt handling.
 
-	CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
+    CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 
-	CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
+    CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
 
-	CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
-	   cause a 100 second delay during boot-up.  This 100 second delay
-	   serves no purpose other than it allows you to calibratre
-	   CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
-	   the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
-	   the delay actually is 100 seconds.
+    CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
+       cause a 100 second delay during boot-up.  This 100 second delay
+       serves no purpose other than it allows you to calibratre
+       CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to measure
+       the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
+       the delay actually is 100 seconds.
 
 
 Configurations
@@ -241,10 +292,10 @@ Configurations
 Each VSN configuration is maintained in a sudirectory and
 can be selected as follow:
 
-	cd tools
-	./configure.sh vsn/<subdir>
-	cd -
-	. ./setenv.sh
+    cd tools
+    ./configure.sh vsn/<subdir>
+    cd -
+    . ./setenv.sh
 
 Where <subdir> is one of the following:
 

From ee341514da6ef18f2dca79226e5221268d49f4d2 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sat, 6 Oct 2012 18:09:05 +0000
Subject: [PATCH 22/43] All Cortex-M Make.defs files updated to use buildroot
 EABI toolchain if BUILDROOT=y selected

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5219 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/configs/ekk-lm3s9b96/nsh/Make.defs              |  8 ++++++--
 nuttx/configs/ekk-lm3s9b96/ostest/Make.defs           |  8 ++++++--
 nuttx/configs/fire-stm32v2/nsh/Make.defs              |  9 ++++++++-
 nuttx/configs/hymini-stm32v/buttons/Make.defs         |  8 ++++++--
 nuttx/configs/hymini-stm32v/nsh/Make.defs             |  8 ++++++--
 nuttx/configs/hymini-stm32v/nsh2/Make.defs            |  8 ++++++--
 nuttx/configs/hymini-stm32v/nx/Make.defs              |  8 ++++++--
 nuttx/configs/hymini-stm32v/nxlines/Make.defs         |  8 ++++++--
 nuttx/configs/hymini-stm32v/usbserial/Make.defs       |  8 ++++++--
 nuttx/configs/hymini-stm32v/usbstorage/Make.defs      |  8 ++++++--
 nuttx/configs/kwikstik-k40/ostest/Make.defs           |  8 ++++++--
 nuttx/configs/lincoln60/nsh/Make.defs                 |  8 ++++++--
 nuttx/configs/lincoln60/ostest/Make.defs              |  8 ++++++--
 nuttx/configs/lm3s6432-s2e/nsh/Make.defs              |  8 ++++++--
 nuttx/configs/lm3s6432-s2e/ostest/Make.defs           |  8 ++++++--
 nuttx/configs/lm3s6965-ek/nsh/Make.defs               |  8 ++++++--
 nuttx/configs/lm3s6965-ek/nx/Make.defs                |  8 ++++++--
 nuttx/configs/lm3s6965-ek/ostest/Make.defs            |  8 ++++++--
 nuttx/configs/lm3s8962-ek/nsh/Make.defs               |  8 ++++++--
 nuttx/configs/lm3s8962-ek/nx/Make.defs                |  8 ++++++--
 nuttx/configs/lm3s8962-ek/ostest/Make.defs            |  8 ++++++--
 nuttx/configs/lpc4330-xplorer/nsh/Make.defs           | 11 ++++++++---
 nuttx/configs/lpc4330-xplorer/ostest/Make.defs        | 11 ++++++++---
 nuttx/configs/lpcxpresso-lpc1768/dhcpd/Make.defs      |  8 ++++++--
 nuttx/configs/lpcxpresso-lpc1768/nsh/Make.defs        |  8 ++++++--
 nuttx/configs/lpcxpresso-lpc1768/nx/Make.defs         |  8 ++++++--
 nuttx/configs/lpcxpresso-lpc1768/ostest/Make.defs     |  8 ++++++--
 nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs     |  8 ++++++--
 nuttx/configs/lpcxpresso-lpc1768/usbstorage/Make.defs |  8 ++++++--
 nuttx/configs/mbed/hidkbd/Make.defs                   |  8 ++++++--
 nuttx/configs/mbed/nsh/Make.defs                      |  8 ++++++--
 nuttx/configs/nucleus2g/nsh/Make.defs                 |  8 ++++++--
 nuttx/configs/nucleus2g/ostest/Make.defs              |  8 ++++++--
 nuttx/configs/nucleus2g/usbserial/Make.defs           |  8 ++++++--
 nuttx/configs/nucleus2g/usbstorage/Make.defs          |  8 ++++++--
 nuttx/configs/olimex-lpc1766stk/ftpc/Make.defs        |  8 ++++++--
 nuttx/configs/olimex-lpc1766stk/hidkbd/Make.defs      |  8 ++++++--
 nuttx/configs/olimex-lpc1766stk/nettest/Make.defs     |  8 ++++++--
 nuttx/configs/olimex-lpc1766stk/nsh/Make.defs         |  8 ++++++--
 nuttx/configs/olimex-lpc1766stk/nx/Make.defs          |  8 ++++++--
 nuttx/configs/olimex-lpc1766stk/ostest/Make.defs      |  8 ++++++--
 nuttx/configs/olimex-lpc1766stk/slip-httpd/Make.defs  |  8 ++++++--
 nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs      |  8 ++++++--
 nuttx/configs/olimex-lpc1766stk/usbserial/Make.defs   |  8 ++++++--
 nuttx/configs/olimex-lpc1766stk/usbstorage/Make.defs  |  8 ++++++--
 nuttx/configs/olimex-lpc1766stk/wlan/Make.defs        |  8 ++++++--
 nuttx/configs/olimex-stm32-p107/nsh/Make.defs         |  8 ++++++--
 nuttx/configs/olimex-stm32-p107/ostest/Make.defs      |  8 ++++++--
 nuttx/configs/sam3u-ek/knsh/Make.defs                 |  8 ++++++--
 nuttx/configs/sam3u-ek/nsh/Make.defs                  |  8 ++++++--
 nuttx/configs/sam3u-ek/nx/Make.defs                   |  8 ++++++--
 nuttx/configs/sam3u-ek/ostest/Make.defs               |  8 ++++++--
 nuttx/configs/sam3u-ek/touchscreen/Make.defs          |  8 ++++++--
 nuttx/configs/shenzhou/nsh/Make.defs                  |  6 +++++-
 nuttx/configs/shenzhou/nxwm/Make.defs                 |  6 +++++-
 nuttx/configs/stm3210e-eval/RIDE/Make.defs            |  8 ++++++--
 nuttx/configs/stm3210e-eval/buttons/Make.defs         |  8 ++++++--
 nuttx/configs/stm3210e-eval/composite/Make.defs       |  8 ++++++--
 nuttx/configs/stm3210e-eval/nsh/Make.defs             |  8 ++++++--
 nuttx/configs/stm3210e-eval/nsh2/Make.defs            |  8 ++++++--
 nuttx/configs/stm3210e-eval/nx/Make.defs              |  8 ++++++--
 nuttx/configs/stm3210e-eval/nxconsole/Make.defs       |  8 ++++++--
 nuttx/configs/stm3210e-eval/nxlines/Make.defs         |  8 ++++++--
 nuttx/configs/stm3210e-eval/nxtext/Make.defs          |  8 ++++++--
 nuttx/configs/stm3210e-eval/ostest/Make.defs          |  8 ++++++--
 nuttx/configs/stm3210e-eval/pm/Make.defs              |  8 ++++++--
 nuttx/configs/stm3210e-eval/usbserial/Make.defs       |  8 ++++++--
 nuttx/configs/stm3210e-eval/usbstorage/Make.defs      |  8 ++++++--
 nuttx/configs/stm3220g-eval/dhcpd/Make.defs           | 11 ++++++++---
 nuttx/configs/stm3220g-eval/nettest/Make.defs         | 11 ++++++++---
 nuttx/configs/stm3220g-eval/nsh/Make.defs             | 11 ++++++++---
 nuttx/configs/stm3220g-eval/nsh2/Make.defs            | 11 ++++++++---
 nuttx/configs/stm3220g-eval/nxwm/Make.defs            | 11 ++++++++---
 nuttx/configs/stm3220g-eval/ostest/Make.defs          | 11 ++++++++---
 nuttx/configs/stm3220g-eval/telnetd/Make.defs         | 11 ++++++++---
 nuttx/configs/stm3240g-eval/dhcpd/Make.defs           | 11 ++++++++---
 nuttx/configs/stm3240g-eval/discover/Make.defs        | 11 ++++++++---
 nuttx/configs/stm3240g-eval/nettest/Make.defs         | 11 ++++++++---
 nuttx/configs/stm3240g-eval/nsh/Make.defs             | 11 ++++++++---
 nuttx/configs/stm3240g-eval/nsh2/Make.defs            | 11 ++++++++---
 nuttx/configs/stm3240g-eval/nxconsole/Make.defs       | 11 ++++++++---
 nuttx/configs/stm3240g-eval/nxwm/Make.defs            | 11 ++++++++---
 nuttx/configs/stm3240g-eval/ostest/Make.defs          | 11 ++++++++---
 nuttx/configs/stm3240g-eval/telnetd/Make.defs         | 11 ++++++++---
 nuttx/configs/stm3240g-eval/webserver/Make.defs       | 11 ++++++++---
 nuttx/configs/stm3240g-eval/xmlrpc/Make.defs          | 11 ++++++++---
 nuttx/configs/stm32f4discovery/nsh/Make.defs          | 11 ++++++++---
 nuttx/configs/stm32f4discovery/nxlines/Make.defs      | 11 ++++++++---
 nuttx/configs/stm32f4discovery/ostest/Make.defs       | 11 ++++++++---
 nuttx/configs/stm32f4discovery/pm/Make.defs           | 11 ++++++++---
 nuttx/configs/twr-k60n512/nsh/Make.defs               |  8 ++++++--
 nuttx/configs/twr-k60n512/ostest/Make.defs            |  8 ++++++--
 nuttx/configs/vsn/nsh/Make.defs                       |  8 ++++++--
 93 files changed, 606 insertions(+), 207 deletions(-)

diff --git a/nuttx/configs/ekk-lm3s9b96/nsh/Make.defs b/nuttx/configs/ekk-lm3s9b96/nsh/Make.defs
index 1be7fc8f0b..e810ec175a 100644
--- a/nuttx/configs/ekk-lm3s9b96/nsh/Make.defs
+++ b/nuttx/configs/ekk-lm3s9b96/nsh/Make.defs
@@ -59,8 +59,12 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/ekk-lm3s9b96/ostest/Make.defs b/nuttx/configs/ekk-lm3s9b96/ostest/Make.defs
index e0fae20f0f..ca38be836c 100644
--- a/nuttx/configs/ekk-lm3s9b96/ostest/Make.defs
+++ b/nuttx/configs/ekk-lm3s9b96/ostest/Make.defs
@@ -59,8 +59,12 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/fire-stm32v2/nsh/Make.defs b/nuttx/configs/fire-stm32v2/nsh/Make.defs
index aaf0e8980c..f64dda4d20 100644
--- a/nuttx/configs/fire-stm32v2/nsh/Make.defs
+++ b/nuttx/configs/fire-stm32v2/nsh/Make.defs
@@ -83,8 +83,15 @@ endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
   CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/hymini-stm32v/buttons/Make.defs b/nuttx/configs/hymini-stm32v/buttons/Make.defs
index bcc1f6845f..eb121c2cbe 100644
--- a/nuttx/configs/hymini-stm32v/buttons/Make.defs
+++ b/nuttx/configs/hymini-stm32v/buttons/Make.defs
@@ -70,8 +70,12 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/hymini-stm32v/nsh/Make.defs b/nuttx/configs/hymini-stm32v/nsh/Make.defs
index fae6edc080..a0809f98a0 100644
--- a/nuttx/configs/hymini-stm32v/nsh/Make.defs
+++ b/nuttx/configs/hymini-stm32v/nsh/Make.defs
@@ -70,8 +70,12 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/hymini-stm32v/nsh2/Make.defs b/nuttx/configs/hymini-stm32v/nsh2/Make.defs
index 1cf89238ea..72960ee270 100644
--- a/nuttx/configs/hymini-stm32v/nsh2/Make.defs
+++ b/nuttx/configs/hymini-stm32v/nsh2/Make.defs
@@ -70,8 +70,12 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/hymini-stm32v/nx/Make.defs b/nuttx/configs/hymini-stm32v/nx/Make.defs
index 8ebded0944..d647c7fcd6 100644
--- a/nuttx/configs/hymini-stm32v/nx/Make.defs
+++ b/nuttx/configs/hymini-stm32v/nx/Make.defs
@@ -70,8 +70,12 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/hymini-stm32v/nxlines/Make.defs b/nuttx/configs/hymini-stm32v/nxlines/Make.defs
index 15521d6212..fa66e6be05 100644
--- a/nuttx/configs/hymini-stm32v/nxlines/Make.defs
+++ b/nuttx/configs/hymini-stm32v/nxlines/Make.defs
@@ -73,8 +73,12 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/hymini-stm32v/usbserial/Make.defs b/nuttx/configs/hymini-stm32v/usbserial/Make.defs
index b58c4c1fe1..d0a2a80cc3 100644
--- a/nuttx/configs/hymini-stm32v/usbserial/Make.defs
+++ b/nuttx/configs/hymini-stm32v/usbserial/Make.defs
@@ -70,8 +70,12 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/hymini-stm32v/usbstorage/Make.defs b/nuttx/configs/hymini-stm32v/usbstorage/Make.defs
index f3264ab937..ee870eab44 100644
--- a/nuttx/configs/hymini-stm32v/usbstorage/Make.defs
+++ b/nuttx/configs/hymini-stm32v/usbstorage/Make.defs
@@ -70,8 +70,12 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/kwikstik-k40/ostest/Make.defs b/nuttx/configs/kwikstik-k40/ostest/Make.defs
index 43a5dd01e0..beba9e3978 100644
--- a/nuttx/configs/kwikstik-k40/ostest/Make.defs
+++ b/nuttx/configs/kwikstik-k40/ostest/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_KINETIS_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_KINETIS_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft -mlong-calls
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/lincoln60/nsh/Make.defs b/nuttx/configs/lincoln60/nsh/Make.defs
index 9750a0e87c..7b3c3318a6 100644
--- a/nuttx/configs/lincoln60/nsh/Make.defs
+++ b/nuttx/configs/lincoln60/nsh/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/lincoln60/ostest/Make.defs b/nuttx/configs/lincoln60/ostest/Make.defs
index c90939429b..bd4b25701b 100644
--- a/nuttx/configs/lincoln60/ostest/Make.defs
+++ b/nuttx/configs/lincoln60/ostest/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/lm3s6432-s2e/nsh/Make.defs b/nuttx/configs/lm3s6432-s2e/nsh/Make.defs
index ef39674b2a..e463a17429 100644
--- a/nuttx/configs/lm3s6432-s2e/nsh/Make.defs
+++ b/nuttx/configs/lm3s6432-s2e/nsh/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/lm3s6432-s2e/ostest/Make.defs b/nuttx/configs/lm3s6432-s2e/ostest/Make.defs
index 6036891832..33f0d43ede 100644
--- a/nuttx/configs/lm3s6432-s2e/ostest/Make.defs
+++ b/nuttx/configs/lm3s6432-s2e/ostest/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/lm3s6965-ek/nsh/Make.defs b/nuttx/configs/lm3s6965-ek/nsh/Make.defs
index 17df0ebf7b..5aaed90095 100644
--- a/nuttx/configs/lm3s6965-ek/nsh/Make.defs
+++ b/nuttx/configs/lm3s6965-ek/nsh/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/lm3s6965-ek/nx/Make.defs b/nuttx/configs/lm3s6965-ek/nx/Make.defs
index 5ab0cfd260..8b99d7de7f 100644
--- a/nuttx/configs/lm3s6965-ek/nx/Make.defs
+++ b/nuttx/configs/lm3s6965-ek/nx/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/lm3s6965-ek/ostest/Make.defs b/nuttx/configs/lm3s6965-ek/ostest/Make.defs
index 5e49273a0c..434b21e24a 100644
--- a/nuttx/configs/lm3s6965-ek/ostest/Make.defs
+++ b/nuttx/configs/lm3s6965-ek/ostest/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/lm3s8962-ek/nsh/Make.defs b/nuttx/configs/lm3s8962-ek/nsh/Make.defs
index cc7bce1e5c..d7be642cd4 100644
--- a/nuttx/configs/lm3s8962-ek/nsh/Make.defs
+++ b/nuttx/configs/lm3s8962-ek/nsh/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/lm3s8962-ek/nx/Make.defs b/nuttx/configs/lm3s8962-ek/nx/Make.defs
index b97aaa31ec..bf07df29a6 100644
--- a/nuttx/configs/lm3s8962-ek/nx/Make.defs
+++ b/nuttx/configs/lm3s8962-ek/nx/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/lm3s8962-ek/ostest/Make.defs b/nuttx/configs/lm3s8962-ek/ostest/Make.defs
index 4b4863d7cb..94389216cd 100644
--- a/nuttx/configs/lm3s8962-ek/ostest/Make.defs
+++ b/nuttx/configs/lm3s8962-ek/ostest/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/lpc4330-xplorer/nsh/Make.defs b/nuttx/configs/lpc4330-xplorer/nsh/Make.defs
index 960fb2a41a..757759ecc9 100644
--- a/nuttx/configs/lpc4330-xplorer/nsh/Make.defs
+++ b/nuttx/configs/lpc4330-xplorer/nsh/Make.defs
@@ -93,9 +93,14 @@ ifeq ($(CONFIG_LPC43_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC43_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m4 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/lpc4330-xplorer/ostest/Make.defs b/nuttx/configs/lpc4330-xplorer/ostest/Make.defs
index 960fb2a41a..757759ecc9 100644
--- a/nuttx/configs/lpc4330-xplorer/ostest/Make.defs
+++ b/nuttx/configs/lpc4330-xplorer/ostest/Make.defs
@@ -93,9 +93,14 @@ ifeq ($(CONFIG_LPC43_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC43_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m4 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/Make.defs
index 804e20ecd1..15109a1adb 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/Make.defs
+++ b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 ifeq ($(CONFIG_LPC17_CODEREDW),y)
diff --git a/nuttx/configs/lpcxpresso-lpc1768/nsh/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/nsh/Make.defs
index 8c6ad9ab85..b29d10982f 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/nsh/Make.defs
+++ b/nuttx/configs/lpcxpresso-lpc1768/nsh/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 ifeq ($(CONFIG_LPC17_CODEREDW),y)
diff --git a/nuttx/configs/lpcxpresso-lpc1768/nx/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/nx/Make.defs
index a535fd03d0..31286436a8 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/nx/Make.defs
+++ b/nuttx/configs/lpcxpresso-lpc1768/nx/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 ifeq ($(CONFIG_LPC17_CODEREDW),y)
diff --git a/nuttx/configs/lpcxpresso-lpc1768/ostest/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/ostest/Make.defs
index 1b38f2d6b0..975cdf4601 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/ostest/Make.defs
+++ b/nuttx/configs/lpcxpresso-lpc1768/ostest/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 ifeq ($(CONFIG_LPC17_CODEREDW),y)
diff --git a/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs
index 810d6d7da8..67534a5c1e 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs
+++ b/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 ifeq ($(CONFIG_LPC17_CODEREDW),y)
diff --git a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/Make.defs
index 5342dde5b0..087a922871 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/Make.defs
+++ b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 ifeq ($(CONFIG_LPC17_CODEREDW),y)
diff --git a/nuttx/configs/mbed/hidkbd/Make.defs b/nuttx/configs/mbed/hidkbd/Make.defs
index 262571e452..043340da13 100644
--- a/nuttx/configs/mbed/hidkbd/Make.defs
+++ b/nuttx/configs/mbed/hidkbd/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/mbed/nsh/Make.defs b/nuttx/configs/mbed/nsh/Make.defs
index 40c4c94f31..549178e9cb 100644
--- a/nuttx/configs/mbed/nsh/Make.defs
+++ b/nuttx/configs/mbed/nsh/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/nucleus2g/nsh/Make.defs b/nuttx/configs/nucleus2g/nsh/Make.defs
index 3b8f857a6a..e21f7f1c88 100644
--- a/nuttx/configs/nucleus2g/nsh/Make.defs
+++ b/nuttx/configs/nucleus2g/nsh/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/nucleus2g/ostest/Make.defs b/nuttx/configs/nucleus2g/ostest/Make.defs
index aa0e6f8648..5696eae227 100644
--- a/nuttx/configs/nucleus2g/ostest/Make.defs
+++ b/nuttx/configs/nucleus2g/ostest/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/nucleus2g/usbserial/Make.defs b/nuttx/configs/nucleus2g/usbserial/Make.defs
index 483fd52609..2cdccc9596 100644
--- a/nuttx/configs/nucleus2g/usbserial/Make.defs
+++ b/nuttx/configs/nucleus2g/usbserial/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/nucleus2g/usbstorage/Make.defs b/nuttx/configs/nucleus2g/usbstorage/Make.defs
index 7a9c1fa6bc..79f1b8c1f4 100644
--- a/nuttx/configs/nucleus2g/usbstorage/Make.defs
+++ b/nuttx/configs/nucleus2g/usbstorage/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/olimex-lpc1766stk/ftpc/Make.defs b/nuttx/configs/olimex-lpc1766stk/ftpc/Make.defs
index 5671fdffb5..fb8d550235 100644
--- a/nuttx/configs/olimex-lpc1766stk/ftpc/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/ftpc/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/olimex-lpc1766stk/hidkbd/Make.defs b/nuttx/configs/olimex-lpc1766stk/hidkbd/Make.defs
index 1e7160c385..1997d66b3b 100644
--- a/nuttx/configs/olimex-lpc1766stk/hidkbd/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/hidkbd/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/olimex-lpc1766stk/nettest/Make.defs b/nuttx/configs/olimex-lpc1766stk/nettest/Make.defs
index 2502cf97b8..2036629411 100644
--- a/nuttx/configs/olimex-lpc1766stk/nettest/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/nettest/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/olimex-lpc1766stk/nsh/Make.defs b/nuttx/configs/olimex-lpc1766stk/nsh/Make.defs
index 7e62fd7fb2..7110759bac 100644
--- a/nuttx/configs/olimex-lpc1766stk/nsh/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/nsh/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/olimex-lpc1766stk/nx/Make.defs b/nuttx/configs/olimex-lpc1766stk/nx/Make.defs
index 735e2bd0a2..e8325f7808 100644
--- a/nuttx/configs/olimex-lpc1766stk/nx/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/nx/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/olimex-lpc1766stk/ostest/Make.defs b/nuttx/configs/olimex-lpc1766stk/ostest/Make.defs
index 7a9475761a..f7775e0727 100644
--- a/nuttx/configs/olimex-lpc1766stk/ostest/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/ostest/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/olimex-lpc1766stk/slip-httpd/Make.defs b/nuttx/configs/olimex-lpc1766stk/slip-httpd/Make.defs
index 35d2c6480f..7f7278d06d 100644
--- a/nuttx/configs/olimex-lpc1766stk/slip-httpd/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/slip-httpd/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs b/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs
index dbd84c2a6f..96270bc288 100644
--- a/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/olimex-lpc1766stk/usbserial/Make.defs b/nuttx/configs/olimex-lpc1766stk/usbserial/Make.defs
index 07cd41d468..2d7321efde 100644
--- a/nuttx/configs/olimex-lpc1766stk/usbserial/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/usbserial/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/olimex-lpc1766stk/usbstorage/Make.defs b/nuttx/configs/olimex-lpc1766stk/usbstorage/Make.defs
index 76a6927ee3..8c62990aeb 100644
--- a/nuttx/configs/olimex-lpc1766stk/usbstorage/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/usbstorage/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/olimex-lpc1766stk/wlan/Make.defs b/nuttx/configs/olimex-lpc1766stk/wlan/Make.defs
index 0cc0d7edd3..593d5f9391 100644
--- a/nuttx/configs/olimex-lpc1766stk/wlan/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/wlan/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/olimex-stm32-p107/nsh/Make.defs b/nuttx/configs/olimex-stm32-p107/nsh/Make.defs
index 0108ef1eec..5175c2f8f6 100644
--- a/nuttx/configs/olimex-stm32-p107/nsh/Make.defs
+++ b/nuttx/configs/olimex-stm32-p107/nsh/Make.defs
@@ -70,8 +70,12 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/olimex-stm32-p107/ostest/Make.defs b/nuttx/configs/olimex-stm32-p107/ostest/Make.defs
index 7cf5e765ff..28c9ab8138 100644
--- a/nuttx/configs/olimex-stm32-p107/ostest/Make.defs
+++ b/nuttx/configs/olimex-stm32-p107/ostest/Make.defs
@@ -70,8 +70,12 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/sam3u-ek/knsh/Make.defs b/nuttx/configs/sam3u-ek/knsh/Make.defs
index bbe8b23c06..f65420bcf0 100644
--- a/nuttx/configs/sam3u-ek/knsh/Make.defs
+++ b/nuttx/configs/sam3u-ek/knsh/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_SAM3U_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_SAM3U_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/sam3u-ek/nsh/Make.defs b/nuttx/configs/sam3u-ek/nsh/Make.defs
index 0f236114f0..c73b1f785a 100644
--- a/nuttx/configs/sam3u-ek/nsh/Make.defs
+++ b/nuttx/configs/sam3u-ek/nsh/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_SAM3U_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_SAM3U_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/sam3u-ek/nx/Make.defs b/nuttx/configs/sam3u-ek/nx/Make.defs
index 10cabe5a56..31b4407818 100644
--- a/nuttx/configs/sam3u-ek/nx/Make.defs
+++ b/nuttx/configs/sam3u-ek/nx/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_SAM3U_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_SAM3U_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/sam3u-ek/ostest/Make.defs b/nuttx/configs/sam3u-ek/ostest/Make.defs
index 7689fb2a18..9fcea29f61 100644
--- a/nuttx/configs/sam3u-ek/ostest/Make.defs
+++ b/nuttx/configs/sam3u-ek/ostest/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_SAM3U_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_SAM3U_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/sam3u-ek/touchscreen/Make.defs b/nuttx/configs/sam3u-ek/touchscreen/Make.defs
index 2047daf684..fb8ab9358a 100644
--- a/nuttx/configs/sam3u-ek/touchscreen/Make.defs
+++ b/nuttx/configs/sam3u-ek/touchscreen/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_SAM3U_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_SAM3U_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/shenzhou/nsh/Make.defs b/nuttx/configs/shenzhou/nsh/Make.defs
index 555b0069fb..588bb27600 100644
--- a/nuttx/configs/shenzhou/nsh/Make.defs
+++ b/nuttx/configs/shenzhou/nsh/Make.defs
@@ -82,9 +82,13 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
   CROSSDEV = arm-nuttx-eabi-
   ARCROSSDEV = arm-nuttx-eabi-
-# ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
diff --git a/nuttx/configs/shenzhou/nxwm/Make.defs b/nuttx/configs/shenzhou/nxwm/Make.defs
index dfb0472a1f..d94f0c38a1 100644
--- a/nuttx/configs/shenzhou/nxwm/Make.defs
+++ b/nuttx/configs/shenzhou/nxwm/Make.defs
@@ -82,9 +82,13 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
   CROSSDEV = arm-nuttx-eabi-
   ARCROSSDEV = arm-nuttx-eabi-
-# ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
diff --git a/nuttx/configs/stm3210e-eval/RIDE/Make.defs b/nuttx/configs/stm3210e-eval/RIDE/Make.defs
index dfd0f600b7..30dfda704b 100644
--- a/nuttx/configs/stm3210e-eval/RIDE/Make.defs
+++ b/nuttx/configs/stm3210e-eval/RIDE/Make.defs
@@ -70,8 +70,12 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3210e-eval/buttons/Make.defs b/nuttx/configs/stm3210e-eval/buttons/Make.defs
index 9f0691bba8..f18619f80c 100644
--- a/nuttx/configs/stm3210e-eval/buttons/Make.defs
+++ b/nuttx/configs/stm3210e-eval/buttons/Make.defs
@@ -70,8 +70,12 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3210e-eval/composite/Make.defs b/nuttx/configs/stm3210e-eval/composite/Make.defs
index 9b855671f3..8486635736 100644
--- a/nuttx/configs/stm3210e-eval/composite/Make.defs
+++ b/nuttx/configs/stm3210e-eval/composite/Make.defs
@@ -70,8 +70,12 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3210e-eval/nsh/Make.defs b/nuttx/configs/stm3210e-eval/nsh/Make.defs
index afdf0c0971..e3e4888fed 100644
--- a/nuttx/configs/stm3210e-eval/nsh/Make.defs
+++ b/nuttx/configs/stm3210e-eval/nsh/Make.defs
@@ -70,8 +70,12 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3210e-eval/nsh2/Make.defs b/nuttx/configs/stm3210e-eval/nsh2/Make.defs
index 7d36c9a00d..3305166962 100644
--- a/nuttx/configs/stm3210e-eval/nsh2/Make.defs
+++ b/nuttx/configs/stm3210e-eval/nsh2/Make.defs
@@ -70,8 +70,12 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3210e-eval/nx/Make.defs b/nuttx/configs/stm3210e-eval/nx/Make.defs
index bb0ba5b6df..6aaa6644be 100644
--- a/nuttx/configs/stm3210e-eval/nx/Make.defs
+++ b/nuttx/configs/stm3210e-eval/nx/Make.defs
@@ -70,8 +70,12 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3210e-eval/nxconsole/Make.defs b/nuttx/configs/stm3210e-eval/nxconsole/Make.defs
index 84b36b2676..7b2be02a51 100644
--- a/nuttx/configs/stm3210e-eval/nxconsole/Make.defs
+++ b/nuttx/configs/stm3210e-eval/nxconsole/Make.defs
@@ -73,8 +73,12 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3210e-eval/nxlines/Make.defs b/nuttx/configs/stm3210e-eval/nxlines/Make.defs
index a896a901e6..1469658a0e 100644
--- a/nuttx/configs/stm3210e-eval/nxlines/Make.defs
+++ b/nuttx/configs/stm3210e-eval/nxlines/Make.defs
@@ -73,8 +73,12 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3210e-eval/nxtext/Make.defs b/nuttx/configs/stm3210e-eval/nxtext/Make.defs
index 00370c3b0f..b130e56225 100644
--- a/nuttx/configs/stm3210e-eval/nxtext/Make.defs
+++ b/nuttx/configs/stm3210e-eval/nxtext/Make.defs
@@ -73,8 +73,12 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3210e-eval/ostest/Make.defs b/nuttx/configs/stm3210e-eval/ostest/Make.defs
index 09b3f03954..bd50d3b69d 100644
--- a/nuttx/configs/stm3210e-eval/ostest/Make.defs
+++ b/nuttx/configs/stm3210e-eval/ostest/Make.defs
@@ -70,8 +70,12 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3210e-eval/pm/Make.defs b/nuttx/configs/stm3210e-eval/pm/Make.defs
index 0cc96fa4ee..6ad7e3a4ca 100644
--- a/nuttx/configs/stm3210e-eval/pm/Make.defs
+++ b/nuttx/configs/stm3210e-eval/pm/Make.defs
@@ -70,8 +70,12 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3210e-eval/usbserial/Make.defs b/nuttx/configs/stm3210e-eval/usbserial/Make.defs
index cda6edf4ee..586c361a92 100644
--- a/nuttx/configs/stm3210e-eval/usbserial/Make.defs
+++ b/nuttx/configs/stm3210e-eval/usbserial/Make.defs
@@ -70,8 +70,12 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3210e-eval/usbstorage/Make.defs b/nuttx/configs/stm3210e-eval/usbstorage/Make.defs
index 36688bc805..c305b42c9f 100644
--- a/nuttx/configs/stm3210e-eval/usbstorage/Make.defs
+++ b/nuttx/configs/stm3210e-eval/usbstorage/Make.defs
@@ -70,8 +70,12 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3220g-eval/dhcpd/Make.defs b/nuttx/configs/stm3220g-eval/dhcpd/Make.defs
index f75e94501f..3f2c4e0661 100644
--- a/nuttx/configs/stm3220g-eval/dhcpd/Make.defs
+++ b/nuttx/configs/stm3220g-eval/dhcpd/Make.defs
@@ -90,9 +90,14 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3220g-eval/nettest/Make.defs b/nuttx/configs/stm3220g-eval/nettest/Make.defs
index f307d9475d..c6b2f895b1 100644
--- a/nuttx/configs/stm3220g-eval/nettest/Make.defs
+++ b/nuttx/configs/stm3220g-eval/nettest/Make.defs
@@ -90,9 +90,14 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3220g-eval/nsh/Make.defs b/nuttx/configs/stm3220g-eval/nsh/Make.defs
index 9fe8b0ffab..3bd7c15283 100644
--- a/nuttx/configs/stm3220g-eval/nsh/Make.defs
+++ b/nuttx/configs/stm3220g-eval/nsh/Make.defs
@@ -90,9 +90,14 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3220g-eval/nsh2/Make.defs b/nuttx/configs/stm3220g-eval/nsh2/Make.defs
index 64f158ecb5..dfd41d5c53 100644
--- a/nuttx/configs/stm3220g-eval/nsh2/Make.defs
+++ b/nuttx/configs/stm3220g-eval/nsh2/Make.defs
@@ -90,9 +90,14 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3220g-eval/nxwm/Make.defs b/nuttx/configs/stm3220g-eval/nxwm/Make.defs
index 37280e0c44..65442d7312 100644
--- a/nuttx/configs/stm3220g-eval/nxwm/Make.defs
+++ b/nuttx/configs/stm3220g-eval/nxwm/Make.defs
@@ -90,9 +90,14 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3220g-eval/ostest/Make.defs b/nuttx/configs/stm3220g-eval/ostest/Make.defs
index 41e8fff142..270d533394 100644
--- a/nuttx/configs/stm3220g-eval/ostest/Make.defs
+++ b/nuttx/configs/stm3220g-eval/ostest/Make.defs
@@ -90,9 +90,14 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3220g-eval/telnetd/Make.defs b/nuttx/configs/stm3220g-eval/telnetd/Make.defs
index 416bfaa47b..0d7f1a078f 100644
--- a/nuttx/configs/stm3220g-eval/telnetd/Make.defs
+++ b/nuttx/configs/stm3220g-eval/telnetd/Make.defs
@@ -90,9 +90,14 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3240g-eval/dhcpd/Make.defs b/nuttx/configs/stm3240g-eval/dhcpd/Make.defs
index 1c7a7cff0e..e84648b105 100644
--- a/nuttx/configs/stm3240g-eval/dhcpd/Make.defs
+++ b/nuttx/configs/stm3240g-eval/dhcpd/Make.defs
@@ -90,9 +90,14 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3240g-eval/discover/Make.defs b/nuttx/configs/stm3240g-eval/discover/Make.defs
index 9cf9d59585..561bed1e0c 100644
--- a/nuttx/configs/stm3240g-eval/discover/Make.defs
+++ b/nuttx/configs/stm3240g-eval/discover/Make.defs
@@ -90,9 +90,14 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3240g-eval/nettest/Make.defs b/nuttx/configs/stm3240g-eval/nettest/Make.defs
index e8af4cbb5d..71764aa24a 100644
--- a/nuttx/configs/stm3240g-eval/nettest/Make.defs
+++ b/nuttx/configs/stm3240g-eval/nettest/Make.defs
@@ -90,9 +90,14 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3240g-eval/nsh/Make.defs b/nuttx/configs/stm3240g-eval/nsh/Make.defs
index e88f1054b4..71da0724ab 100644
--- a/nuttx/configs/stm3240g-eval/nsh/Make.defs
+++ b/nuttx/configs/stm3240g-eval/nsh/Make.defs
@@ -90,9 +90,14 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3240g-eval/nsh2/Make.defs b/nuttx/configs/stm3240g-eval/nsh2/Make.defs
index 3e7fa8bd2a..51aaf553ec 100644
--- a/nuttx/configs/stm3240g-eval/nsh2/Make.defs
+++ b/nuttx/configs/stm3240g-eval/nsh2/Make.defs
@@ -90,9 +90,14 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3240g-eval/nxconsole/Make.defs b/nuttx/configs/stm3240g-eval/nxconsole/Make.defs
index aedfacc80a..34865b5c28 100644
--- a/nuttx/configs/stm3240g-eval/nxconsole/Make.defs
+++ b/nuttx/configs/stm3240g-eval/nxconsole/Make.defs
@@ -90,9 +90,14 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3240g-eval/nxwm/Make.defs b/nuttx/configs/stm3240g-eval/nxwm/Make.defs
index 631cfab861..b15333c96f 100644
--- a/nuttx/configs/stm3240g-eval/nxwm/Make.defs
+++ b/nuttx/configs/stm3240g-eval/nxwm/Make.defs
@@ -90,9 +90,14 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3240g-eval/ostest/Make.defs b/nuttx/configs/stm3240g-eval/ostest/Make.defs
index 875d39f22d..768a095f8e 100644
--- a/nuttx/configs/stm3240g-eval/ostest/Make.defs
+++ b/nuttx/configs/stm3240g-eval/ostest/Make.defs
@@ -90,9 +90,14 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3240g-eval/telnetd/Make.defs b/nuttx/configs/stm3240g-eval/telnetd/Make.defs
index d0ed37f28d..8255e07674 100644
--- a/nuttx/configs/stm3240g-eval/telnetd/Make.defs
+++ b/nuttx/configs/stm3240g-eval/telnetd/Make.defs
@@ -90,9 +90,14 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3240g-eval/webserver/Make.defs b/nuttx/configs/stm3240g-eval/webserver/Make.defs
index fbe1ffb0ec..855ca4186e 100644
--- a/nuttx/configs/stm3240g-eval/webserver/Make.defs
+++ b/nuttx/configs/stm3240g-eval/webserver/Make.defs
@@ -89,9 +89,14 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm3240g-eval/xmlrpc/Make.defs b/nuttx/configs/stm3240g-eval/xmlrpc/Make.defs
index 61b0d5c4e4..dab94db502 100644
--- a/nuttx/configs/stm3240g-eval/xmlrpc/Make.defs
+++ b/nuttx/configs/stm3240g-eval/xmlrpc/Make.defs
@@ -90,9 +90,14 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm32f4discovery/nsh/Make.defs b/nuttx/configs/stm32f4discovery/nsh/Make.defs
index f4110cce3e..bab095abcc 100644
--- a/nuttx/configs/stm32f4discovery/nsh/Make.defs
+++ b/nuttx/configs/stm32f4discovery/nsh/Make.defs
@@ -90,9 +90,14 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm32f4discovery/nxlines/Make.defs b/nuttx/configs/stm32f4discovery/nxlines/Make.defs
index 8dab2009ce..042da6a928 100644
--- a/nuttx/configs/stm32f4discovery/nxlines/Make.defs
+++ b/nuttx/configs/stm32f4discovery/nxlines/Make.defs
@@ -90,9 +90,14 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm32f4discovery/ostest/Make.defs b/nuttx/configs/stm32f4discovery/ostest/Make.defs
index f20fddb843..10025ad9d7 100644
--- a/nuttx/configs/stm32f4discovery/ostest/Make.defs
+++ b/nuttx/configs/stm32f4discovery/ostest/Make.defs
@@ -90,9 +90,14 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/stm32f4discovery/pm/Make.defs b/nuttx/configs/stm32f4discovery/pm/Make.defs
index f96f439ee4..1a67f1b8c4 100644
--- a/nuttx/configs/stm32f4discovery/pm/Make.defs
+++ b/nuttx/configs/stm32f4discovery/pm/Make.defs
@@ -90,9 +90,14 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/twr-k60n512/nsh/Make.defs b/nuttx/configs/twr-k60n512/nsh/Make.defs
index 99041bcc29..7bb9f09d4a 100644
--- a/nuttx/configs/twr-k60n512/nsh/Make.defs
+++ b/nuttx/configs/twr-k60n512/nsh/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_KINETIS_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_KINETIS_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft -mlong-calls
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/twr-k60n512/ostest/Make.defs b/nuttx/configs/twr-k60n512/ostest/Make.defs
index 93c887a2d6..9254223dca 100644
--- a/nuttx/configs/twr-k60n512/ostest/Make.defs
+++ b/nuttx/configs/twr-k60n512/ostest/Make.defs
@@ -58,8 +58,12 @@ ifeq ($(CONFIG_KINETIS_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_KINETIS_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft -mlong-calls
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/vsn/nsh/Make.defs b/nuttx/configs/vsn/nsh/Make.defs
index abcdf49c16..292abcc726 100644
--- a/nuttx/configs/vsn/nsh/Make.defs
+++ b/nuttx/configs/vsn/nsh/Make.defs
@@ -70,8 +70,12 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # OABI
+  # CROSSDEV = arm-nuttx-elf-
+  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  # EABI
+  CROSSDEV = arm-nuttx-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 

From e8a8129808aa7296f4c176231327d136d5fcb8c0 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sat, 6 Oct 2012 20:10:31 +0000
Subject: [PATCH 23/43] Fix a recurring, cloned typo

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5220 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/configs/amber/hello/setenv.sh                   | 4 ++--
 nuttx/configs/ea3131/nsh/setenv.sh                    | 4 ++--
 nuttx/configs/ea3131/ostest/setenv.sh                 | 4 ++--
 nuttx/configs/ea3131/pgnsh/setenv.sh                  | 4 ++--
 nuttx/configs/ea3131/usbserial/setenv.sh              | 4 ++--
 nuttx/configs/ea3131/usbstorage/setenv.sh             | 4 ++--
 nuttx/configs/ea3152/ostest/setenv.sh                 | 4 ++--
 nuttx/configs/fire-stm32v2/nsh/setenv.sh              | 6 +++---
 nuttx/configs/hymini-stm32v/nsh2/setenv.sh            | 6 +++---
 nuttx/configs/hymini-stm32v/nx/setenv.sh              | 4 ++--
 nuttx/configs/kwikstik-k40/ostest/setenv.sh           | 4 ++--
 nuttx/configs/lpc4330-xplorer/nsh/setenv.sh           | 4 ++--
 nuttx/configs/lpc4330-xplorer/ostest/setenv.sh        | 4 ++--
 nuttx/configs/lpcxpresso-lpc1768/dhcpd/setenv.sh      | 2 +-
 nuttx/configs/lpcxpresso-lpc1768/nsh/setenv.sh        | 2 +-
 nuttx/configs/lpcxpresso-lpc1768/nx/setenv.sh         | 2 +-
 nuttx/configs/lpcxpresso-lpc1768/ostest/setenv.sh     | 2 +-
 nuttx/configs/lpcxpresso-lpc1768/thttpd/setenv.sh     | 2 +-
 nuttx/configs/lpcxpresso-lpc1768/usbstorage/setenv.sh | 2 +-
 nuttx/configs/mcu123-lpc214x/composite/setenv.sh      | 4 ++--
 nuttx/configs/micropendous3/hello/setenv.sh           | 4 ++--
 nuttx/configs/mirtoo/nsh/setenv.sh                    | 4 ++--
 nuttx/configs/mirtoo/nxffs/setenv.sh                  | 4 ++--
 nuttx/configs/mirtoo/ostest/setenv.sh                 | 4 ++--
 nuttx/configs/olimex-stm32-p107/nsh/setenv.sh         | 6 +++---
 nuttx/configs/olimex-stm32-p107/ostest/setenv.sh      | 6 +++---
 nuttx/configs/pcblogic-pic32mx/nsh/setenv.sh          | 2 +-
 nuttx/configs/pcblogic-pic32mx/ostest/setenv.sh       | 2 +-
 nuttx/configs/pic32-starterkit/nsh/setenv.sh          | 2 +-
 nuttx/configs/pic32-starterkit/nsh2/setenv.sh         | 2 +-
 nuttx/configs/pic32-starterkit/ostest/setenv.sh       | 2 +-
 nuttx/configs/pic32mx7mmb/nsh/setenv.sh               | 2 +-
 nuttx/configs/pic32mx7mmb/ostest/setenv.sh            | 2 +-
 nuttx/configs/shenzhou/nsh/setenv.sh                  | 6 +++---
 nuttx/configs/shenzhou/nxwm/setenv.sh                 | 6 +++---
 nuttx/configs/stm3210e-eval/composite/setenv.sh       | 6 +++---
 nuttx/configs/stm3210e-eval/nsh2/setenv.sh            | 6 +++---
 nuttx/configs/stm3210e-eval/nx/setenv.sh              | 4 ++--
 nuttx/configs/stm3210e-eval/nxconsole/setenv.sh       | 4 ++--
 nuttx/configs/stm3210e-eval/nxtext/setenv.sh          | 4 ++--
 nuttx/configs/stm3210e-eval/pm/setenv.sh              | 6 +++---
 nuttx/configs/stm3220g-eval/dhcpd/setenv.sh           | 6 +++---
 nuttx/configs/stm3220g-eval/nettest/setenv.sh         | 6 +++---
 nuttx/configs/stm3220g-eval/nsh/setenv.sh             | 6 +++---
 nuttx/configs/stm3220g-eval/nsh2/setenv.sh            | 6 +++---
 nuttx/configs/stm3220g-eval/nxwm/setenv.sh            | 6 +++---
 nuttx/configs/stm3220g-eval/ostest/setenv.sh          | 6 +++---
 nuttx/configs/stm3220g-eval/telnetd/setenv.sh         | 6 +++---
 nuttx/configs/stm3240g-eval/dhcpd/setenv.sh           | 6 +++---
 nuttx/configs/stm3240g-eval/discover/setenv.sh        | 6 +++---
 nuttx/configs/stm3240g-eval/nettest/setenv.sh         | 6 +++---
 nuttx/configs/stm3240g-eval/nsh/setenv.sh             | 6 +++---
 nuttx/configs/stm3240g-eval/nsh2/setenv.sh            | 6 +++---
 nuttx/configs/stm3240g-eval/nxconsole/setenv.sh       | 6 +++---
 nuttx/configs/stm3240g-eval/nxwm/setenv.sh            | 6 +++---
 nuttx/configs/stm3240g-eval/ostest/setenv.sh          | 6 +++---
 nuttx/configs/stm3240g-eval/telnetd/setenv.sh         | 6 +++---
 nuttx/configs/stm3240g-eval/webserver/setenv.sh       | 6 +++---
 nuttx/configs/stm3240g-eval/xmlrpc/setenv.sh          | 6 +++---
 nuttx/configs/stm32f4discovery/nsh/setenv.sh          | 6 +++---
 nuttx/configs/stm32f4discovery/nxlines/setenv.sh      | 6 +++---
 nuttx/configs/stm32f4discovery/ostest/setenv.sh       | 6 +++---
 nuttx/configs/stm32f4discovery/pm/setenv.sh           | 6 +++---
 nuttx/configs/sure-pic32mx/nsh/setenv.sh              | 2 +-
 nuttx/configs/sure-pic32mx/ostest/setenv.sh           | 2 +-
 nuttx/configs/sure-pic32mx/usbnsh/setenv.sh           | 2 +-
 nuttx/configs/teensy/hello/setenv.sh                  | 4 ++--
 nuttx/configs/teensy/nsh/setenv.sh                    | 4 ++--
 nuttx/configs/teensy/usbstorage/setenv.sh             | 4 ++--
 nuttx/configs/twr-k60n512/nsh/setenv.sh               | 4 ++--
 nuttx/configs/twr-k60n512/ostest/setenv.sh            | 4 ++--
 nuttx/configs/ubw32/nsh/setenv.sh                     | 2 +-
 nuttx/configs/ubw32/ostest/setenv.sh                  | 2 +-
 73 files changed, 159 insertions(+), 159 deletions(-)

diff --git a/nuttx/configs/amber/hello/setenv.sh b/nuttx/configs/amber/hello/setenv.sh
index 094bad8b92..9b350a2c4e 100755
--- a/nuttx/configs/amber/hello/setenv.sh
+++ b/nuttx/configs/amber/hello/setenv.sh
@@ -47,13 +47,13 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the WinAVR
+# This is the Cygwin path to the location where I installed the WinAVR
 # toolchain under windows.  This is *not* the default install
 # location so you will probably have to edit this.  You will also have
 # to edit this if you install the Linux AVR toolchain as well
 #export TOOLCHAIN_BIN="/cygdrive/c/WinAVR/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_avr/staging_dir/bin"
 
diff --git a/nuttx/configs/ea3131/nsh/setenv.sh b/nuttx/configs/ea3131/nsh/setenv.sh
index 00b1e0c436..7907d24e9d 100755
--- a/nuttx/configs/ea3131/nsh/setenv.sh
+++ b/nuttx/configs/ea3131/nsh/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/ea3131/ostest/setenv.sh b/nuttx/configs/ea3131/ostest/setenv.sh
index cd894a300a..2c3453d070 100755
--- a/nuttx/configs/ea3131/ostest/setenv.sh
+++ b/nuttx/configs/ea3131/ostest/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/ea3131/pgnsh/setenv.sh b/nuttx/configs/ea3131/pgnsh/setenv.sh
index ead7c9ffad..adec8bc780 100755
--- a/nuttx/configs/ea3131/pgnsh/setenv.sh
+++ b/nuttx/configs/ea3131/pgnsh/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/ea3131/usbserial/setenv.sh b/nuttx/configs/ea3131/usbserial/setenv.sh
index 69a6bb4421..51d3d5250b 100755
--- a/nuttx/configs/ea3131/usbserial/setenv.sh
+++ b/nuttx/configs/ea3131/usbserial/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/ea3131/usbstorage/setenv.sh b/nuttx/configs/ea3131/usbstorage/setenv.sh
index 6481502283..bf0fb65a41 100755
--- a/nuttx/configs/ea3131/usbstorage/setenv.sh
+++ b/nuttx/configs/ea3131/usbstorage/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/ea3152/ostest/setenv.sh b/nuttx/configs/ea3152/ostest/setenv.sh
index 418f4701e3..d65858918e 100755
--- a/nuttx/configs/ea3152/ostest/setenv.sh
+++ b/nuttx/configs/ea3152/ostest/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/fire-stm32v2/nsh/setenv.sh b/nuttx/configs/fire-stm32v2/nsh/setenv.sh
index e6f4ee2e0e..25afca04c7 100755
--- a/nuttx/configs/fire-stm32v2/nsh/setenv.sh
+++ b/nuttx/configs/fire-stm32v2/nsh/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -65,7 +65,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/hymini-stm32v/nsh2/setenv.sh b/nuttx/configs/hymini-stm32v/nsh2/setenv.sh
index 37ae1800be..97d7c79936 100755
--- a/nuttx/configs/hymini-stm32v/nsh2/setenv.sh
+++ b/nuttx/configs/hymini-stm32v/nsh2/setenv.sh
@@ -47,17 +47,17 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/hymini-stm32v/nx/setenv.sh b/nuttx/configs/hymini-stm32v/nx/setenv.sh
index 4e9fdb4ec6..afaa91789f 100755
--- a/nuttx/configs/hymini-stm32v/nx/setenv.sh
+++ b/nuttx/configs/hymini-stm32v/nx/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/kwikstik-k40/ostest/setenv.sh b/nuttx/configs/kwikstik-k40/ostest/setenv.sh
index 089419ac73..3acbddea48 100755
--- a/nuttx/configs/kwikstik-k40/ostest/setenv.sh
+++ b/nuttx/configs/kwikstik-k40/ostest/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/lpc4330-xplorer/nsh/setenv.sh b/nuttx/configs/lpc4330-xplorer/nsh/setenv.sh
index 64109ce38c..c5ce2099bc 100755
--- a/nuttx/configs/lpc4330-xplorer/nsh/setenv.sh
+++ b/nuttx/configs/lpc4330-xplorer/nsh/setenv.sh
@@ -55,7 +55,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/code_red/RedSuite_4.2.3_379/redsuite/Tools/bin
 #export SCRIPT_BIN="/cygdrive/c/code_red/RedSuite_4.2.3_379/redsuite/bin"
 export SCRIPT_BIN="/cygdrive/c/nxp/LPCXpresso_4.2.3_292/lpcxpresso/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -70,7 +70,7 @@ export SCRIPT_BIN="/cygdrive/c/nxp/LPCXpresso_4.2.3_292/lpcxpresso/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 #export SCRIPT_BIN=
 
-# This the Cygwin path to the location where I build the buildroot
+# This is 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 SCRIPT_BIN=
diff --git a/nuttx/configs/lpc4330-xplorer/ostest/setenv.sh b/nuttx/configs/lpc4330-xplorer/ostest/setenv.sh
index 8ac6da66b1..e5a5ef3d16 100755
--- a/nuttx/configs/lpc4330-xplorer/ostest/setenv.sh
+++ b/nuttx/configs/lpc4330-xplorer/ostest/setenv.sh
@@ -55,7 +55,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/code_red/RedSuite_4.2.3_379/redsuite/Tools/bin
 #export SCRIPT_BIN="/cygdrive/c/code_red/RedSuite_4.2.3_379/redsuite/bin"
 export SCRIPT_BIN="/cygdrive/c/nxp/LPCXpresso_4.2.3_292/lpcxpresso/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -70,7 +70,7 @@ export SCRIPT_BIN="/cygdrive/c/nxp/LPCXpresso_4.2.3_292/lpcxpresso/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 #export SCRIPT_BIN=
 
-# This the Cygwin path to the location where I build the buildroot
+# This is 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 SCRIPT_BIN=
diff --git a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/setenv.sh b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/setenv.sh
index 6bc6e10c97..03641fd612 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/setenv.sh
+++ b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/setenv.sh
@@ -47,7 +47,7 @@ WD=`pwd`
 # This is the default install location for Code Red on Linux
 export TOOLCHAIN_BIN="/usr/local/LPCXpresso/tools/bin"
 
-# This the Cygwin path to the LPCXpresso 3.6 install location under Windows
+# 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
diff --git a/nuttx/configs/lpcxpresso-lpc1768/nsh/setenv.sh b/nuttx/configs/lpcxpresso-lpc1768/nsh/setenv.sh
index 77f745c76a..46d5b3261f 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/nsh/setenv.sh
+++ b/nuttx/configs/lpcxpresso-lpc1768/nsh/setenv.sh
@@ -47,7 +47,7 @@ WD=`pwd`
 # This is the default install location for Code Red on Linux
 export TOOLCHAIN_BIN="/usr/local/LPCXpresso/tools/bin"
 
-# This the Cygwin path to the LPCXpresso 3.6 install location under Windows
+# 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
diff --git a/nuttx/configs/lpcxpresso-lpc1768/nx/setenv.sh b/nuttx/configs/lpcxpresso-lpc1768/nx/setenv.sh
index 711d92ea47..2f04a8ac6d 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/nx/setenv.sh
+++ b/nuttx/configs/lpcxpresso-lpc1768/nx/setenv.sh
@@ -47,7 +47,7 @@ WD=`pwd`
 # This is the default install location for Code Red on Linux
 export TOOLCHAIN_BIN="/usr/local/LPCXpresso/tools/bin"
 
-# This the Cygwin path to the LPCXpresso 3.6 install location under Windows
+# 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
diff --git a/nuttx/configs/lpcxpresso-lpc1768/ostest/setenv.sh b/nuttx/configs/lpcxpresso-lpc1768/ostest/setenv.sh
index db976c9469..724d1420d6 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/ostest/setenv.sh
+++ b/nuttx/configs/lpcxpresso-lpc1768/ostest/setenv.sh
@@ -47,7 +47,7 @@ WD=`pwd`
 # This is the default install location for Code Red on Linux
 export TOOLCHAIN_BIN="/usr/local/LPCXpresso/tools/bin"
 
-# This the Cygwin path to the LPCXpresso 3.6 install location under Windows
+# 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
diff --git a/nuttx/configs/lpcxpresso-lpc1768/thttpd/setenv.sh b/nuttx/configs/lpcxpresso-lpc1768/thttpd/setenv.sh
index 158c8a4424..7156a371dd 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/thttpd/setenv.sh
+++ b/nuttx/configs/lpcxpresso-lpc1768/thttpd/setenv.sh
@@ -49,7 +49,7 @@ export BUILDROOT_BIN="${WD}/../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 the Cygwin path to the LPCXpresso 3.6 install location under Windows
+# 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
diff --git a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/setenv.sh b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/setenv.sh
index 036de7aef1..8c4039ddd3 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/setenv.sh
+++ b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/setenv.sh
@@ -47,7 +47,7 @@ WD=`pwd`
 # This is the default install location for Code Red on Linux
 export TOOLCHAIN_BIN="/usr/local/LPCXpresso/tools/bin"
 
-# This the Cygwin path to the LPCXpresso 3.6 install location under Windows
+# 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
diff --git a/nuttx/configs/mcu123-lpc214x/composite/setenv.sh b/nuttx/configs/mcu123-lpc214x/composite/setenv.sh
index f2fb6cb4c7..a81cb395b4 100755
--- a/nuttx/configs/mcu123-lpc214x/composite/setenv.sh
+++ b/nuttx/configs/mcu123-lpc214x/composite/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/micropendous3/hello/setenv.sh b/nuttx/configs/micropendous3/hello/setenv.sh
index 8e8830dc78..076ab237e6 100755
--- a/nuttx/configs/micropendous3/hello/setenv.sh
+++ b/nuttx/configs/micropendous3/hello/setenv.sh
@@ -47,13 +47,13 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the WinAVR
+# This is the Cygwin path to the location where I installed the WinAVR
 # toolchain under windows.  This is *not* the default install
 # location so you will probably have to edit this.  You will also have
 # to edit this if you install the Linux AVR toolchain as well
 #export TOOLCHAIN_BIN="/cygdrive/c/WinAVR/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_avr/staging_dir/bin"
 
diff --git a/nuttx/configs/mirtoo/nsh/setenv.sh b/nuttx/configs/mirtoo/nsh/setenv.sh
index 95a5e8d309..e19bcb407f 100755
--- a/nuttx/configs/mirtoo/nsh/setenv.sh
+++ b/nuttx/configs/mirtoo/nsh/setenv.sh
@@ -45,7 +45,7 @@ if [ ! -x "setenv.sh" ]; then
   exit 1
 fi
 
-# This the Cygwin path to the location where I installed the MicroChip
+# This is the Cygwin path to the location where I installed the MicroChip
 # PIC32MX C32 toolchain under windows.  This is *not* the default install
 # location so you will probably have to edit this.  You will also have
 # to edit this if you install a different version of if you install the
@@ -58,7 +58,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/MicroChip/mplabc32/v1.12/bin"
 # version of if you install the toolchain at a different location
 #export TOOLCHAIN_BIN="/opt/microchip/xc32/v1.00/bin"
 
-# This the Cygwin path to the location where I installed the Pinguino
+# This is the Cygwin path to the location where I installed the Pinguino
 # toolchain under Windows.  You will have to edit this if you install the
 # tool chain in a different location or use a different version.  /bin
 # needs to precede the tool path or otherwise you will get
diff --git a/nuttx/configs/mirtoo/nxffs/setenv.sh b/nuttx/configs/mirtoo/nxffs/setenv.sh
index 34f8d3ef18..1a6279ef13 100755
--- a/nuttx/configs/mirtoo/nxffs/setenv.sh
+++ b/nuttx/configs/mirtoo/nxffs/setenv.sh
@@ -45,7 +45,7 @@ if [ ! -x "setenv.sh" ]; then
   exit 1
 fi
 
-# This the Cygwin path to the location where I installed the MicroChip
+# This is the Cygwin path to the location where I installed the MicroChip
 # PIC32MX C32 toolchain under windows.  This is *not* the default install
 # location so you will probably have to edit this.  You will also have
 # to edit this if you install a different version of if you install the
@@ -58,7 +58,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/MicroChip/mplabc32/v1.12/bin"
 # version of if you install the toolchain at a different location
 #export TOOLCHAIN_BIN="/opt/microchip/xc32/v1.00/bin"
 
-# This the Cygwin path to the location where I installed the Pinguino
+# This is the Cygwin path to the location where I installed the Pinguino
 # toolchain under Windows.  You will have to edit this if you install the
 # tool chain in a different location or use a different version.  /bin
 # needs to precede the tool path or otherwise you will get
diff --git a/nuttx/configs/mirtoo/ostest/setenv.sh b/nuttx/configs/mirtoo/ostest/setenv.sh
index 28177a539d..dcdd5d978d 100755
--- a/nuttx/configs/mirtoo/ostest/setenv.sh
+++ b/nuttx/configs/mirtoo/ostest/setenv.sh
@@ -45,7 +45,7 @@ if [ ! -x "setenv.sh" ]; then
   exit 1
 fi
 
-# This the Cygwin path to the location where I installed the MicroChip
+# This is the Cygwin path to the location where I installed the MicroChip
 # PIC32MX C32 toolchain under windows.  This is *not* the default install
 # location so you will probably have to edit this.  You will also have
 # to edit this if you install a different version of if you install the
@@ -58,7 +58,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/MicroChip/mplabc32/v1.12/bin"
 # version of if you install the toolchain at a different location
 #export TOOLCHAIN_BIN="/opt/microchip/xc32/v1.00/bin"
 
-# This the Cygwin path to the location where I installed the Pinguino
+# This is the Cygwin path to the location where I installed the Pinguino
 # toolchain under Windows.  You will have to edit this if you install the
 # tool chain in a different location or use a different version.  /bin
 # needs to precede the tool path or otherwise you will get
diff --git a/nuttx/configs/olimex-stm32-p107/nsh/setenv.sh b/nuttx/configs/olimex-stm32-p107/nsh/setenv.sh
index 004f025b8f..1f634770a9 100755
--- a/nuttx/configs/olimex-stm32-p107/nsh/setenv.sh
+++ b/nuttx/configs/olimex-stm32-p107/nsh/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -65,7 +65,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/olimex-stm32-p107/ostest/setenv.sh b/nuttx/configs/olimex-stm32-p107/ostest/setenv.sh
index fe40c0bc19..c09c1ee6a3 100755
--- a/nuttx/configs/olimex-stm32-p107/ostest/setenv.sh
+++ b/nuttx/configs/olimex-stm32-p107/ostest/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -65,7 +65,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/pcblogic-pic32mx/nsh/setenv.sh b/nuttx/configs/pcblogic-pic32mx/nsh/setenv.sh
index 5f8bc609bc..91f0b8f2cb 100755
--- a/nuttx/configs/pcblogic-pic32mx/nsh/setenv.sh
+++ b/nuttx/configs/pcblogic-pic32mx/nsh/setenv.sh
@@ -45,7 +45,7 @@ if [ ! -x "setenv.sh" ]; then
   exit 1
 fi
 
-# This the Cygwin path to the location where I installed the MicroChip
+# This is the Cygwin path to the location where I installed the MicroChip
 # PIC32MX toolchain under windows.  This is *not* the default install
 # location so you will probably have to edit this.  You will also have
 # to edit this if you install a different version of if you install
diff --git a/nuttx/configs/pcblogic-pic32mx/ostest/setenv.sh b/nuttx/configs/pcblogic-pic32mx/ostest/setenv.sh
index 1624cf8de0..b10ee2157b 100755
--- a/nuttx/configs/pcblogic-pic32mx/ostest/setenv.sh
+++ b/nuttx/configs/pcblogic-pic32mx/ostest/setenv.sh
@@ -45,7 +45,7 @@ if [ ! -x "setenv.sh" ]; then
   exit 1
 fi
 
-# This the Cygwin path to the location where I installed the MicroChip
+# This is the Cygwin path to the location where I installed the MicroChip
 # PIC32MX toolchain under windows.  This is *not* the default install
 # location so you will probably have to edit this.  You will also have
 # to edit this if you install a different version of if you install
diff --git a/nuttx/configs/pic32-starterkit/nsh/setenv.sh b/nuttx/configs/pic32-starterkit/nsh/setenv.sh
index 540ade2263..bd024bca0a 100755
--- a/nuttx/configs/pic32-starterkit/nsh/setenv.sh
+++ b/nuttx/configs/pic32-starterkit/nsh/setenv.sh
@@ -45,7 +45,7 @@ if [ ! -x "setenv.sh" ]; then
   exit 1
 fi
 
-# This the Cygwin path to the location where I installed the MicroChip
+# This is the Cygwin path to the location where I installed the MicroChip
 # PIC32MX toolchain under windows.  This is *not* the default install
 # location so you will probably have to edit this.  You will also have
 # to edit this if you install a different version of if you install
diff --git a/nuttx/configs/pic32-starterkit/nsh2/setenv.sh b/nuttx/configs/pic32-starterkit/nsh2/setenv.sh
index 47effba5bc..cd6d8fa45f 100755
--- a/nuttx/configs/pic32-starterkit/nsh2/setenv.sh
+++ b/nuttx/configs/pic32-starterkit/nsh2/setenv.sh
@@ -45,7 +45,7 @@ if [ ! -x "setenv.sh" ]; then
   exit 1
 fi
 
-# This the Cygwin path to the location where I installed the MicroChip
+# This is the Cygwin path to the location where I installed the MicroChip
 # PIC32MX toolchain under windows.  This is *not* the default install
 # location so you will probably have to edit this.  You will also have
 # to edit this if you install a different version of if you install
diff --git a/nuttx/configs/pic32-starterkit/ostest/setenv.sh b/nuttx/configs/pic32-starterkit/ostest/setenv.sh
index 4e4777ce6c..08dac3a159 100755
--- a/nuttx/configs/pic32-starterkit/ostest/setenv.sh
+++ b/nuttx/configs/pic32-starterkit/ostest/setenv.sh
@@ -45,7 +45,7 @@ if [ ! -x "setenv.sh" ]; then
   exit 1
 fi
 
-# This the Cygwin path to the location where I installed the MicroChip
+# This is the Cygwin path to the location where I installed the MicroChip
 # PIC32MX toolchain under windows.  This is *not* the default install
 # location so you will probably have to edit this.  You will also have
 # to edit this if you install a different version of if you install
diff --git a/nuttx/configs/pic32mx7mmb/nsh/setenv.sh b/nuttx/configs/pic32mx7mmb/nsh/setenv.sh
index aefb891cf0..82518d7404 100755
--- a/nuttx/configs/pic32mx7mmb/nsh/setenv.sh
+++ b/nuttx/configs/pic32mx7mmb/nsh/setenv.sh
@@ -45,7 +45,7 @@ if [ ! -x "setenv.sh" ]; then
   exit 1
 fi
 
-# This the Cygwin path to the location where I installed the MicroChip
+# This is the Cygwin path to the location where I installed the MicroChip
 # PIC32MX toolchain under windows.  This is *not* the default install
 # location so you will probably have to edit this.  You will also have
 # to edit this if you install a different version of if you install
diff --git a/nuttx/configs/pic32mx7mmb/ostest/setenv.sh b/nuttx/configs/pic32mx7mmb/ostest/setenv.sh
index a960d4b7c5..b7cf576fb8 100755
--- a/nuttx/configs/pic32mx7mmb/ostest/setenv.sh
+++ b/nuttx/configs/pic32mx7mmb/ostest/setenv.sh
@@ -45,7 +45,7 @@ if [ ! -x "setenv.sh" ]; then
   exit 1
 fi
 
-# This the Cygwin path to the location where I installed the MicroChip
+# This is the Cygwin path to the location where I installed the MicroChip
 # PIC32MX toolchain under windows.  This is *not* the default install
 # location so you will probably have to edit this.  You will also have
 # to edit this if you install a different version of if you install
diff --git a/nuttx/configs/shenzhou/nsh/setenv.sh b/nuttx/configs/shenzhou/nsh/setenv.sh
index d57d6f003d..96fe2dd347 100755
--- a/nuttx/configs/shenzhou/nsh/setenv.sh
+++ b/nuttx/configs/shenzhou/nsh/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -65,7 +65,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/shenzhou/nxwm/setenv.sh b/nuttx/configs/shenzhou/nxwm/setenv.sh
index 7f00448a60..eb2c424f4f 100755
--- a/nuttx/configs/shenzhou/nxwm/setenv.sh
+++ b/nuttx/configs/shenzhou/nxwm/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -65,7 +65,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm3210e-eval/composite/setenv.sh b/nuttx/configs/stm3210e-eval/composite/setenv.sh
index ce267428b3..620f842bdc 100755
--- a/nuttx/configs/stm3210e-eval/composite/setenv.sh
+++ b/nuttx/configs/stm3210e-eval/composite/setenv.sh
@@ -47,17 +47,17 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm3210e-eval/nsh2/setenv.sh b/nuttx/configs/stm3210e-eval/nsh2/setenv.sh
index 425acf89e5..1fa193a577 100755
--- a/nuttx/configs/stm3210e-eval/nsh2/setenv.sh
+++ b/nuttx/configs/stm3210e-eval/nsh2/setenv.sh
@@ -47,17 +47,17 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm3210e-eval/nx/setenv.sh b/nuttx/configs/stm3210e-eval/nx/setenv.sh
index bf9fad4435..f021449439 100755
--- a/nuttx/configs/stm3210e-eval/nx/setenv.sh
+++ b/nuttx/configs/stm3210e-eval/nx/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm3210e-eval/nxconsole/setenv.sh b/nuttx/configs/stm3210e-eval/nxconsole/setenv.sh
index 6297702459..b0d409c60e 100755
--- a/nuttx/configs/stm3210e-eval/nxconsole/setenv.sh
+++ b/nuttx/configs/stm3210e-eval/nxconsole/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm3210e-eval/nxtext/setenv.sh b/nuttx/configs/stm3210e-eval/nxtext/setenv.sh
index a36540cf11..0f3d387f59 100755
--- a/nuttx/configs/stm3210e-eval/nxtext/setenv.sh
+++ b/nuttx/configs/stm3210e-eval/nxtext/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm3210e-eval/pm/setenv.sh b/nuttx/configs/stm3210e-eval/pm/setenv.sh
index 5a02de2585..d73f69a2f4 100755
--- a/nuttx/configs/stm3210e-eval/pm/setenv.sh
+++ b/nuttx/configs/stm3210e-eval/pm/setenv.sh
@@ -47,17 +47,17 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm3220g-eval/dhcpd/setenv.sh b/nuttx/configs/stm3220g-eval/dhcpd/setenv.sh
index f23056a019..47c4e45ba1 100755
--- a/nuttx/configs/stm3220g-eval/dhcpd/setenv.sh
+++ b/nuttx/configs/stm3220g-eval/dhcpd/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -65,7 +65,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm3220g-eval/nettest/setenv.sh b/nuttx/configs/stm3220g-eval/nettest/setenv.sh
index 67287fd743..9586cfd4c0 100755
--- a/nuttx/configs/stm3220g-eval/nettest/setenv.sh
+++ b/nuttx/configs/stm3220g-eval/nettest/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -65,7 +65,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm3220g-eval/nsh/setenv.sh b/nuttx/configs/stm3220g-eval/nsh/setenv.sh
index 618daf0117..489322177a 100755
--- a/nuttx/configs/stm3220g-eval/nsh/setenv.sh
+++ b/nuttx/configs/stm3220g-eval/nsh/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -65,7 +65,7 @@ fi
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm3220g-eval/nsh2/setenv.sh b/nuttx/configs/stm3220g-eval/nsh2/setenv.sh
index 5b6405faed..1e2f87b403 100755
--- a/nuttx/configs/stm3220g-eval/nsh2/setenv.sh
+++ b/nuttx/configs/stm3220g-eval/nsh2/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -64,7 +64,7 @@ fi
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm3220g-eval/nxwm/setenv.sh b/nuttx/configs/stm3220g-eval/nxwm/setenv.sh
index 95c73a722b..ff642018e4 100755
--- a/nuttx/configs/stm3220g-eval/nxwm/setenv.sh
+++ b/nuttx/configs/stm3220g-eval/nxwm/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -65,7 +65,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm3220g-eval/ostest/setenv.sh b/nuttx/configs/stm3220g-eval/ostest/setenv.sh
index 2b8e7daa70..4f886e58b5 100755
--- a/nuttx/configs/stm3220g-eval/ostest/setenv.sh
+++ b/nuttx/configs/stm3220g-eval/ostest/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -65,7 +65,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm3220g-eval/telnetd/setenv.sh b/nuttx/configs/stm3220g-eval/telnetd/setenv.sh
index 68903d175e..7e0ca9edc1 100755
--- a/nuttx/configs/stm3220g-eval/telnetd/setenv.sh
+++ b/nuttx/configs/stm3220g-eval/telnetd/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -65,7 +65,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm3240g-eval/dhcpd/setenv.sh b/nuttx/configs/stm3240g-eval/dhcpd/setenv.sh
index 9fcb08906e..5d7ee987ed 100755
--- a/nuttx/configs/stm3240g-eval/dhcpd/setenv.sh
+++ b/nuttx/configs/stm3240g-eval/dhcpd/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -65,7 +65,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm3240g-eval/discover/setenv.sh b/nuttx/configs/stm3240g-eval/discover/setenv.sh
index ce5f031b1c..fb039aa256 100755
--- a/nuttx/configs/stm3240g-eval/discover/setenv.sh
+++ b/nuttx/configs/stm3240g-eval/discover/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -65,7 +65,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm3240g-eval/nettest/setenv.sh b/nuttx/configs/stm3240g-eval/nettest/setenv.sh
index 2d3414d27c..7f3aa05b91 100755
--- a/nuttx/configs/stm3240g-eval/nettest/setenv.sh
+++ b/nuttx/configs/stm3240g-eval/nettest/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -65,7 +65,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm3240g-eval/nsh/setenv.sh b/nuttx/configs/stm3240g-eval/nsh/setenv.sh
index 4d92d6bbfc..a0c457dc7e 100755
--- a/nuttx/configs/stm3240g-eval/nsh/setenv.sh
+++ b/nuttx/configs/stm3240g-eval/nsh/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -65,7 +65,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm3240g-eval/nsh2/setenv.sh b/nuttx/configs/stm3240g-eval/nsh2/setenv.sh
index 944f77734e..1856591aab 100755
--- a/nuttx/configs/stm3240g-eval/nsh2/setenv.sh
+++ b/nuttx/configs/stm3240g-eval/nsh2/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -65,7 +65,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm3240g-eval/nxconsole/setenv.sh b/nuttx/configs/stm3240g-eval/nxconsole/setenv.sh
index a429508366..39c9d257bb 100755
--- a/nuttx/configs/stm3240g-eval/nxconsole/setenv.sh
+++ b/nuttx/configs/stm3240g-eval/nxconsole/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -65,7 +65,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm3240g-eval/nxwm/setenv.sh b/nuttx/configs/stm3240g-eval/nxwm/setenv.sh
index a8ff5bb04e..a995b02bc3 100755
--- a/nuttx/configs/stm3240g-eval/nxwm/setenv.sh
+++ b/nuttx/configs/stm3240g-eval/nxwm/setenv.sh
@@ -47,17 +47,17 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm3240g-eval/ostest/setenv.sh b/nuttx/configs/stm3240g-eval/ostest/setenv.sh
index 29786ec2f1..795996bc08 100755
--- a/nuttx/configs/stm3240g-eval/ostest/setenv.sh
+++ b/nuttx/configs/stm3240g-eval/ostest/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -65,7 +65,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm3240g-eval/telnetd/setenv.sh b/nuttx/configs/stm3240g-eval/telnetd/setenv.sh
index c022d1d9b8..38262453d1 100755
--- a/nuttx/configs/stm3240g-eval/telnetd/setenv.sh
+++ b/nuttx/configs/stm3240g-eval/telnetd/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -65,7 +65,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm3240g-eval/webserver/setenv.sh b/nuttx/configs/stm3240g-eval/webserver/setenv.sh
index 2347f39d84..d4fa30fdcf 100644
--- a/nuttx/configs/stm3240g-eval/webserver/setenv.sh
+++ b/nuttx/configs/stm3240g-eval/webserver/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -65,7 +65,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm3240g-eval/xmlrpc/setenv.sh b/nuttx/configs/stm3240g-eval/xmlrpc/setenv.sh
index 847be2a89e..835018d806 100644
--- a/nuttx/configs/stm3240g-eval/xmlrpc/setenv.sh
+++ b/nuttx/configs/stm3240g-eval/xmlrpc/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -65,7 +65,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm32f4discovery/nsh/setenv.sh b/nuttx/configs/stm32f4discovery/nsh/setenv.sh
index 65a7a3ab4a..2476845b64 100755
--- a/nuttx/configs/stm32f4discovery/nsh/setenv.sh
+++ b/nuttx/configs/stm32f4discovery/nsh/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -65,7 +65,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm32f4discovery/nxlines/setenv.sh b/nuttx/configs/stm32f4discovery/nxlines/setenv.sh
index e188703a0a..b9815c482e 100755
--- a/nuttx/configs/stm32f4discovery/nxlines/setenv.sh
+++ b/nuttx/configs/stm32f4discovery/nxlines/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -65,7 +65,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm32f4discovery/ostest/setenv.sh b/nuttx/configs/stm32f4discovery/ostest/setenv.sh
index d67f434d01..a67fdc5a8a 100755
--- a/nuttx/configs/stm32f4discovery/ostest/setenv.sh
+++ b/nuttx/configs/stm32f4discovery/ostest/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -65,7 +65,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/stm32f4discovery/pm/setenv.sh b/nuttx/configs/stm32f4discovery/pm/setenv.sh
index ca0795942f..fef2997c70 100644
--- a/nuttx/configs/stm32f4discovery/pm/setenv.sh
+++ b/nuttx/configs/stm32f4discovery/pm/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the RIDE
+# This is the Cygwin path to the location where I installed the RIDE
 # toolchain under windows.  You will also have to edit this if you install
 # the RIDE toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
@@ -65,7 +65,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
 #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/sure-pic32mx/nsh/setenv.sh b/nuttx/configs/sure-pic32mx/nsh/setenv.sh
index 8c4df233b3..bba6836094 100755
--- a/nuttx/configs/sure-pic32mx/nsh/setenv.sh
+++ b/nuttx/configs/sure-pic32mx/nsh/setenv.sh
@@ -45,7 +45,7 @@ if [ ! -x "setenv.sh" ]; then
   exit 1
 fi
 
-# This the Cygwin path to the location where I installed the MicroChip
+# This is the Cygwin path to the location where I installed the MicroChip
 # PIC32MX toolchain under windows.  This is *not* the default install
 # location so you will probably have to edit this.  You will also have
 # to edit this if you install a different version of if you install
diff --git a/nuttx/configs/sure-pic32mx/ostest/setenv.sh b/nuttx/configs/sure-pic32mx/ostest/setenv.sh
index b26ea960e7..5f02345884 100755
--- a/nuttx/configs/sure-pic32mx/ostest/setenv.sh
+++ b/nuttx/configs/sure-pic32mx/ostest/setenv.sh
@@ -45,7 +45,7 @@ if [ ! -x "setenv.sh" ]; then
   exit 1
 fi
 
-# This the Cygwin path to the location where I installed the MicroChip
+# This is the Cygwin path to the location where I installed the MicroChip
 # PIC32MX toolchain under windows.  This is *not* the default install
 # location so you will probably have to edit this.  You will also have
 # to edit this if you install a different version of if you install
diff --git a/nuttx/configs/sure-pic32mx/usbnsh/setenv.sh b/nuttx/configs/sure-pic32mx/usbnsh/setenv.sh
index 263dfc5967..62074cdb35 100755
--- a/nuttx/configs/sure-pic32mx/usbnsh/setenv.sh
+++ b/nuttx/configs/sure-pic32mx/usbnsh/setenv.sh
@@ -45,7 +45,7 @@ if [ ! -x "setenv.sh" ]; then
   exit 1
 fi
 
-# This the Cygwin path to the location where I installed the MicroChip
+# This is the Cygwin path to the location where I installed the MicroChip
 # PIC32MX toolchain under windows.  This is *not* the default install
 # location so you will probably have to edit this.  You will also have
 # to edit this if you install a different version of if you install
diff --git a/nuttx/configs/teensy/hello/setenv.sh b/nuttx/configs/teensy/hello/setenv.sh
index d0100778ac..ecb2664238 100755
--- a/nuttx/configs/teensy/hello/setenv.sh
+++ b/nuttx/configs/teensy/hello/setenv.sh
@@ -47,13 +47,13 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the WinAVR
+# This is the Cygwin path to the location where I installed the WinAVR
 # toolchain under windows.  This is *not* the default install
 # location so you will probably have to edit this.  You will also have
 # to edit this if you install the Linux AVR toolchain as well
 #export TOOLCHAIN_BIN="/cygdrive/c/WinAVR/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_avr/staging_dir/bin"
 
diff --git a/nuttx/configs/teensy/nsh/setenv.sh b/nuttx/configs/teensy/nsh/setenv.sh
index f0c035bba5..fb61f85777 100755
--- a/nuttx/configs/teensy/nsh/setenv.sh
+++ b/nuttx/configs/teensy/nsh/setenv.sh
@@ -47,13 +47,13 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the WinAVR
+# This is the Cygwin path to the location where I installed the WinAVR
 # toolchain under windows.  This is *not* the default install
 # location so you will probably have to edit this.  You will also have
 # to edit this if you install the Linux AVR toolchain as well
 #export TOOLCHAIN_BIN="/cygdrive/c/WinAVR/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_avr/staging_dir/bin"
 
diff --git a/nuttx/configs/teensy/usbstorage/setenv.sh b/nuttx/configs/teensy/usbstorage/setenv.sh
index a455f560a3..2f80197c34 100755
--- a/nuttx/configs/teensy/usbstorage/setenv.sh
+++ b/nuttx/configs/teensy/usbstorage/setenv.sh
@@ -47,13 +47,13 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the WinAVR
+# This is the Cygwin path to the location where I installed the WinAVR
 # toolchain under windows.  This is *not* the default install
 # location so you will probably have to edit this.  You will also have
 # to edit this if you install the Linux AVR toolchain as well
 #export TOOLCHAIN_BIN="/cygdrive/c/WinAVR/bin"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_avr/staging_dir/bin"
 
diff --git a/nuttx/configs/twr-k60n512/nsh/setenv.sh b/nuttx/configs/twr-k60n512/nsh/setenv.sh
index a780a15a7d..e2725b0c34 100644
--- a/nuttx/configs/twr-k60n512/nsh/setenv.sh
+++ b/nuttx/configs/twr-k60n512/nsh/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/twr-k60n512/ostest/setenv.sh b/nuttx/configs/twr-k60n512/ostest/setenv.sh
index 86b6099dcd..c3cc691edb 100644
--- a/nuttx/configs/twr-k60n512/ostest/setenv.sh
+++ b/nuttx/configs/twr-k60n512/ostest/setenv.sh
@@ -47,12 +47,12 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-# This the Cygwin path to the location where I installed the CodeSourcery
+# This is 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"
 
-# This the Cygwin path to the location where I build the buildroot
+# This is the Cygwin path to the location where I build the buildroot
 # toolchain.
 export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
diff --git a/nuttx/configs/ubw32/nsh/setenv.sh b/nuttx/configs/ubw32/nsh/setenv.sh
index 26946b1bb0..ca5a097a3f 100755
--- a/nuttx/configs/ubw32/nsh/setenv.sh
+++ b/nuttx/configs/ubw32/nsh/setenv.sh
@@ -45,7 +45,7 @@ if [ ! -x "setenv.sh" ]; then
   exit 1
 fi
 
-# This the Cygwin path to the location where I installed the MicroChip
+# This is the Cygwin path to the location where I installed the MicroChip
 # PIC32MX toolchain under windows.  This is *not* the default install
 # location so you will probably have to edit this.  You will also have
 # to edit this if you install a different version of if you install
diff --git a/nuttx/configs/ubw32/ostest/setenv.sh b/nuttx/configs/ubw32/ostest/setenv.sh
index 6123ce6ba3..d490196413 100755
--- a/nuttx/configs/ubw32/ostest/setenv.sh
+++ b/nuttx/configs/ubw32/ostest/setenv.sh
@@ -45,7 +45,7 @@ if [ ! -x "setenv.sh" ]; then
   exit 1
 fi
 
-# This the Cygwin path to the location where I installed the MicroChip
+# This is the Cygwin path to the location where I installed the MicroChip
 # PIC32MX toolchain under windows.  This is *not* the default install
 # location so you will probably have to edit this.  You will also have
 # to edit this if you install a different version of if you install

From 50ecc59c27d8b5d295c8023d2641e6c7e55e51be Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Mon, 8 Oct 2012 18:12:53 +0000
Subject: [PATCH 24/43] Updates for new web site

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5221 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/Documentation/NuttX.html             | 24 +++++++++++-----------
 nuttx/Documentation/NuttXCommercial.html   |  1 +
 nuttx/Documentation/NuttXLinks.html        |  4 ++--
 nuttx/Documentation/NuttxPortingGuide.html |  2 +-
 nuttx/Documentation/NxWidgets.html         | 14 +++++++++----
 nuttx/Documentation/index.html             |  2 +-
 nuttx/Documentation/redirect.html          | 20 ++++++++++++++++++
 7 files changed, 47 insertions(+), 20 deletions(-)
 create mode 100644 nuttx/Documentation/redirect.html

diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html
index f22ab418c9..06b61a4de5 100644
--- a/nuttx/Documentation/NuttX.html
+++ b/nuttx/Documentation/NuttX.html
@@ -1675,7 +1675,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
       This port uses Serial-to-Ethernet Reference Design Kit (<a href="http://www.ti.com/tool/rdk-s2e">RDK-S2E</a>)
       and has similar support as for the other Stellaris family members.
       Configurations are available for the OS test and for the NuttShell (NSH)
-      (see the <a href="http://nuttx.sourceforge.net/NuttShell.html">NSH User Guide</a>).
+      (see the <a href="http://www.nuttx.org/Documentation/NuttShell.html">NSH User Guide</a>).
       The NSH configuration including networking support with a Telnet NSH console.
       This port was contributed by Mike Smith.
     </p>
@@ -1854,7 +1854,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
         A configuration to support the NuttShell is also included.
         NuttX version 5.4 adds support for the HX8347 LCD on the SAM3U-EK board.
         This LCD support includes an example using the
-        <a href=" http://nuttx.sourceforge.net/NXGraphicsSubsystem.html">NX graphics system</a>.
+        <a href=" http://www.nuttx.org/Documentation/NXGraphicsSubsystem.html">NX graphics system</a>.
         NuttX version 6.10 adds SPI support.
       </p>
       <p>
@@ -1930,7 +1930,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
         That initial, 5.6, basic release included <i>timer</i> interrupts and a <i>serial console</i> and was
         verified using the NuttX OS test (<code>apps/examples/ostest</code>).
         Configurations available include include a verified NuttShell (NSH) configuration
-        (see the <a href="http://nuttx.sourceforge.net/NuttShell.html">NSH User Guide</a>).
+        (see the <a href="http://www.nuttx.org/Documentation/NuttShell.html">NSH User Guide</a>).
         The NSH configuration supports the Nucleus2G's microSD slot and additional configurations
         are available to exercise the the USB serial and USB mass storage devices.
         However, due to some technical reasons, neither the SPI nor the USB device drivers are fully verified.
@@ -1971,7 +1971,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
       </p>
       <p>
         Verified configurations are now available for the NuttX OS test,
-        for the NuttShell with networking and microSD support(NSH, see the <a href="ttp://nuttx.sourceforge.net/NuttShell.html">NSH User Guide</a>),
+        for the NuttShell with networking and microSD support(NSH, see the <a href="http://www.nuttx.org/Documentation/NuttShell.html">NSH User Guide</a>),
         for the NuttX network test, for the <a href="http://acme.com/software/thttpd">THTTPD</a> webserver,
         for USB serial deive and USB storage devices examples, and for the USB host HID keyboard driver.
         Support for the USB host mass storage device can optionally be configured for the NSH example.
@@ -2054,7 +2054,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
         <b>STATUS:</b>
         As of this writing, the basic port is complete and passes the NuttX OS test.
         An additional, validated configuration exists for the NuttShell (NSH, see the
-        <a href="http://nuttx.sourceforge.net/NuttShell.html">NSH User Guide</a>).
+        <a href="http://www.nuttx.org/Documentation/NuttShell.html">NSH User Guide</a>).
         This basic TWR-K60N512 first appeared in NuttX-6.8.
         Ethernet and SD card (SDHC) drivers also exist:
         The SDHC driver is partially integrated in to the NSH configuration but has some outstanding issues;
@@ -2083,7 +2083,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
         <li><b>NuttX-6.12</b>
           The basic port is complete and first appeared in NuttX-6.12.
           The initial port passes the NuttX OS test and includes a validated configuration for the NuttShell (NSH, see the
-          <a href="http://nuttx.sourceforge.net/NuttShell.html">NSH User Guide</a>) as well as several other configurations.
+          <a href="http://www.nuttx.org/Documentation/NuttShell.html">NSH User Guide</a>) as well as several other configurations.
         </li>
         <li><b>NuttX-6.13-6.16</b>
           Additional drivers and configurations were added in NuttX 6.13-6.16.
@@ -2266,7 +2266,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
          a &quot;Hello, World!!&quot; example that demonstrates initialization of the OS,
          creation of a simple task, and serial console output as well as a somewhat
          simplified NuttShell (NSH) configuration (see the
-         <a href="http://nuttx.sourceforge.net/NuttShell.html">NSH User Guide</a>).
+         <a href="http://www.nuttx.org/Documentation/NuttShell.html">NSH User Guide</a>).
       </p>
       <p>
          An SPI driver and a USB device driver exist for the AT90USB as well
@@ -2349,7 +2349,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
           The port successfully passes the NuttX OS test (apps/examples/ostest).
         </li>
         <li>
-          A NuttShell (NSH) configuration is in place (see the <a href="http://nuttx.sourceforge.net/NuttShell.html">NSH User Guide</a>).
+          A NuttShell (NSH) configuration is in place (see the <a href="http://www.nuttx.org/Documentation/NuttShell.html">NSH User Guide</a>).
           Testing of that configuration has been postponed (because it got bumped by the Olimex LPC1766-STK port).
           Current Status: I think I have a hardware problem with my serial port setup.
           There is a good chance that the NSH port is complete and functional, but I am not yet able to demonstrate that.
@@ -2502,7 +2502,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
         The NSH configuration includes support for a serial console and for the SST25 serial FLASH and the PGA117 amplifier/multiplexer on board the module.
         The NSH configuration is set up to use the NuttX wear-leveling FLASH file system (NXFFS).
         The PGA117, however, is not yet fully integrated to support ADC sampling.
-        See the <a href="http://nuttx.sourceforge.net/NuttShell.html">NSH User Guide</a> for further information about NSH.
+        See the <a href="http://www.nuttx.org/Documentation/NuttShell.html">NSH User Guide</a> for further information about NSH.
         The first verified port to the Mirtoo module was available with the NuttX 6.20 release.
       </p>
     </ul>
@@ -2524,7 +2524,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
     <p>
       <b>STATUS:</b>
       The basic port is code complete and fully verified in NuttX 6.13.
-      Available configurations include the OS test and the NuttShell (NSH - see the <a href="http://nuttx.sourceforge.net/NuttShell.html">NSH User Guide</a>).
+      Available configurations include the OS test and the NuttShell (NSH - see the <a href="http://www.nuttx.org/Documentation/NuttShell.html">NSH User Guide</a>).
     </p>
     <li><b>UBW32 Board from Sparkfun</b>
       This is the port to the Sparkfun UBW32 board.
@@ -2535,7 +2535,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
     <p>
       <b>STATUS:</b>
       The basic port is code complete and fully verified in NuttX 6.18.
-      Available configurations include the OS test and the NuttShell (NSH - see the <a href="http://nuttx.sourceforge.net/NuttShell.html">NSH User Guide</a>).
+      Available configurations include the OS test and the NuttShell (NSH - see the <a href="http://www.nuttx.org/Documentation/NuttShell.html">NSH User Guide</a>).
       USB has not yet been fully tested but on first pass appears to be functional.
     </p>
   </ul>
@@ -2562,7 +2562,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
        This NuttX port is code complete and has considerable test testing.
        The port for this board was completed in NuttX 6.11, but still required a few bug fixes before it will be ready for prime time.
        The fully verified port first appeared in NuttX 6.13.
-       Available configurations include the OS test and the NuttShell (NSH - see the <a href="http://nuttx.sourceforge.net/NuttShell.html">NSH User Guide</a>).
+       Available configurations include the OS test and the NuttShell (NSH - see the <a href="http://www.nuttx.org/Documentation/NuttShell.html">NSH User Guide</a>).
        An untested USB device-side driver is available in the source tree.
        A more complete port would include support of the USB OTG port and of the LCD display on this board.
        Those drivers are not yet available as of this writing.
diff --git a/nuttx/Documentation/NuttXCommercial.html b/nuttx/Documentation/NuttXCommercial.html
index a3d4766f9f..9161df40d2 100644
--- a/nuttx/Documentation/NuttXCommercial.html
+++ b/nuttx/Documentation/NuttXCommercial.html
@@ -50,6 +50,7 @@
     <td>
       <li><a href="http://www.nx-engineering.com" target="main">NX-Engineering</a></li>
       <li><a href="http://www.raztek-inc.com" target="main">Raztek Solutions</a></li>
+      <li><a href="http://nscdg.com/" target="main">North Shore Design Group</a></li>
       <li><a href="http://www.2g-eng.com" target="top">2G Engineering</a></li>
       <li><a href="http://isotel.eu/Home/" target="top">ISOTEL Research</a></li>
       <li><a href="http://www.dspworks.in/" target="top">DSPWorks</a></li>
diff --git a/nuttx/Documentation/NuttXLinks.html b/nuttx/Documentation/NuttXLinks.html
index b69a354fad..647607e11f 100644
--- a/nuttx/Documentation/NuttXLinks.html
+++ b/nuttx/Documentation/NuttXLinks.html
@@ -18,14 +18,14 @@
   <tr>
     <td>&nbsp</td>
     <td>
-      <li><a href="http://nuttx.sourceforge.net/NuttX.html" target="main">Home</a></li>
+      <li><a href="http://www.nuttx.org/Documentation/NuttX.html" target="main">Home</a></li>
       <li><a href="http://sourceforge.net/projects/nuttx/develop" target="_top">SourceForge</a></li>
       <li><a href="http://freshmeat.net/projects/nuttx/" target="_top">FreshMeat</a></li>
       <li><a href="http://tech.groups.yahoo.com/group/nuttx/" target="_top">Forum</a></li>
       <li><a href="https://www.ohloh.net/p/nuttx" target="_top">Ohloh</a></li>
       <li><a href="http://www.oschina.net/p/nuttx" target="_top">OSChina</a></li>
       <li><a href="http://sourceforge.net/projects/nuttx/files/" target="_top">Downloads</a></li>
-      <li><a href="http://www.nx-engineering.com/nuttx-wiki/" target="_top">Wiki</a></li>
+      <li><a href="http://nuttx.org/doku.php?id=wiki" target="_top">Wiki</a></li>
       <li><a href="http://sourceforge.net/projects/nuttx/files/buildroot" target="_top">Toolchains</a></li>
       <li><a href="http://svn.code.sf.net/p/nuttx/code/trunk/" target="_top">Browse SVN</a></li>
       <li><a href="freeports.html" target="header">Free Ports</a></li>
diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html
index 21ae44144d..bf2a0cc4f5 100644
--- a/nuttx/Documentation/NuttxPortingGuide.html
+++ b/nuttx/Documentation/NuttxPortingGuide.html
@@ -4222,7 +4222,7 @@ build
   <li>
     <code>CONFIG_PAGING</code>: If set =y in your configation file, this setting will
           enable the on-demand paging feature as described in
-          <a href="http://nuttx.sourceforge.net/NuttXDemandPaging.html">NuttXDemandPaging.html</a>.
+          <a href="http://www.nuttx.org/Documentation/NuttXDemandPaging.html">NuttXDemandPaging.html</a>.
   </li>
 </ul>
 
diff --git a/nuttx/Documentation/NxWidgets.html b/nuttx/Documentation/NxWidgets.html
index 1678d9ebe7..548ab5e0aa 100644
--- a/nuttx/Documentation/NxWidgets.html
+++ b/nuttx/Documentation/NxWidgets.html
@@ -62,21 +62,27 @@
 <ul>
   <li>
     <b>NxWidgets-1.0</b>:
-    <a href="http://www.nx-engineering.com/nxwidgets_v1_0/">Documentation</a>, and
+    <a href="http://nuttx.org/nxwidgets_v1_0/index.html">Documentation</a>, and
     <a href="http://sourceforge.net/projects/nuttx/files/NxWidgets/NxWidgets-1.0/">Downloads</a>
   </li>
-  <li>
+  <li>http://nuttx.org/nxwidgets_v1_0/
     <b>NxWidgets-1.1</b>:
-    <a href="http://www.nx-engineering.com/nxwidgets_v1_1/">Documentation</a>,
+    <a href="http://nuttx.org/nxwidgets_v1_1/index.html">Documentation</a>,
     <a href="http://sourceforge.net/projects/nuttx/files/NxWidgets/NxWidgets-1.1/">Release notes</a>, and
     <a href="http://sourceforge.net/projects/nuttx/files/NxWidgets/NxWidgets-1.1/">Downloads</a>
   </li>
   <li>
     <b>NxWidgets-1.2</b>:
-    <a href="http://www.nx-engineering.com/nxwidgets_v1_2/">Documentation</a>,
+    <a href="http://nuttx.org/nxwidgets_v1_2/index.html">Documentation</a>,
     <a href="http://sourceforge.net/projects/nuttx/files/NxWidgets/NxWidgets-1.2/">Release notes</a>, and
     <a href="http://sourceforge.net/projects/nuttx/files/NxWidgets/NxWidgets-1.2/">Downloads</a>
   </li>
+  <li>
+    <b>NxWidgets-1.3</b>:
+    <a href="http://nuttx.org/nxwidgets_v1_2/index.html">Documentation</a>,
+    <a href="http://sourceforge.net/projects/nuttx/files/NxWidgets/NxWidgets-1.3/">Release notes</a>, and
+    <a href="http://sourceforge.net/projects/nuttx/files/NxWidgets/NxWidgets-1.3/">Downloads</a>
+  </li>
 </p>
 <p>
   Thanks go to Jose Pablo Carballo for contributing this!
diff --git a/nuttx/Documentation/index.html b/nuttx/Documentation/index.html
index da4c107f09..ea2e3a3271 100644
--- a/nuttx/Documentation/index.html
+++ b/nuttx/Documentation/index.html
@@ -12,7 +12,7 @@
   <body>
     <p>
       This page uses frames, but your browser doesn't support them.
-      Try this <a href="http://nuttx.sourceforge.net/NuttX.html">link</a>.
+      Try this <a href="http://www.nuttx.org/Documentation/NuttX.html">link</a>.
     </p>
   </body>
   </noframes>
diff --git a/nuttx/Documentation/redirect.html b/nuttx/Documentation/redirect.html
new file mode 100644
index 0000000000..13e75cd05e
--- /dev/null
+++ b/nuttx/Documentation/redirect.html
@@ -0,0 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<title>The NuttX RTOS</title>
+<meta http-equiv="REFRESH" content="5;url=http://nuttx.org"></HEAD>
+<body background="backgd.gif">
+<table width ="100%">
+  <tr align="center" bgcolor="#e4e4e4">
+    <td>
+      <h1><big><font color="#3c34ec"><i>The NuttX RTOS</i></font></big></h1>
+    </td>
+  </tr>
+</table>
+<hr><hr>
+<big><center>
+  The NuttX RTOS web site has moved to <a href="http://nuttx.org">nuttx.org</a>.
+  Please update your bookmarks and wait while you are redirected there.
+</center></big>
+</body>
+</html>

From 3d754095f92510813006fe42564e5eb473604e1f Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Wed, 10 Oct 2012 12:56:02 +0000
Subject: [PATCH 25/43] Change the default path to the buildroot bin/ directory
 in all setenv.sh files

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5222 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/configs/c5471evm/httpd/setenv.sh                | 2 +-
 nuttx/configs/c5471evm/nettest/setenv.sh              | 2 +-
 nuttx/configs/c5471evm/nsh/setenv.sh                  | 2 +-
 nuttx/configs/c5471evm/ostest/setenv.sh               | 2 +-
 nuttx/configs/compal_e88/nsh_highram/setenv.sh        | 2 +-
 nuttx/configs/compal_e99/nsh_compalram/setenv.sh      | 2 +-
 nuttx/configs/compal_e99/nsh_highram/setenv.sh        | 2 +-
 nuttx/configs/demo9s12ne64/ostest/setenv.sh           | 2 +-
 nuttx/configs/eagle100/httpd/setenv.sh                | 2 +-
 nuttx/configs/eagle100/nettest/setenv.sh              | 2 +-
 nuttx/configs/eagle100/nsh/setenv.sh                  | 2 +-
 nuttx/configs/eagle100/nxflat/setenv.sh               | 2 +-
 nuttx/configs/eagle100/ostest/setenv.sh               | 2 +-
 nuttx/configs/eagle100/thttpd/setenv.sh               | 2 +-
 nuttx/configs/ekk-lm3s9b96/nsh/setenv.sh              | 2 +-
 nuttx/configs/ekk-lm3s9b96/ostest/setenv.sh           | 2 +-
 nuttx/configs/hymini-stm32v/buttons/setenv.sh         | 2 +-
 nuttx/configs/hymini-stm32v/nsh/setenv.sh             | 2 +-
 nuttx/configs/hymini-stm32v/nxlines/setenv.sh         | 2 +-
 nuttx/configs/hymini-stm32v/usbserial/setenv.sh       | 2 +-
 nuttx/configs/hymini-stm32v/usbstorage/setenv.sh      | 2 +-
 nuttx/configs/lincoln60/nsh/setenv.sh                 | 2 +-
 nuttx/configs/lincoln60/ostest/setenv.sh              | 2 +-
 nuttx/configs/lm3s6432-s2e/nsh/setenv.sh              | 2 +-
 nuttx/configs/lm3s6432-s2e/ostest/setenv.sh           | 2 +-
 nuttx/configs/lm3s6965-ek/nsh/setenv.sh               | 2 +-
 nuttx/configs/lm3s6965-ek/nx/setenv.sh                | 2 +-
 nuttx/configs/lm3s6965-ek/ostest/setenv.sh            | 2 +-
 nuttx/configs/lm3s8962-ek/nsh/setenv.sh               | 2 +-
 nuttx/configs/lm3s8962-ek/nx/setenv.sh                | 2 +-
 nuttx/configs/lm3s8962-ek/ostest/setenv.sh            | 2 +-
 nuttx/configs/lpcxpresso-lpc1768/dhcpd/setenv.sh      | 2 +-
 nuttx/configs/lpcxpresso-lpc1768/nsh/setenv.sh        | 2 +-
 nuttx/configs/lpcxpresso-lpc1768/nx/setenv.sh         | 2 +-
 nuttx/configs/lpcxpresso-lpc1768/ostest/setenv.sh     | 2 +-
 nuttx/configs/lpcxpresso-lpc1768/thttpd/setenv.sh     | 2 +-
 nuttx/configs/lpcxpresso-lpc1768/usbstorage/setenv.sh | 2 +-
 nuttx/configs/m68332evb/setenv.sh                     | 2 +-
 nuttx/configs/mbed/hidkbd/setenv.sh                   | 2 +-
 nuttx/configs/mbed/nsh/setenv.sh                      | 2 +-
 nuttx/configs/mcu123-lpc214x/nsh/setenv.sh            | 2 +-
 nuttx/configs/mcu123-lpc214x/ostest/setenv.sh         | 2 +-
 nuttx/configs/mcu123-lpc214x/usbserial/setenv.sh      | 2 +-
 nuttx/configs/mcu123-lpc214x/usbstorage/setenv.sh     | 2 +-
 nuttx/configs/mx1ads/ostest/setenv.sh                 | 2 +-
 nuttx/configs/ne64badge/ostest/setenv.sh              | 2 +-
 nuttx/configs/ntosd-dm320/nettest/setenv.sh           | 2 +-
 nuttx/configs/ntosd-dm320/nsh/setenv.sh               | 2 +-
 nuttx/configs/ntosd-dm320/ostest/setenv.sh            | 2 +-
 nuttx/configs/ntosd-dm320/poll/setenv.sh              | 2 +-
 nuttx/configs/ntosd-dm320/thttpd/setenv.sh            | 2 +-
 nuttx/configs/ntosd-dm320/udp/setenv.sh               | 2 +-
 nuttx/configs/ntosd-dm320/uip/setenv.sh               | 2 +-
 nuttx/configs/nucleus2g/nsh/setenv.sh                 | 2 +-
 nuttx/configs/nucleus2g/ostest/setenv.sh              | 2 +-
 nuttx/configs/nucleus2g/usbserial/setenv.sh           | 2 +-
 nuttx/configs/nucleus2g/usbstorage/setenv.sh          | 2 +-
 nuttx/configs/olimex-lpc1766stk/ftpc/setenv.sh        | 2 +-
 nuttx/configs/olimex-lpc1766stk/hidkbd/setenv.sh      | 2 +-
 nuttx/configs/olimex-lpc1766stk/nettest/setenv.sh     | 2 +-
 nuttx/configs/olimex-lpc1766stk/nsh/setenv.sh         | 2 +-
 nuttx/configs/olimex-lpc1766stk/nx/setenv.sh          | 2 +-
 nuttx/configs/olimex-lpc1766stk/ostest/setenv.sh      | 2 +-
 nuttx/configs/olimex-lpc1766stk/slip-httpd/setenv.sh  | 2 +-
 nuttx/configs/olimex-lpc1766stk/thttpd/setenv.sh      | 2 +-
 nuttx/configs/olimex-lpc1766stk/usbserial/setenv.sh   | 2 +-
 nuttx/configs/olimex-lpc1766stk/usbstorage/setenv.sh  | 2 +-
 nuttx/configs/olimex-lpc1766stk/wlan/setenv.sh        | 2 +-
 nuttx/configs/olimex-lpc2378/nsh/setenv.sh            | 2 +-
 nuttx/configs/olimex-lpc2378/ostest/setenv.sh         | 2 +-
 nuttx/configs/olimex-strp711/nettest/setenv.sh        | 2 +-
 nuttx/configs/olimex-strp711/nsh/setenv.sh            | 2 +-
 nuttx/configs/olimex-strp711/ostest/setenv.sh         | 2 +-
 nuttx/configs/qemu-i486/nsh/setenv.sh                 | 2 +-
 nuttx/configs/qemu-i486/ostest/setenv.sh              | 2 +-
 nuttx/configs/sam3u-ek/knsh/setenv.sh                 | 2 +-
 nuttx/configs/sam3u-ek/nsh/setenv.sh                  | 2 +-
 nuttx/configs/sam3u-ek/nx/setenv.sh                   | 2 +-
 nuttx/configs/sam3u-ek/ostest/setenv.sh               | 2 +-
 nuttx/configs/sam3u-ek/touchscreen/setenv.sh          | 2 +-
 nuttx/configs/skp16c26/ostest/setenv.sh               | 2 +-
 nuttx/configs/stm3210e-eval/RIDE/setenv.sh            | 2 +-
 nuttx/configs/stm3210e-eval/buttons/setenv.sh         | 2 +-
 nuttx/configs/stm3210e-eval/nsh/setenv.sh             | 2 +-
 nuttx/configs/stm3210e-eval/nxlines/setenv.sh         | 2 +-
 nuttx/configs/stm3210e-eval/ostest/setenv.sh          | 2 +-
 nuttx/configs/stm3210e-eval/usbserial/setenv.sh       | 2 +-
 nuttx/configs/stm3210e-eval/usbstorage/setenv.sh      | 2 +-
 nuttx/configs/stm3220g-eval/nsh/setenv.sh             | 2 +-
 nuttx/configs/stm3220g-eval/nsh2/setenv.sh            | 2 +-
 nuttx/configs/stm3220g-eval/nxwm/setenv.sh            | 2 +-
 nuttx/configs/us7032evb1/nsh/setenv.sh                | 2 +-
 nuttx/configs/us7032evb1/ostest/setenv.sh             | 2 +-
 nuttx/configs/vsn/nsh/setenv.sh                       | 2 +-
 94 files changed, 94 insertions(+), 94 deletions(-)

diff --git a/nuttx/configs/c5471evm/httpd/setenv.sh b/nuttx/configs/c5471evm/httpd/setenv.sh
index e9ab8023a6..0266456ffd 100755
--- a/nuttx/configs/c5471evm/httpd/setenv.sh
+++ b/nuttx/configs/c5471evm/httpd/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/c5471evm/nettest/setenv.sh b/nuttx/configs/c5471evm/nettest/setenv.sh
index 67bcbc1f68..403b923332 100755
--- a/nuttx/configs/c5471evm/nettest/setenv.sh
+++ b/nuttx/configs/c5471evm/nettest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/c5471evm/nsh/setenv.sh b/nuttx/configs/c5471evm/nsh/setenv.sh
index 0693ede0ac..d5be870e63 100755
--- a/nuttx/configs/c5471evm/nsh/setenv.sh
+++ b/nuttx/configs/c5471evm/nsh/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/c5471evm/ostest/setenv.sh b/nuttx/configs/c5471evm/ostest/setenv.sh
index e48437a419..bfe9d48c20 100755
--- a/nuttx/configs/c5471evm/ostest/setenv.sh
+++ b/nuttx/configs/c5471evm/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/compal_e88/nsh_highram/setenv.sh b/nuttx/configs/compal_e88/nsh_highram/setenv.sh
index 0693ede0ac..d5be870e63 100644
--- a/nuttx/configs/compal_e88/nsh_highram/setenv.sh
+++ b/nuttx/configs/compal_e88/nsh_highram/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/compal_e99/nsh_compalram/setenv.sh b/nuttx/configs/compal_e99/nsh_compalram/setenv.sh
index 0693ede0ac..d5be870e63 100644
--- a/nuttx/configs/compal_e99/nsh_compalram/setenv.sh
+++ b/nuttx/configs/compal_e99/nsh_compalram/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/compal_e99/nsh_highram/setenv.sh b/nuttx/configs/compal_e99/nsh_highram/setenv.sh
index 0693ede0ac..d5be870e63 100644
--- a/nuttx/configs/compal_e99/nsh_highram/setenv.sh
+++ b/nuttx/configs/compal_e99/nsh_highram/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/demo9s12ne64/ostest/setenv.sh b/nuttx/configs/demo9s12ne64/ostest/setenv.sh
index 8f47650ca5..b78b638a30 100755
--- a/nuttx/configs/demo9s12ne64/ostest/setenv.sh
+++ b/nuttx/configs/demo9s12ne64/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_m9s12x/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_m9s12x/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${RIDE_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/eagle100/httpd/setenv.sh b/nuttx/configs/eagle100/httpd/setenv.sh
index e17655b0a3..9022695a4d 100755
--- a/nuttx/configs/eagle100/httpd/setenv.sh
+++ b/nuttx/configs/eagle100/httpd/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/eagle100/nettest/setenv.sh b/nuttx/configs/eagle100/nettest/setenv.sh
index ce89c68aac..f03beff85a 100755
--- a/nuttx/configs/eagle100/nettest/setenv.sh
+++ b/nuttx/configs/eagle100/nettest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/eagle100/nsh/setenv.sh b/nuttx/configs/eagle100/nsh/setenv.sh
index 93396cb736..c64bfed542 100755
--- a/nuttx/configs/eagle100/nsh/setenv.sh
+++ b/nuttx/configs/eagle100/nsh/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/eagle100/nxflat/setenv.sh b/nuttx/configs/eagle100/nxflat/setenv.sh
index 39afe386f7..2335de1907 100755
--- a/nuttx/configs/eagle100/nxflat/setenv.sh
+++ b/nuttx/configs/eagle100/nxflat/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/eagle100/ostest/setenv.sh b/nuttx/configs/eagle100/ostest/setenv.sh
index c3c1f581db..843f4283a7 100755
--- a/nuttx/configs/eagle100/ostest/setenv.sh
+++ b/nuttx/configs/eagle100/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/eagle100/thttpd/setenv.sh b/nuttx/configs/eagle100/thttpd/setenv.sh
index 4dc148e65a..1217e85fe7 100755
--- a/nuttx/configs/eagle100/thttpd/setenv.sh
+++ b/nuttx/configs/eagle100/thttpd/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/ekk-lm3s9b96/nsh/setenv.sh b/nuttx/configs/ekk-lm3s9b96/nsh/setenv.sh
index 568615fa31..6e591e0dd7 100755
--- a/nuttx/configs/ekk-lm3s9b96/nsh/setenv.sh
+++ b/nuttx/configs/ekk-lm3s9b96/nsh/setenv.sh
@@ -51,7 +51,7 @@ fi
 # TOOLCHAIN_BIN must be defined to the full path to the location where you
 # have installed the toolchain of your choice.  Modify the following:
 
-export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
 # Andd add the toolchain path to the PATH variable
 
diff --git a/nuttx/configs/ekk-lm3s9b96/ostest/setenv.sh b/nuttx/configs/ekk-lm3s9b96/ostest/setenv.sh
index a5e320cf65..d98c6cc40c 100755
--- a/nuttx/configs/ekk-lm3s9b96/ostest/setenv.sh
+++ b/nuttx/configs/ekk-lm3s9b96/ostest/setenv.sh
@@ -51,7 +51,7 @@ fi
 # TOOLCHAIN_BIN must be defined to the full path to the location where you
 # have installed the toolchain of your choice.  Modify the following:
 
-export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
 # Andd add the toolchain path to the PATH variable
 
diff --git a/nuttx/configs/hymini-stm32v/buttons/setenv.sh b/nuttx/configs/hymini-stm32v/buttons/setenv.sh
index df0dba3180..b62f59c96f 100755
--- a/nuttx/configs/hymini-stm32v/buttons/setenv.sh
+++ b/nuttx/configs/hymini-stm32v/buttons/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export RIDE_BIN="/cygdrive/c/Program Files/Raisonance/Ride/arm-gcc/bin"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${RIDE_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/hymini-stm32v/nsh/setenv.sh b/nuttx/configs/hymini-stm32v/nsh/setenv.sh
index a0371cdce4..6298970589 100755
--- a/nuttx/configs/hymini-stm32v/nsh/setenv.sh
+++ b/nuttx/configs/hymini-stm32v/nsh/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export RIDE_BIN="/cygdrive/c/Program Files/Raisonance/Ride/arm-gcc/bin"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${RIDE_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/hymini-stm32v/nxlines/setenv.sh b/nuttx/configs/hymini-stm32v/nxlines/setenv.sh
index 53ccb2d0f2..2027fbac91 100755
--- a/nuttx/configs/hymini-stm32v/nxlines/setenv.sh
+++ b/nuttx/configs/hymini-stm32v/nxlines/setenv.sh
@@ -47,7 +47,7 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/hymini-stm32v/usbserial/setenv.sh b/nuttx/configs/hymini-stm32v/usbserial/setenv.sh
index 6b324148d2..a334f1c3c5 100755
--- a/nuttx/configs/hymini-stm32v/usbserial/setenv.sh
+++ b/nuttx/configs/hymini-stm32v/usbserial/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export RIDE_BIN="/cygdrive/c/Program Files/Raisonance/Ride/arm-gcc/bin"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${RIDE_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/hymini-stm32v/usbstorage/setenv.sh b/nuttx/configs/hymini-stm32v/usbstorage/setenv.sh
index a0371cdce4..6298970589 100755
--- a/nuttx/configs/hymini-stm32v/usbstorage/setenv.sh
+++ b/nuttx/configs/hymini-stm32v/usbstorage/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export RIDE_BIN="/cygdrive/c/Program Files/Raisonance/Ride/arm-gcc/bin"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${RIDE_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/lincoln60/nsh/setenv.sh b/nuttx/configs/lincoln60/nsh/setenv.sh
index ef3ca7f676..ffa6420b92 100755
--- a/nuttx/configs/lincoln60/nsh/setenv.sh
+++ b/nuttx/configs/lincoln60/nsh/setenv.sh
@@ -50,7 +50,7 @@ fi
 # TOOLCHAIN_BIN must be defined to the full path to the location where you
 # have installed the toolchain of your choice.  Modify the following:
 
-export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
 # Andd add the toolchain path to the PATH variable
 
diff --git a/nuttx/configs/lincoln60/ostest/setenv.sh b/nuttx/configs/lincoln60/ostest/setenv.sh
index 19c43760fc..c0bf7c7053 100755
--- a/nuttx/configs/lincoln60/ostest/setenv.sh
+++ b/nuttx/configs/lincoln60/ostest/setenv.sh
@@ -50,7 +50,7 @@ fi
 # TOOLCHAIN_BIN must be defined to the full path to the location where you
 # have installed the toolchain of your choice.  Modify the following:
 
-export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
 # Andd add the toolchain path to the PATH variable
 
diff --git a/nuttx/configs/lm3s6432-s2e/nsh/setenv.sh b/nuttx/configs/lm3s6432-s2e/nsh/setenv.sh
index 3cd011f121..5abb6085a2 100644
--- a/nuttx/configs/lm3s6432-s2e/nsh/setenv.sh
+++ b/nuttx/configs/lm3s6432-s2e/nsh/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/lm3s6432-s2e/ostest/setenv.sh b/nuttx/configs/lm3s6432-s2e/ostest/setenv.sh
index 2cccdc70e6..d680306a23 100644
--- a/nuttx/configs/lm3s6432-s2e/ostest/setenv.sh
+++ b/nuttx/configs/lm3s6432-s2e/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/lm3s6965-ek/nsh/setenv.sh b/nuttx/configs/lm3s6965-ek/nsh/setenv.sh
index 0b9389f49e..0636f2fed3 100755
--- a/nuttx/configs/lm3s6965-ek/nsh/setenv.sh
+++ b/nuttx/configs/lm3s6965-ek/nsh/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/lm3s6965-ek/nx/setenv.sh b/nuttx/configs/lm3s6965-ek/nx/setenv.sh
index a364c20172..3edb2710ef 100755
--- a/nuttx/configs/lm3s6965-ek/nx/setenv.sh
+++ b/nuttx/configs/lm3s6965-ek/nx/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/lm3s6965-ek/ostest/setenv.sh b/nuttx/configs/lm3s6965-ek/ostest/setenv.sh
index 6e907ae7a6..686a617016 100755
--- a/nuttx/configs/lm3s6965-ek/ostest/setenv.sh
+++ b/nuttx/configs/lm3s6965-ek/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/lm3s8962-ek/nsh/setenv.sh b/nuttx/configs/lm3s8962-ek/nsh/setenv.sh
index 4ed5385b63..511552d94b 100755
--- a/nuttx/configs/lm3s8962-ek/nsh/setenv.sh
+++ b/nuttx/configs/lm3s8962-ek/nsh/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/lm3s8962-ek/nx/setenv.sh b/nuttx/configs/lm3s8962-ek/nx/setenv.sh
index 4c76fd7369..a367250836 100755
--- a/nuttx/configs/lm3s8962-ek/nx/setenv.sh
+++ b/nuttx/configs/lm3s8962-ek/nx/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/lm3s8962-ek/ostest/setenv.sh b/nuttx/configs/lm3s8962-ek/ostest/setenv.sh
index b5ee8be314..6bd49b6fa0 100755
--- a/nuttx/configs/lm3s8962-ek/ostest/setenv.sh
+++ b/nuttx/configs/lm3s8962-ek/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/setenv.sh b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/setenv.sh
index 03641fd612..8fd20167a6 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/setenv.sh
+++ b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/setenv.sh
@@ -42,7 +42,7 @@ 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}/../buildroot/build_arm_nofpu/staging_dir/bin"
+# 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"
diff --git a/nuttx/configs/lpcxpresso-lpc1768/nsh/setenv.sh b/nuttx/configs/lpcxpresso-lpc1768/nsh/setenv.sh
index 46d5b3261f..8ef0628058 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/nsh/setenv.sh
+++ b/nuttx/configs/lpcxpresso-lpc1768/nsh/setenv.sh
@@ -42,7 +42,7 @@ 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}/../buildroot/build_arm_nofpu/staging_dir/bin"
+# 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"
diff --git a/nuttx/configs/lpcxpresso-lpc1768/nx/setenv.sh b/nuttx/configs/lpcxpresso-lpc1768/nx/setenv.sh
index 2f04a8ac6d..565c16b98f 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/nx/setenv.sh
+++ b/nuttx/configs/lpcxpresso-lpc1768/nx/setenv.sh
@@ -42,7 +42,7 @@ 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}/../buildroot/build_arm_nofpu/staging_dir/bin"
+# 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"
diff --git a/nuttx/configs/lpcxpresso-lpc1768/ostest/setenv.sh b/nuttx/configs/lpcxpresso-lpc1768/ostest/setenv.sh
index 724d1420d6..47e7468c3b 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/ostest/setenv.sh
+++ b/nuttx/configs/lpcxpresso-lpc1768/ostest/setenv.sh
@@ -42,7 +42,7 @@ 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}/../buildroot/build_arm_nofpu/staging_dir/bin"
+# 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"
diff --git a/nuttx/configs/lpcxpresso-lpc1768/thttpd/setenv.sh b/nuttx/configs/lpcxpresso-lpc1768/thttpd/setenv.sh
index 7156a371dd..e6aded0f4b 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/thttpd/setenv.sh
+++ b/nuttx/configs/lpcxpresso-lpc1768/thttpd/setenv.sh
@@ -44,7 +44,7 @@ WD=`pwd`
 # This is where the buildroot might reside on a Linux or Cygwin system
 # A minimal buildroot version with the NXFLAT tools is always required
 # for this configuration in order to buildthe THTTPD CGI programs
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_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"
diff --git a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/setenv.sh b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/setenv.sh
index 8c4039ddd3..7318183acd 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/setenv.sh
+++ b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/setenv.sh
@@ -42,7 +42,7 @@ 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}/../buildroot/build_arm_nofpu/staging_dir/bin"
+# 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"
diff --git a/nuttx/configs/m68332evb/setenv.sh b/nuttx/configs/m68332evb/setenv.sh
index 2882011fdb..4b52986d31 100755
--- a/nuttx/configs/m68332evb/setenv.sh
+++ b/nuttx/configs/m68332evb/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_m68k/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_m68k/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/mbed/hidkbd/setenv.sh b/nuttx/configs/mbed/hidkbd/setenv.sh
index c3ca070e33..8c14957c89 100644
--- a/nuttx/configs/mbed/hidkbd/setenv.sh
+++ b/nuttx/configs/mbed/hidkbd/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/mbed/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/mbed/nsh/setenv.sh b/nuttx/configs/mbed/nsh/setenv.sh
index f29d975892..f591fafb19 100755
--- a/nuttx/configs/mbed/nsh/setenv.sh
+++ b/nuttx/configs/mbed/nsh/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/mbed/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/mcu123-lpc214x/nsh/setenv.sh b/nuttx/configs/mcu123-lpc214x/nsh/setenv.sh
index 97295dbd7c..aeb2998883 100755
--- a/nuttx/configs/mcu123-lpc214x/nsh/setenv.sh
+++ b/nuttx/configs/mcu123-lpc214x/nsh/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export LPC214XSCRIPTS="$WD/configs/mcu123-lpc214x/scripts"
 export PATH="${BUILDROOT_BIN}:${LPC214XSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}"
 
diff --git a/nuttx/configs/mcu123-lpc214x/ostest/setenv.sh b/nuttx/configs/mcu123-lpc214x/ostest/setenv.sh
index 67d8b5d65a..e71f10f888 100755
--- a/nuttx/configs/mcu123-lpc214x/ostest/setenv.sh
+++ b/nuttx/configs/mcu123-lpc214x/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export LPC214XSCRIPTS="$WD/configs/mcu123-lpc214x/scripts"
 export PATH="${BUILDROOT_BIN}:${LPC214XSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}"
 
diff --git a/nuttx/configs/mcu123-lpc214x/usbserial/setenv.sh b/nuttx/configs/mcu123-lpc214x/usbserial/setenv.sh
index 8661ee0cb7..59d61b8b83 100755
--- a/nuttx/configs/mcu123-lpc214x/usbserial/setenv.sh
+++ b/nuttx/configs/mcu123-lpc214x/usbserial/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export LPC214XSCRIPTS="$WD/configs/mcu123-lpc214x/scripts"
 export PATH="${BUILDROOT_BIN}:${LPC214XSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}"
 
diff --git a/nuttx/configs/mcu123-lpc214x/usbstorage/setenv.sh b/nuttx/configs/mcu123-lpc214x/usbstorage/setenv.sh
index f27530656f..7ea83ccb64 100755
--- a/nuttx/configs/mcu123-lpc214x/usbstorage/setenv.sh
+++ b/nuttx/configs/mcu123-lpc214x/usbstorage/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export LPC214XSCRIPTS="$WD/configs/mcu123-lpc214x/scripts"
 export PATH="${BUILDROOT_BIN}:${LPC214XSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}"
 
diff --git a/nuttx/configs/mx1ads/ostest/setenv.sh b/nuttx/configs/mx1ads/ostest/setenv.sh
index e73858fc76..a6fb5b02ac 100755
--- a/nuttx/configs/mx1ads/ostest/setenv.sh
+++ b/nuttx/configs/mx1ads/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/ne64badge/ostest/setenv.sh b/nuttx/configs/ne64badge/ostest/setenv.sh
index c5aa591b49..c4d6800ed5 100755
--- a/nuttx/configs/ne64badge/ostest/setenv.sh
+++ b/nuttx/configs/ne64badge/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_m9s12x/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_m9s12x/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${RIDE_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/ntosd-dm320/nettest/setenv.sh b/nuttx/configs/ntosd-dm320/nettest/setenv.sh
index 8a7788cfd9..6090d4cea3 100755
--- a/nuttx/configs/ntosd-dm320/nettest/setenv.sh
+++ b/nuttx/configs/ntosd-dm320/nettest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/ntosd-dm320/nsh/setenv.sh b/nuttx/configs/ntosd-dm320/nsh/setenv.sh
index bf3f497adb..a84e68884b 100755
--- a/nuttx/configs/ntosd-dm320/nsh/setenv.sh
+++ b/nuttx/configs/ntosd-dm320/nsh/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/ntosd-dm320/ostest/setenv.sh b/nuttx/configs/ntosd-dm320/ostest/setenv.sh
index 6ce1e04a85..a65be2677d 100755
--- a/nuttx/configs/ntosd-dm320/ostest/setenv.sh
+++ b/nuttx/configs/ntosd-dm320/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/ntosd-dm320/poll/setenv.sh b/nuttx/configs/ntosd-dm320/poll/setenv.sh
index a3479fb180..de3b64ea90 100755
--- a/nuttx/configs/ntosd-dm320/poll/setenv.sh
+++ b/nuttx/configs/ntosd-dm320/poll/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/ntosd-dm320/thttpd/setenv.sh b/nuttx/configs/ntosd-dm320/thttpd/setenv.sh
index 54700fb6b3..92ff91700e 100755
--- a/nuttx/configs/ntosd-dm320/thttpd/setenv.sh
+++ b/nuttx/configs/ntosd-dm320/thttpd/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/ntosd-dm320/udp/setenv.sh b/nuttx/configs/ntosd-dm320/udp/setenv.sh
index a2e1ffec73..052413b089 100755
--- a/nuttx/configs/ntosd-dm320/udp/setenv.sh
+++ b/nuttx/configs/ntosd-dm320/udp/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/ntosd-dm320/uip/setenv.sh b/nuttx/configs/ntosd-dm320/uip/setenv.sh
index ccc74829d8..988e0a1269 100755
--- a/nuttx/configs/ntosd-dm320/uip/setenv.sh
+++ b/nuttx/configs/ntosd-dm320/uip/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/nucleus2g/nsh/setenv.sh b/nuttx/configs/nucleus2g/nsh/setenv.sh
index ffdc74e9b9..977e0d474c 100755
--- a/nuttx/configs/nucleus2g/nsh/setenv.sh
+++ b/nuttx/configs/nucleus2g/nsh/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/nucleus2g/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/nucleus2g/ostest/setenv.sh b/nuttx/configs/nucleus2g/ostest/setenv.sh
index 6a78a5c239..d52412b4b0 100755
--- a/nuttx/configs/nucleus2g/ostest/setenv.sh
+++ b/nuttx/configs/nucleus2g/ostest/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/nucleus2g/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/nucleus2g/usbserial/setenv.sh b/nuttx/configs/nucleus2g/usbserial/setenv.sh
index 9333b3a2f5..cbd2e8d81c 100755
--- a/nuttx/configs/nucleus2g/usbserial/setenv.sh
+++ b/nuttx/configs/nucleus2g/usbserial/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/nucleus2g/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/nucleus2g/usbstorage/setenv.sh b/nuttx/configs/nucleus2g/usbstorage/setenv.sh
index e6f7197fd7..2443be4e13 100755
--- a/nuttx/configs/nucleus2g/usbstorage/setenv.sh
+++ b/nuttx/configs/nucleus2g/usbstorage/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/nucleus2g/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/olimex-lpc1766stk/ftpc/setenv.sh b/nuttx/configs/olimex-lpc1766stk/ftpc/setenv.sh
index 85d20db324..df10916900 100755
--- a/nuttx/configs/olimex-lpc1766stk/ftpc/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/ftpc/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/olimex-lpc1766stk/hidkbd/setenv.sh b/nuttx/configs/olimex-lpc1766stk/hidkbd/setenv.sh
index 7bdba25d76..e4e130c24a 100755
--- a/nuttx/configs/olimex-lpc1766stk/hidkbd/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/hidkbd/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/olimex-lpc1766stk/nettest/setenv.sh b/nuttx/configs/olimex-lpc1766stk/nettest/setenv.sh
index 58951dc840..92c6bdf5ec 100755
--- a/nuttx/configs/olimex-lpc1766stk/nettest/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/nettest/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/olimex-lpc1766stk/nsh/setenv.sh b/nuttx/configs/olimex-lpc1766stk/nsh/setenv.sh
index 4b9bec6d04..089165f694 100755
--- a/nuttx/configs/olimex-lpc1766stk/nsh/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/nsh/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/olimex-lpc1766stk/nx/setenv.sh b/nuttx/configs/olimex-lpc1766stk/nx/setenv.sh
index a2027d727c..69cee3997c 100755
--- a/nuttx/configs/olimex-lpc1766stk/nx/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/nx/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/olimex-lpc1766stk/ostest/setenv.sh b/nuttx/configs/olimex-lpc1766stk/ostest/setenv.sh
index 996cefc4e8..b61805da06 100755
--- a/nuttx/configs/olimex-lpc1766stk/ostest/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/ostest/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/olimex-lpc1766stk/slip-httpd/setenv.sh b/nuttx/configs/olimex-lpc1766stk/slip-httpd/setenv.sh
index 546ca1e3a4..50364e4a1c 100755
--- a/nuttx/configs/olimex-lpc1766stk/slip-httpd/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/slip-httpd/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/olimex-lpc1766stk/thttpd/setenv.sh b/nuttx/configs/olimex-lpc1766stk/thttpd/setenv.sh
index 09288f04c0..2a9ddae159 100755
--- a/nuttx/configs/olimex-lpc1766stk/thttpd/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/thttpd/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/olimex-lpc1766stk/usbserial/setenv.sh b/nuttx/configs/olimex-lpc1766stk/usbserial/setenv.sh
index f755b6afe9..b12d65852e 100755
--- a/nuttx/configs/olimex-lpc1766stk/usbserial/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/usbserial/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/olimex-lpc1766stk/usbstorage/setenv.sh b/nuttx/configs/olimex-lpc1766stk/usbstorage/setenv.sh
index e41283c438..58fd5d04d5 100755
--- a/nuttx/configs/olimex-lpc1766stk/usbstorage/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/usbstorage/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/olimex-lpc1766stk/wlan/setenv.sh b/nuttx/configs/olimex-lpc1766stk/wlan/setenv.sh
index 1b87dab69c..6e6c79ab2e 100755
--- a/nuttx/configs/olimex-lpc1766stk/wlan/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/wlan/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/olimex-lpc2378/nsh/setenv.sh b/nuttx/configs/olimex-lpc2378/nsh/setenv.sh
index 9a2e92e432..15808d32b7 100755
--- a/nuttx/configs/olimex-lpc2378/nsh/setenv.sh
+++ b/nuttx/configs/olimex-lpc2378/nsh/setenv.sh
@@ -45,7 +45,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export LPC23XXSCRIPTS="$WD/configs/olimex-lpc2378/scripts"
 export PATH="${BUILDROOT_BIN}:${LPC23XXSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}"
 
diff --git a/nuttx/configs/olimex-lpc2378/ostest/setenv.sh b/nuttx/configs/olimex-lpc2378/ostest/setenv.sh
index 73bf3d2239..9e7ff11fc8 100755
--- a/nuttx/configs/olimex-lpc2378/ostest/setenv.sh
+++ b/nuttx/configs/olimex-lpc2378/ostest/setenv.sh
@@ -45,7 +45,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export LPC23XXSCRIPTS="$WD/configs/olimex-lpc2378/scripts"
 export PATH="${BUILDROOT_BIN}:${LPC23XXSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}"
 
diff --git a/nuttx/configs/olimex-strp711/nettest/setenv.sh b/nuttx/configs/olimex-strp711/nettest/setenv.sh
index bc47c3ed8a..74003581bd 100755
--- a/nuttx/configs/olimex-strp711/nettest/setenv.sh
+++ b/nuttx/configs/olimex-strp711/nettest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export STR41XSCRIPTS="$WD/configs/olimex-strp711/scripts"
 export PATH="${BUILDROOT_BIN}:${STR41XSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}"
 
diff --git a/nuttx/configs/olimex-strp711/nsh/setenv.sh b/nuttx/configs/olimex-strp711/nsh/setenv.sh
index 6724741f69..f6d22c1ec0 100755
--- a/nuttx/configs/olimex-strp711/nsh/setenv.sh
+++ b/nuttx/configs/olimex-strp711/nsh/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export STR41XSCRIPTS="$WD/configs/olimex-strp711/scripts"
 export PATH="${BUILDROOT_BIN}:${STR41XSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}"
 
diff --git a/nuttx/configs/olimex-strp711/ostest/setenv.sh b/nuttx/configs/olimex-strp711/ostest/setenv.sh
index c9454d26f6..f20997352a 100755
--- a/nuttx/configs/olimex-strp711/ostest/setenv.sh
+++ b/nuttx/configs/olimex-strp711/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export STR41XSCRIPTS="$WD/configs/olimex-strp711/scripts"
 export PATH="${BUILDROOT_BIN}:${STR41XSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}"
 
diff --git a/nuttx/configs/qemu-i486/nsh/setenv.sh b/nuttx/configs/qemu-i486/nsh/setenv.sh
index 25ae59d71b..5542bc4e21 100755
--- a/nuttx/configs/qemu-i486/nsh/setenv.sh
+++ b/nuttx/configs/qemu-i486/nsh/setenv.sh
@@ -42,7 +42,7 @@ if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 # Uncomment and modify the following if you are using anything other
 # than the system GCC
 # WD=`pwd`
-# export BUILDROOT_BIN="${WD}/../../../buildroot/build_i486/staging_dir/bin"
+# export BUILDROOT_BIN="${WD}/../../../misc/buildroot/build_i486/staging_dir/bin"
 # export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/qemu-i486/ostest/setenv.sh b/nuttx/configs/qemu-i486/ostest/setenv.sh
index f9c3bdec8d..a3c68d7974 100755
--- a/nuttx/configs/qemu-i486/ostest/setenv.sh
+++ b/nuttx/configs/qemu-i486/ostest/setenv.sh
@@ -42,7 +42,7 @@ if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 # Uncomment and modify the following if you are using anything other
 # than the system GCC
 # WD=`pwd`
-# export BUILDROOT_BIN="${WD}/../../../buildroot/build_i486/staging_dir/bin"
+# export BUILDROOT_BIN="${WD}/../../../misc/buildroot/build_i486/staging_dir/bin"
 # export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/sam3u-ek/knsh/setenv.sh b/nuttx/configs/sam3u-ek/knsh/setenv.sh
index 3b27c3d9f9..1b8842e821 100755
--- a/nuttx/configs/sam3u-ek/knsh/setenv.sh
+++ b/nuttx/configs/sam3u-ek/knsh/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/sam3u-ek/nsh/setenv.sh b/nuttx/configs/sam3u-ek/nsh/setenv.sh
index 3f4e60221c..ae56ecc43b 100755
--- a/nuttx/configs/sam3u-ek/nsh/setenv.sh
+++ b/nuttx/configs/sam3u-ek/nsh/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/sam3u-ek/nx/setenv.sh b/nuttx/configs/sam3u-ek/nx/setenv.sh
index a7e9efc843..2730db642a 100755
--- a/nuttx/configs/sam3u-ek/nx/setenv.sh
+++ b/nuttx/configs/sam3u-ek/nx/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/sam3u-ek/ostest/setenv.sh b/nuttx/configs/sam3u-ek/ostest/setenv.sh
index 06d5eb5473..ab0f8bd969 100755
--- a/nuttx/configs/sam3u-ek/ostest/setenv.sh
+++ b/nuttx/configs/sam3u-ek/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/sam3u-ek/touchscreen/setenv.sh b/nuttx/configs/sam3u-ek/touchscreen/setenv.sh
index d5af12280f..868c4de389 100755
--- a/nuttx/configs/sam3u-ek/touchscreen/setenv.sh
+++ b/nuttx/configs/sam3u-ek/touchscreen/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/skp16c26/ostest/setenv.sh b/nuttx/configs/skp16c26/ostest/setenv.sh
index a74258fb84..72c16064b9 100755
--- a/nuttx/configs/skp16c26/ostest/setenv.sh
+++ b/nuttx/configs/skp16c26/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_m32c/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_m32c/staging_dir/bin
 export PATH=${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/stm3210e-eval/RIDE/setenv.sh b/nuttx/configs/stm3210e-eval/RIDE/setenv.sh
index b734111363..40872c164b 100755
--- a/nuttx/configs/stm3210e-eval/RIDE/setenv.sh
+++ b/nuttx/configs/stm3210e-eval/RIDE/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export RIDE_BIN="/cygdrive/c/Program Files/Raisonance/Ride/arm-gcc/bin"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${RIDE_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/stm3210e-eval/buttons/setenv.sh b/nuttx/configs/stm3210e-eval/buttons/setenv.sh
index 2bdf536742..0afc622fba 100755
--- a/nuttx/configs/stm3210e-eval/buttons/setenv.sh
+++ b/nuttx/configs/stm3210e-eval/buttons/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export RIDE_BIN="/cygdrive/c/Program Files/Raisonance/Ride/arm-gcc/bin"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${RIDE_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/stm3210e-eval/nsh/setenv.sh b/nuttx/configs/stm3210e-eval/nsh/setenv.sh
index ee33a8d21d..ff9a4bf8ae 100755
--- a/nuttx/configs/stm3210e-eval/nsh/setenv.sh
+++ b/nuttx/configs/stm3210e-eval/nsh/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export RIDE_BIN="/cygdrive/c/Program Files/Raisonance/Ride/arm-gcc/bin"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${RIDE_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/stm3210e-eval/nxlines/setenv.sh b/nuttx/configs/stm3210e-eval/nxlines/setenv.sh
index a9dc78c74d..90e6fa05ce 100755
--- a/nuttx/configs/stm3210e-eval/nxlines/setenv.sh
+++ b/nuttx/configs/stm3210e-eval/nxlines/setenv.sh
@@ -47,7 +47,7 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/stm3210e-eval/ostest/setenv.sh b/nuttx/configs/stm3210e-eval/ostest/setenv.sh
index 046a7f5acf..43495b5142 100755
--- a/nuttx/configs/stm3210e-eval/ostest/setenv.sh
+++ b/nuttx/configs/stm3210e-eval/ostest/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export RIDE_BIN="/cygdrive/c/Program Files/Raisonance/Ride/arm-gcc/bin"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${RIDE_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/stm3210e-eval/usbserial/setenv.sh b/nuttx/configs/stm3210e-eval/usbserial/setenv.sh
index 046a7f5acf..43495b5142 100755
--- a/nuttx/configs/stm3210e-eval/usbserial/setenv.sh
+++ b/nuttx/configs/stm3210e-eval/usbserial/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export RIDE_BIN="/cygdrive/c/Program Files/Raisonance/Ride/arm-gcc/bin"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${RIDE_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/stm3210e-eval/usbstorage/setenv.sh b/nuttx/configs/stm3210e-eval/usbstorage/setenv.sh
index ee33a8d21d..ff9a4bf8ae 100755
--- a/nuttx/configs/stm3210e-eval/usbstorage/setenv.sh
+++ b/nuttx/configs/stm3210e-eval/usbstorage/setenv.sh
@@ -41,7 +41,7 @@ if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
 export RIDE_BIN="/cygdrive/c/Program Files/Raisonance/Ride/arm-gcc/bin"
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:${RIDE_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/stm3220g-eval/nsh/setenv.sh b/nuttx/configs/stm3220g-eval/nsh/setenv.sh
index 489322177a..fcec398eb3 100755
--- a/nuttx/configs/stm3220g-eval/nsh/setenv.sh
+++ b/nuttx/configs/stm3220g-eval/nsh/setenv.sh
@@ -67,7 +67,7 @@ fi
 
 # This is the Cygwin path to the location where I build the buildroot
 # toolchain.
-export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
 # Add the path to the toolchain to the PATH variable
 export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
diff --git a/nuttx/configs/stm3220g-eval/nsh2/setenv.sh b/nuttx/configs/stm3220g-eval/nsh2/setenv.sh
index 1e2f87b403..af7403656f 100755
--- a/nuttx/configs/stm3220g-eval/nsh2/setenv.sh
+++ b/nuttx/configs/stm3220g-eval/nsh2/setenv.sh
@@ -66,7 +66,7 @@ fi
 
 # This is the Cygwin path to the location where I build the buildroot
 # toolchain.
-export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
 # Add the path to the toolchain to the PATH variable
 export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
diff --git a/nuttx/configs/stm3220g-eval/nxwm/setenv.sh b/nuttx/configs/stm3220g-eval/nxwm/setenv.sh
index ff642018e4..8585313914 100755
--- a/nuttx/configs/stm3220g-eval/nxwm/setenv.sh
+++ b/nuttx/configs/stm3220g-eval/nxwm/setenv.sh
@@ -67,7 +67,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 
 # This is the Cygwin path to the location where I build the buildroot
 # toolchain.
-export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
 # Add the path to the toolchain to the PATH variable
 export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
diff --git a/nuttx/configs/us7032evb1/nsh/setenv.sh b/nuttx/configs/us7032evb1/nsh/setenv.sh
index d231336128..fabcfb1de9 100755
--- a/nuttx/configs/us7032evb1/nsh/setenv.sh
+++ b/nuttx/configs/us7032evb1/nsh/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_sh/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_sh/staging_dir/bin
 export SH1BINARIES=$WD/configs/us7032evb1/bin
 export PATH=${BUILDROOT_BIN}:${SH1BINARIES}:/sbin:/usr/sbin:${PATH_ORIG}
 
diff --git a/nuttx/configs/us7032evb1/ostest/setenv.sh b/nuttx/configs/us7032evb1/ostest/setenv.sh
index ac37e9150f..6a923c9592 100755
--- a/nuttx/configs/us7032evb1/ostest/setenv.sh
+++ b/nuttx/configs/us7032evb1/ostest/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi
 
 WD=`pwd`
-export BUILDROOT_BIN=${WD}/../buildroot/build_sh/staging_dir/bin
+export BUILDROOT_BIN=${WD}/../misc/buildroot/build_sh/staging_dir/bin
 export SH1BINARIES=$WD/configs/us7032evb1/bin
 export PATH=${BUILDROOT_BIN}:${SH1BINARIES}:/sbin:/usr/sbin:${PATH_ORIG}
 
diff --git a/nuttx/configs/vsn/nsh/setenv.sh b/nuttx/configs/vsn/nsh/setenv.sh
index 3b9f7f8967..a01a604c0c 100755
--- a/nuttx/configs/vsn/nsh/setenv.sh
+++ b/nuttx/configs/vsn/nsh/setenv.sh
@@ -40,7 +40,7 @@ fi
 if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
 
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"

From aae19db5c32644f35ed4a9505541b894ef041f3d Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Wed, 10 Oct 2012 13:50:31 +0000
Subject: [PATCH 26/43] Add support for the R_ARM_REL32 relocation

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5223 42af7a65-404d-4744-a932-0658087f49c3
---
 misc/buildroot/ChangeLog                   |   2 +
 misc/buildroot/toolchain/nxflat/ldnxflat.c | 237 +++++++++++++--------
 2 files changed, 147 insertions(+), 92 deletions(-)

diff --git a/misc/buildroot/ChangeLog b/misc/buildroot/ChangeLog
index 0d896872f0..72c6ac29bf 100644
--- a/misc/buildroot/ChangeLog
+++ b/misc/buildroot/ChangeLog
@@ -119,4 +119,6 @@ buildroot-1.11 2011-xx-xx <gnutt@nuttx.org>
 	* Add support for binutils 2.22 and GCC 4.6.3.
 	* Change name of all tools from xxx-elf to xxx-nuttx-elf
 	* Added an ARM EABI GCC 4.6.3 configuration (tool name is arm-nuttx-eabi-).
+	* ldnxflat: Add support for the R_ARM_REL32 relocation.  This relocation
+	  type was not generated by GCC/LD prior to gcc-4.6.3
 
diff --git a/misc/buildroot/toolchain/nxflat/ldnxflat.c b/misc/buildroot/toolchain/nxflat/ldnxflat.c
index 69cb195290..5bcdc5da0e 100644
--- a/misc/buildroot/toolchain/nxflat/ldnxflat.c
+++ b/misc/buildroot/toolchain/nxflat/ldnxflat.c
@@ -799,6 +799,134 @@ static void alloc_got_entry(asymbol *sym)
     }
 }
 
+/***********************************************************************
+ * relocate_arm32
+ ***********************************************************************/
+
+static void
+relocate_arm32(arelent *relp, int32_t *target, symvalue sym_value)
+{
+  reloc_howto_type      *how_to      = relp->howto;
+  asymbol               *rel_sym     = *relp->sym_ptr_ptr;
+  asection              *rel_section = rel_sym->section;
+  struct nxflat_reloc_s *relocs;
+  int32_t                temp;
+  int32_t                saved;
+  int                    reloc_type;
+
+  /* ABS32 links from .text are easy - since the fetches will
+   * always be base relative. the ABS32 refs from data will be
+   * handled the same
+   */
+
+  if (verbose > 1)
+    {
+      vdbg("  Original location %p is %08lx ",
+#ifdef ARCH_BIG_ENDIAN
+           target, (long)nxflat_swap32(*target));
+#else
+          target, (long)*target);
+#endif
+      if (verbose > 2)
+        {
+          printf("rsh %d ", how_to->rightshift);
+          printf(" sz %d ", how_to->size);
+          printf("bit %d ", how_to->bitsize);
+          printf("rel %d ", how_to->pc_relative);
+          printf("smask %08lx ", (long)how_to->src_mask);
+          printf("dmask %08lx ", (long)how_to->dst_mask);
+          printf("off %d ", how_to->pcrel_offset);
+        }
+
+      printf("\n");
+    }
+
+#ifdef ARCH_BIG_ENDIAN
+  saved = temp = (int32_t) nxflat_swap32(*target);
+#else
+  saved = temp = *target;
+#endif
+  /* Mask  and sign extend */
+
+  temp &= how_to->src_mask;
+  temp <<= (32 - how_to->bitsize);
+  temp >>= (32 - how_to->bitsize);
+
+  /* Offset */
+
+  temp += (sym_value + rel_section->vma) >> how_to->rightshift;
+
+  /* Mask upper bits from rollover */
+
+  temp &= how_to->dst_mask;
+
+  /* Replace data that was masked */
+
+  temp |= saved & (~how_to->dst_mask);
+
+  vdbg("  Modified location: %08lx\n", (long)temp);
+#ifdef ARCH_BIG_ENDIAN
+  *target = (long)nxflat_swap32(temp);
+#else
+  *target = (long)temp;
+#endif
+  /* Determine where the symbol lies */
+
+  switch (get_reloc_type(rel_section, NULL))
+    {
+      case NXFLAT_RELOC_TARGET_UNKNOWN:
+      default:
+        {
+          err("Symbol relocation section type is unknown\n");
+          nerrors++;
+        }
+        /* Fall through and do something wrong */
+
+      case NXFLAT_RELOC_TARGET_BSS:
+      case NXFLAT_RELOC_TARGET_DATA:
+        {
+          vdbg("Symbol '%s' lies in D-Space\n", rel_sym->name);
+          reloc_type = NXFLAT_RELOC_TYPE_REL32D;
+        }
+        break;
+
+      case NXFLAT_RELOC_TARGET_TEXT:
+        {
+          vdbg("Symbol '%s' lies in I-Space\n", rel_sym->name);
+          reloc_type = NXFLAT_RELOC_TYPE_REL32I;
+        }
+        break;
+    }
+
+  /* Re-allocate memory to include this relocation */
+
+  relocs = (struct nxflat_reloc_s*)
+  realloc(nxflat_relocs, sizeof(struct nxflat_reloc_s) * nxflat_nrelocs + 1);
+  if (!relocs)
+    {
+      err("Failed to re-allocate memory ABS32 relocations (%d relocations)\n",
+          nxflat_nrelocs);
+      nerrors++;
+    }
+  else
+    {
+      /* Reallocation was successful.  Update globals */
+               
+      nxflat_nrelocs++;
+      nxflat_relocs = relocs;
+
+      /* Then add the relocation at the end of the table */
+
+      nxflat_relocs[nxflat_nrelocs-1].r_info =
+      NXFLAT_RELOC(reloc_type, relp->address + got_size);
+ 
+      vdbg("relocs[%d]: type: %d offset: %08x\n",
+      nxflat_nrelocs-1,
+      NXFLAT_RELOC_TYPE(nxflat_relocs[nxflat_nrelocs-1].r_info),
+      NXFLAT_RELOC_OFFSET(nxflat_relocs[nxflat_nrelocs-1].r_info));
+    }
+ }
+
 /***********************************************************************
  * resolve_segment_relocs
  ***********************************************************************/
@@ -806,10 +934,8 @@ static void alloc_got_entry(asymbol *sym)
 static void
 resolve_segment_relocs(bfd *input_bfd, segment_info *inf, asymbol **syms)
 {
-  struct nxflat_reloc_s *relocs;
   arelent **relpp;
   int relsize;
-  int reloc_type;
   int relcount;
   int i;
   int j;
@@ -976,69 +1102,23 @@ resolve_segment_relocs(bfd *input_bfd, segment_info *inf, asymbol **syms)
 
             case R_ARM_ABS32:
               {
-                int32_t temp;
-                int32_t saved;
-
                 dbg("Performing ABS32 link at addr %08lx [%08lx] to sym '%s' [%08lx]\n",
                      (long)relpp[j]->address, (long)*target, rel_sym->name, (long)sym_value);
 
-                /* ABS32 links from .text are easy - since the fetches will
-                 * always be base relative. the ABS32 refs from data will be
-                 * handled the same
+                relocate_arm32(relpp[j], target, sym_value);
+              }
+              break;
+
+            case R_ARM_REL32:
+              {
+                dbg("Performing REL32 link at addr %08lx [%08lx] to sym '%s' [%08lx]\n",
+                     (long)relpp[j]->address, (long)*target, rel_sym->name, (long)sym_value);
+
+                /* The REL32 relocation is just like the ABS32 relocation except that (1)
+                 * the symbol value is relative to the PC, and (2) we cannot permit
+                 * REL32 relocations to data in I-Space.  That just would not make sense.
                  */
 
-                if (verbose > 1)
-                  {
-                    vdbg("  Original location %p is %08lx ",
-#ifdef ARCH_BIG_ENDIAN
-                         target, (long)nxflat_swap32(*target));
-#else
-                         target, (long)*target);
-#endif
-                    if (verbose > 2)
-                      {
-                        printf("rsh %d ", how_to->rightshift);
-                        printf(" sz %d ", how_to->size);
-                        printf("bit %d ", how_to->bitsize);
-                        printf("rel %d ", how_to->pc_relative);
-                        printf("smask %08lx ", (long)how_to->src_mask);
-                        printf("dmask %08lx ", (long)how_to->dst_mask);
-                        printf("off %d ", how_to->pcrel_offset);
-                      }
-                    printf("\n");
-                  }
-
-#ifdef ARCH_BIG_ENDIAN
-                saved = temp = (int32_t) nxflat_swap32(*target);
-#else
-                saved = temp = *target;
-#endif
-                /* Mask  and sign extend */
-
-                temp &= how_to->src_mask;
-                temp <<= (32 - how_to->bitsize);
-                temp >>= (32 - how_to->bitsize);
-
-                /* Offset */
-
-                temp += (sym_value + rel_section->vma) >> how_to->rightshift;
-
-                /* Mask upper bits from rollover */
-
-                temp &= how_to->dst_mask;
-
-                /* Replace data that was masked */
-
-                temp |= saved & (~how_to->dst_mask);
-
-                vdbg("  Modified location: %08lx\n", (long)temp);
-#ifdef ARCH_BIG_ENDIAN
-                *target = (long)nxflat_swap32(temp);
-#else
-                *target = (long)temp;
-#endif
-                /* Determine where the symbol lies */
-
                 switch (get_reloc_type(rel_section, NULL))
                   {
                     case NXFLAT_RELOC_TARGET_UNKNOWN:
@@ -1047,51 +1127,24 @@ resolve_segment_relocs(bfd *input_bfd, segment_info *inf, asymbol **syms)
                         err("Symbol relocation section type is unknown\n");
                         nerrors++;
                       }
-                      /* Fall through and do something wrong */
+                      break;
 
                     case NXFLAT_RELOC_TARGET_BSS:
                     case NXFLAT_RELOC_TARGET_DATA:
                       {
-                        vdbg("Symbol '%s' lies in D-Space\n", rel_sym->name);
-                        reloc_type = NXFLAT_RELOC_TYPE_REL32D;
+                        err("Cannot perform REL32 relocation: Symbol '%s' lies in D-Space\n",
+                            rel_sym->name);
+                        nerrors++;
                       }
                       break;
 
                     case NXFLAT_RELOC_TARGET_TEXT:
                       {
                         vdbg("Symbol '%s' lies in I-Space\n", rel_sym->name);
-                        reloc_type = NXFLAT_RELOC_TYPE_REL32I;
+                        relocate_arm32(relpp[j], target, sym_value - relpp[j]->address);
                       }
                       break;
                   }
-
-                /* Re-allocate memory to include this relocation */
-
-                relocs = (struct nxflat_reloc_s*)
-                  realloc(nxflat_relocs, sizeof(struct nxflat_reloc_s) * nxflat_nrelocs + 1);
-                if (!relocs)
-                  {
-                    err("Failed to re-allocate memory ABS32 relocations (%d relocations)\n",
-                        nxflat_nrelocs);
-                    nerrors++;
-                  }
-                else
-                  {
-                    /* Reallocation was successful.  Update globlas */
-               
-                    nxflat_nrelocs++;
-                    nxflat_relocs = relocs;
-
-                    /* Then add the relocation at the end of the table */
-
-                    nxflat_relocs[nxflat_nrelocs-1].r_info =
-                         NXFLAT_RELOC(reloc_type, relpp[j]->address + got_size);
- 
-                    vdbg("relocs[%d]: type: %d offset: %08x\n",
-                         nxflat_nrelocs-1,
-                         NXFLAT_RELOC_TYPE(nxflat_relocs[nxflat_nrelocs-1].r_info),
-                         NXFLAT_RELOC_OFFSET(nxflat_relocs[nxflat_nrelocs-1].r_info));
-                  }
               }
               break;
 

From 47787872f2adff7de0ad08c68c69d562bd5af4fd Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Wed, 10 Oct 2012 14:54:11 +0000
Subject: [PATCH 27/43] Disable R_ARM_REL32 logic

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5224 42af7a65-404d-4744-a932-0658087f49c3
---
 misc/buildroot/ChangeLog                   | 2 ++
 misc/buildroot/toolchain/nxflat/ldnxflat.c | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/misc/buildroot/ChangeLog b/misc/buildroot/ChangeLog
index 72c6ac29bf..3cfd60bf2e 100644
--- a/misc/buildroot/ChangeLog
+++ b/misc/buildroot/ChangeLog
@@ -121,4 +121,6 @@ buildroot-1.11 2011-xx-xx <gnutt@nuttx.org>
 	* Added an ARM EABI GCC 4.6.3 configuration (tool name is arm-nuttx-eabi-).
 	* ldnxflat: Add support for the R_ARM_REL32 relocation.  This relocation
 	  type was not generated by GCC/LD prior to gcc-4.6.3
+	* R_ARM_REL32 logic is conditionally disabled because it has not been
+	  tested.
 
diff --git a/misc/buildroot/toolchain/nxflat/ldnxflat.c b/misc/buildroot/toolchain/nxflat/ldnxflat.c
index 5bcdc5da0e..5343e6b438 100644
--- a/misc/buildroot/toolchain/nxflat/ldnxflat.c
+++ b/misc/buildroot/toolchain/nxflat/ldnxflat.c
@@ -1118,7 +1118,14 @@ resolve_segment_relocs(bfd *input_bfd, segment_info *inf, asymbol **syms)
                  * the symbol value is relative to the PC, and (2) we cannot permit
                  * REL32 relocations to data in I-Space.  That just would not make sense.
                  */
+#if 1
+                /* The logic below may or may not be correct.  It has not been verified
+                 * so, for now, it is disabled.
+                 */
 
+                err("REL32 relocation not yet supported\n");
+                nerrors++;
+#else
                 switch (get_reloc_type(rel_section, NULL))
                   {
                     case NXFLAT_RELOC_TARGET_UNKNOWN:
@@ -1145,6 +1152,7 @@ resolve_segment_relocs(bfd *input_bfd, segment_info *inf, asymbol **syms)
                       }
                       break;
                   }
+#endif
               }
               break;
 

From ed4550ff485a872b343c8e51697c9810f37e2a9a Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Wed, 10 Oct 2012 17:01:23 +0000
Subject: [PATCH 28/43] Rename gnu-nxflat.ld to gnu-nxflat-gotoff.ld; Add
 gnu-nxflat-pcrel.ld

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5225 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/Documentation/NuttXNxFlat.html          |  25 ++-
 nuttx/TODO                                    |   6 +-
 .../{gnu-nxflat.ld => gnu-nxflat-gotoff.ld}   |  16 +-
 nuttx/binfmt/libnxflat/gnu-nxflat-pcrel.ld    | 182 ++++++++++++++++++
 nuttx/configs/amber/hello/Make.defs           |   2 +-
 nuttx/configs/c5471evm/httpd/Make.defs        |   2 +-
 nuttx/configs/c5471evm/nettest/Make.defs      |   2 +-
 nuttx/configs/c5471evm/nsh/Make.defs          |   2 +-
 nuttx/configs/c5471evm/ostest/Make.defs       |   2 +-
 .../configs/compal_e88/nsh_highram/Make.defs  |   2 +-
 .../compal_e99/nsh_compalram/Make.defs        |   2 +-
 .../configs/compal_e99/nsh_highram/Make.defs  |   2 +-
 nuttx/configs/demo9s12ne64/ostest/Make.defs   |   2 +-
 nuttx/configs/ea3131/nsh/Make.defs            |   2 +-
 nuttx/configs/ea3131/ostest/Make.defs         |   2 +-
 nuttx/configs/ea3131/pgnsh/Make.defs          |   2 +-
 nuttx/configs/ea3131/usbserial/Make.defs      |   2 +-
 nuttx/configs/ea3131/usbstorage/Make.defs     |   2 +-
 nuttx/configs/ea3152/ostest/Make.defs         |   2 +-
 nuttx/configs/eagle100/README.txt             |   4 +-
 nuttx/configs/eagle100/httpd/Make.defs        |   2 +-
 nuttx/configs/eagle100/nettest/Make.defs      |   2 +-
 nuttx/configs/eagle100/nsh/Make.defs          |   2 +-
 nuttx/configs/eagle100/nxflat/Make.defs       |   2 +-
 nuttx/configs/eagle100/ostest/Make.defs       |   2 +-
 nuttx/configs/eagle100/thttpd/Make.defs       |   2 +-
 nuttx/configs/ekk-lm3s9b96/README.txt         |   4 +-
 nuttx/configs/ekk-lm3s9b96/nsh/Make.defs      |   2 +-
 nuttx/configs/ekk-lm3s9b96/ostest/Make.defs   |   2 +-
 nuttx/configs/fire-stm32v2/README.txt         |   4 +-
 nuttx/configs/fire-stm32v2/nsh/Make.defs      |   2 +-
 nuttx/configs/hymini-stm32v/README.txt        |   4 +-
 nuttx/configs/hymini-stm32v/buttons/Make.defs |   2 +-
 nuttx/configs/hymini-stm32v/nsh/Make.defs     |   2 +-
 nuttx/configs/hymini-stm32v/nsh2/Make.defs    |   2 +-
 nuttx/configs/hymini-stm32v/nx/Make.defs      |   2 +-
 nuttx/configs/hymini-stm32v/nxlines/Make.defs |   2 +-
 .../configs/hymini-stm32v/usbserial/Make.defs |   2 +-
 .../hymini-stm32v/usbstorage/Make.defs        |   2 +-
 nuttx/configs/kwikstik-k40/README.txt         |   4 +-
 nuttx/configs/kwikstik-k40/ostest/Make.defs   |   2 +-
 nuttx/configs/lincoln60/README.txt            |   4 +-
 nuttx/configs/lincoln60/nsh/Make.defs         |   2 +-
 nuttx/configs/lincoln60/ostest/Make.defs      |   2 +-
 nuttx/configs/lm3s6432-s2e/README.txt         |   4 +-
 nuttx/configs/lm3s6432-s2e/nsh/Make.defs      |   2 +-
 nuttx/configs/lm3s6432-s2e/ostest/Make.defs   |   2 +-
 nuttx/configs/lm3s6965-ek/README.txt          |   4 +-
 nuttx/configs/lm3s6965-ek/nsh/Make.defs       |   2 +-
 nuttx/configs/lm3s6965-ek/nx/Make.defs        |   2 +-
 nuttx/configs/lm3s6965-ek/ostest/Make.defs    |   2 +-
 nuttx/configs/lm3s8962-ek/README.txt          |   4 +-
 nuttx/configs/lm3s8962-ek/nsh/Make.defs       |   2 +-
 nuttx/configs/lm3s8962-ek/nx/Make.defs        |   2 +-
 nuttx/configs/lm3s8962-ek/ostest/Make.defs    |   2 +-
 nuttx/configs/lpc4330-xplorer/README.txt      |   4 +-
 nuttx/configs/lpc4330-xplorer/nsh/Make.defs   |   2 +-
 .../configs/lpc4330-xplorer/ostest/Make.defs  |   2 +-
 nuttx/configs/lpcxpresso-lpc1768/README.txt   |   4 +-
 .../lpcxpresso-lpc1768/dhcpd/Make.defs        |   2 +-
 .../configs/lpcxpresso-lpc1768/nsh/Make.defs  |   2 +-
 nuttx/configs/lpcxpresso-lpc1768/nx/Make.defs |   2 +-
 .../lpcxpresso-lpc1768/ostest/Make.defs       |   2 +-
 .../lpcxpresso-lpc1768/thttpd/Make.defs       |   4 +-
 .../lpcxpresso-lpc1768/usbstorage/Make.defs   |   2 +-
 nuttx/configs/mbed/README.txt                 |   4 +-
 nuttx/configs/mbed/hidkbd/Make.defs           |   2 +-
 nuttx/configs/mbed/nsh/Make.defs              |   2 +-
 .../mcu123-lpc214x/composite/Make.defs        |   2 +-
 nuttx/configs/mcu123-lpc214x/nsh/Make.defs    |   2 +-
 nuttx/configs/mcu123-lpc214x/ostest/Make.defs |   2 +-
 .../mcu123-lpc214x/usbserial/Make.defs        |   2 +-
 .../mcu123-lpc214x/usbstorage/Make.defs       |   2 +-
 nuttx/configs/micropendous3/hello/Make.defs   |   2 +-
 nuttx/configs/mirtoo/nsh/Make.defs            |   2 +-
 nuttx/configs/mirtoo/nxffs/Make.defs          |   2 +-
 nuttx/configs/mirtoo/ostest/Make.defs         |   2 +-
 nuttx/configs/mx1ads/ostest/Make.defs         |   2 +-
 nuttx/configs/ne64badge/ostest/Make.defs      |   2 +-
 nuttx/configs/ntosd-dm320/nettest/Make.defs   |   2 +-
 nuttx/configs/ntosd-dm320/nsh/Make.defs       |   2 +-
 nuttx/configs/ntosd-dm320/ostest/Make.defs    |   2 +-
 nuttx/configs/ntosd-dm320/poll/Make.defs      |   2 +-
 nuttx/configs/ntosd-dm320/thttpd/Make.defs    |   2 +-
 nuttx/configs/ntosd-dm320/udp/Make.defs       |   2 +-
 nuttx/configs/ntosd-dm320/uip/Make.defs       |   2 +-
 nuttx/configs/nucleus2g/README.txt            |   4 +-
 nuttx/configs/nucleus2g/nsh/Make.defs         |   2 +-
 nuttx/configs/nucleus2g/ostest/Make.defs      |   2 +-
 nuttx/configs/nucleus2g/usbserial/Make.defs   |   2 +-
 nuttx/configs/nucleus2g/usbstorage/Make.defs  |   2 +-
 nuttx/configs/olimex-lpc1766stk/README.txt    |   4 +-
 .../configs/olimex-lpc1766stk/ftpc/Make.defs  |   2 +-
 .../olimex-lpc1766stk/hidkbd/Make.defs        |   2 +-
 .../olimex-lpc1766stk/nettest/Make.defs       |   2 +-
 nuttx/configs/olimex-lpc1766stk/nsh/Make.defs |   2 +-
 nuttx/configs/olimex-lpc1766stk/nx/Make.defs  |   2 +-
 .../olimex-lpc1766stk/ostest/Make.defs        |   2 +-
 .../olimex-lpc1766stk/slip-httpd/Make.defs    |   2 +-
 .../olimex-lpc1766stk/thttpd/Make.defs        |   2 +-
 .../olimex-lpc1766stk/usbserial/Make.defs     |   2 +-
 .../olimex-lpc1766stk/usbstorage/Make.defs    |   2 +-
 .../configs/olimex-lpc1766stk/wlan/Make.defs  |   2 +-
 nuttx/configs/olimex-lpc2378/nsh/Make.defs    |   2 +-
 nuttx/configs/olimex-lpc2378/ostest/Make.defs |   2 +-
 nuttx/configs/olimex-stm32-p107/nsh/Make.defs |   2 +-
 .../olimex-stm32-p107/ostest/Make.defs        |   2 +-
 .../configs/olimex-strp711/nettest/Make.defs  |   2 +-
 nuttx/configs/olimex-strp711/nsh/Make.defs    |   2 +-
 nuttx/configs/olimex-strp711/ostest/Make.defs |   2 +-
 nuttx/configs/pcblogic-pic32mx/nsh/Make.defs  |   2 +-
 .../configs/pcblogic-pic32mx/ostest/Make.defs |   2 +-
 nuttx/configs/pic32-starterkit/nsh/Make.defs  |   2 +-
 nuttx/configs/pic32-starterkit/nsh2/Make.defs |   2 +-
 .../configs/pic32-starterkit/ostest/Make.defs |   2 +-
 nuttx/configs/pic32mx7mmb/nsh/Make.defs       |   2 +-
 nuttx/configs/pic32mx7mmb/ostest/Make.defs    |   2 +-
 nuttx/configs/sam3u-ek/README.txt             |   4 +-
 nuttx/configs/sam3u-ek/knsh/Make.defs         |   2 +-
 nuttx/configs/sam3u-ek/nsh/Make.defs          |   2 +-
 nuttx/configs/sam3u-ek/nx/Make.defs           |   2 +-
 nuttx/configs/sam3u-ek/ostest/Make.defs       |   2 +-
 nuttx/configs/sam3u-ek/touchscreen/Make.defs  |   2 +-
 nuttx/configs/shenzhou/README.txt             |  60 +++++-
 nuttx/configs/shenzhou/nsh/Make.defs          |   2 +-
 nuttx/configs/shenzhou/nxwm/Make.defs         |   2 +-
 nuttx/configs/stm3210e-eval/README.txt        |   4 +-
 nuttx/configs/stm3210e-eval/RIDE/Make.defs    |   2 +-
 nuttx/configs/stm3210e-eval/buttons/Make.defs |   2 +-
 .../configs/stm3210e-eval/composite/Make.defs |   2 +-
 nuttx/configs/stm3210e-eval/nsh/Make.defs     |   2 +-
 nuttx/configs/stm3210e-eval/nsh2/Make.defs    |   2 +-
 nuttx/configs/stm3210e-eval/nx/Make.defs      |   2 +-
 .../configs/stm3210e-eval/nxconsole/Make.defs |   2 +-
 nuttx/configs/stm3210e-eval/nxlines/Make.defs |   2 +-
 nuttx/configs/stm3210e-eval/nxtext/Make.defs  |   2 +-
 nuttx/configs/stm3210e-eval/ostest/Make.defs  |   2 +-
 nuttx/configs/stm3210e-eval/pm/Make.defs      |   2 +-
 .../configs/stm3210e-eval/usbserial/Make.defs |   2 +-
 .../stm3210e-eval/usbstorage/Make.defs        |   2 +-
 nuttx/configs/stm3220g-eval/README.txt        |   4 +-
 nuttx/configs/stm3220g-eval/dhcpd/Make.defs   |   2 +-
 nuttx/configs/stm3220g-eval/nettest/Make.defs |   2 +-
 nuttx/configs/stm3220g-eval/nsh/Make.defs     |   2 +-
 nuttx/configs/stm3220g-eval/nsh2/Make.defs    |   2 +-
 nuttx/configs/stm3220g-eval/nxwm/Make.defs    |   2 +-
 nuttx/configs/stm3220g-eval/ostest/Make.defs  |   2 +-
 nuttx/configs/stm3220g-eval/telnetd/Make.defs |   2 +-
 nuttx/configs/stm3240g-eval/README.txt        |   4 +-
 nuttx/configs/stm3240g-eval/dhcpd/Make.defs   |   2 +-
 .../configs/stm3240g-eval/discover/Make.defs  |   2 +-
 nuttx/configs/stm3240g-eval/nettest/Make.defs |   2 +-
 nuttx/configs/stm3240g-eval/nsh/Make.defs     |   2 +-
 nuttx/configs/stm3240g-eval/nsh2/Make.defs    |   2 +-
 .../configs/stm3240g-eval/nxconsole/Make.defs |   2 +-
 nuttx/configs/stm3240g-eval/nxwm/Make.defs    |   2 +-
 nuttx/configs/stm3240g-eval/ostest/Make.defs  |   2 +-
 nuttx/configs/stm3240g-eval/telnetd/Make.defs |   2 +-
 .../configs/stm3240g-eval/webserver/Make.defs |   2 +-
 nuttx/configs/stm3240g-eval/xmlrpc/Make.defs  |   2 +-
 nuttx/configs/stm32f4discovery/README.txt     |   4 +-
 nuttx/configs/stm32f4discovery/nsh/Make.defs  |   2 +-
 .../stm32f4discovery/nxlines/Make.defs        |   2 +-
 .../configs/stm32f4discovery/ostest/Make.defs |   2 +-
 nuttx/configs/stm32f4discovery/pm/Make.defs   |   2 +-
 nuttx/configs/sure-pic32mx/nsh/Make.defs      |   2 +-
 nuttx/configs/sure-pic32mx/ostest/Make.defs   |   2 +-
 nuttx/configs/sure-pic32mx/usbnsh/Make.defs   |   2 +-
 nuttx/configs/teensy/hello/Make.defs          |   2 +-
 nuttx/configs/teensy/nsh/Make.defs            |   2 +-
 nuttx/configs/teensy/usbstorage/Make.defs     |   2 +-
 nuttx/configs/twr-k60n512/README.txt          |   4 +-
 nuttx/configs/twr-k60n512/nsh/Make.defs       |   2 +-
 nuttx/configs/twr-k60n512/ostest/Make.defs    |   2 +-
 nuttx/configs/ubw32/nsh/Make.defs             |   2 +-
 nuttx/configs/ubw32/ostest/Make.defs          |   2 +-
 nuttx/configs/vsn/README.txt                  |   4 +-
 nuttx/configs/vsn/nsh/Make.defs               |   2 +-
 178 files changed, 493 insertions(+), 186 deletions(-)
 rename nuttx/binfmt/libnxflat/{gnu-nxflat.ld => gnu-nxflat-gotoff.ld} (89%)
 create mode 100644 nuttx/binfmt/libnxflat/gnu-nxflat-pcrel.ld

diff --git a/nuttx/Documentation/NuttXNxFlat.html b/nuttx/Documentation/NuttXNxFlat.html
index 73be5d7b34..4d70ed9c37 100644
--- a/nuttx/Documentation/NuttXNxFlat.html
+++ b/nuttx/Documentation/NuttXNxFlat.html
@@ -229,13 +229,16 @@
   <li><b>Read-Only Data in RAM</b>
     <ul>
       <p>
-        Read-only data must reside in RAM.  
+        With older GCC compilers (at least up to 4.3.3), read-only data must reside in RAM.  
         In code generated by GCC, all data references are indexed by the PIC<sup>2</sup> base register (that is usually R10 or <i>sl</i> for the ARM processors).
         The includes read-only data (<code>.rodata</code>).
         Embedded firmware developers normally like to keep <code>.rodata</code> in FLASH with the code sections.
         But because all data is referenced with the PIC base register, all of that data must lie in RAM.
         A NXFLAT change to work around this is under investigation<sup>3</sup>.
       </p>
+      <p>
+        Newer GCC compilers (at least from 4.6.3), read-only data is no long GOT-relative, but is now accessed PC-relative.  With PC relative addressing, read-only data <i>must</i> reside in the I-Space.
+      </p>
     </ul>
   </li>
   <li><b>Globally Scoped Function Function Pointers</b>
@@ -464,7 +467,7 @@ cat ../syscall/syscall.csv ../lib/lib.csv | sort >tmp.csv
     <td><br></td>
     <td><br></td>
     <td>
-      <code>abc-nuttx-elf-ld -r -d -warn-common -T binfmt/libnxflat/gnu-nxflat.ld -no-check-sections -o $@ hello.o hello-thunk.o</code>
+      <code>abc-nuttx-elf-ld -r -d -warn-common -T binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections -o $@ hello.o hello-thunk.o</code>
     </td>
   </tr>
   <tr>
@@ -507,7 +510,7 @@ cat ../syscall/syscall.csv ../lib/lib.csv | sort >tmp.csv
   In this case, it will link together the module's object files (only <code>hello.o</code> here)
   along with the assembled <i>thunk</i> file, <code>hello-thunk.o</code> to create the second relocatable object,
   <code>hello.r2</code>.
-  The linker script, <code>gnu-nxflat.ld</code> is required at this point to correctly position the sections.
+  The linker script, <code>gnu-nxflat-gotoff.ld</code> is required at this point to correctly position the sections.
   This linker script produces two segments:
   An <i>I-Space</i> (Instruction Space) segment containing mostly <code>.text</code> and a <i>D-Space</i> (Data Space) segment
   containing <code>.got</code>, <code>.data</code>, and <code>.bss</code> sections.
@@ -518,6 +521,22 @@ cat ../syscall/syscall.csv ../lib/lib.csv | sort >tmp.csv
   The option <code>-no-check-sections</code> is required to prevent the linker from failing because these segments overlap.
 </p>
 
+<p><b>NOTE:</b>
+  There are two linker scripts located at <code>binfmt/libnxflat/gnu-nxflat-gotoff.ld</code>.
+</p>
+<ol>
+  <li>
+    <b><code>binfmt/libnxflat/gnu-nxflat-gotoff.ld</code></b>.
+    Older versions of GCC (at least up to GCC 4.3.3), use GOT-relative addressing to access RO data.
+    In that case, read-only data (.rodata) must reside in D-Space and this linker script should be used.
+  </li>
+  <li>
+    <b><code>binfmt/libnxflat/gnu-nxflat-pcrel.ld</code></b>.
+    Newer versions of GCC (at least as of GCC 4.6.3), use PC-relative addressing to access RO data.
+    In that case, read-only data (.rodata) must reside in I-Space and this linker script should be used.
+  </li>
+</ol>
+
 <p><b>Target 4</b>.
   Finally, this target will use the <code>hello.r2</code> relocatable object to create the final, NXFLAT module
   <code>hello</code> by executing <a href="#ldnxflat"><code>ldnxflat</code></a>.
diff --git a/nuttx/TODO b/nuttx/TODO
index 72a94290b9..30015ef50b 100644
--- a/nuttx/TODO
+++ b/nuttx/TODO
@@ -376,15 +376,15 @@ o Binary loaders (binfmt/)
   Description: Windows build issue.  Some of the configurations that use NXFLAT have
                the linker script specified like this:
 
-               NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+               NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 
                That will not work for windows-based tools because they require Windows
                style paths.  The solution is to do something like this:
 
                if ($(WINTOOL)y)
-                 NXFLATLDSCRIPT=${cygpath -w $(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld}
+                 NXFLATLDSCRIPT=${cygpath -w $(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld}
                else
-                 NXFLATLDSCRIPT=$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld
+                 NXFLATLDSCRIPT=$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld
                endif
                
                Then use
diff --git a/nuttx/binfmt/libnxflat/gnu-nxflat.ld b/nuttx/binfmt/libnxflat/gnu-nxflat-gotoff.ld
similarity index 89%
rename from nuttx/binfmt/libnxflat/gnu-nxflat.ld
rename to nuttx/binfmt/libnxflat/gnu-nxflat-gotoff.ld
index e66b1dff52..c0487212aa 100644
--- a/nuttx/binfmt/libnxflat/gnu-nxflat.ld
+++ b/nuttx/binfmt/libnxflat/gnu-nxflat-gotoff.ld
@@ -1,7 +1,7 @@
 /****************************************************************************
- * examples/nxflat/nxflat.ld
+ * examples/nxflat/gnu-nxflat-gotoff.ld
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,17 @@ MEMORY
  * (2) DSpace (Data Space).  This is the segment that contains both
  *     read-write data (.data, .bss) as well as read-only data (.rodata).
  *     Everything in this segment should be access-able with machine
- *     with machine load and store instructions.
+ *     PIC load and store instructions.
+ *
+ * Older versions of GCC (at least up to GCC 4.3.3), use GOT-relative
+ * addressing to access RO data. In that case, read-only data (.rodata) must
+ * reside in D-Space and this linker script should be used.
+ *
+ * Newer versions of GCC (at least as of GCC 4.6.3), use PC-relative
+ * addressing to access RO data. In that case, read-only data (.rodata) must
+ * reside in I-Space and this linker script should NOT be used with those
+ * newer tools.
+ *
  ****************************************************************************/
 
 SECTIONS
diff --git a/nuttx/binfmt/libnxflat/gnu-nxflat-pcrel.ld b/nuttx/binfmt/libnxflat/gnu-nxflat-pcrel.ld
new file mode 100644
index 0000000000..eb79023d01
--- /dev/null
+++ b/nuttx/binfmt/libnxflat/gnu-nxflat-pcrel.ld
@@ -0,0 +1,182 @@
+/****************************************************************************
+ * examples/nxflat/gnu-nxflat-pcrel.ld
+ *
+ *   Copyright (C) 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.
+ *
+ ****************************************************************************/
+
+MEMORY 
+{
+  ISPACE : ORIGIN = 0x0, LENGTH = 2097152
+  DSPACE : ORIGIN = 0x0, LENGTH = 2097152
+}
+
+/****************************************************************************
+ * The XFLAT program image is divided into two segments:
+ *
+ * (1) ISpace (Instruction Space).  This is the segment that contains
+ *     code (.text) as well as read-only data (.rodata).  Everything in the
+ *     segment should be fetch-able  machine PC instructions (jump, branch,
+ *     call, etc.) or PC-relative loads.
+ * (2) DSpace (Data Space).  This is the segment that contains read-write
+ *     data (.data, .bss). Everything in this segment should be access-able
+ *     with machine PIC load and store instructions.
+ *
+ * Older versions of GCC (at least up to GCC 4.3.3), use GOT-relative
+ * addressing to access RO data. In that case, read-only data (.rodata) must
+ * reside in D-Space and this linker script should NOT be used with those
+ * older tools.
+ *
+ * Newer versions of GCC (at least as of GCC 4.6.3), use PC-relative
+ * addressing to access RO data. In that case, read-only data (.rodata) must
+ * reside in I-Space and this linker script should be used.
+ *
+ ****************************************************************************/
+
+SECTIONS
+{
+  .text 0x00000000 :
+    {
+      /* ISpace is located at address 0.  Every (unrelocated) ISpace
+       * address is an offset from the begining of this segment.
+       */
+
+      text_start = . ;
+
+      *(.text)
+      *(.text.*)
+      *(.gnu.warning)
+      *(.stub)
+      *(.glue_7)
+      *(.glue_7t)
+      *(.jcr)
+
+      /* C++ support:  The .init and .fini sections contain XFLAT-
+       * specific logic to manage static constructors and destructors.
+       */
+
+      *(.gnu.linkonce.t.*)
+      *(.init)
+      *(.fini)
+
+      /* This is special code area at the end of the normal
+         text section.  It contains a small lookup table at
+         the start followed by the code pointed to by entries
+         in the lookup table.  */
+
+      . = ALIGN (4) ;
+      PROVIDE(__ctbp = .);
+      *(.call_table_data)
+      *(.call_table_text)
+
+      _etext = . ;
+
+    } > ISPACE
+
+    /* DSpace is also located at address 0.  Every (unrelocated) DSpace
+     * address is an offset from the begining of this segment.
+     */
+
+  .data 0x00000000 :
+    {
+      __data_start = . ;
+      *(.rodata)
+      *(.rodata1)
+      *(.rodata.*)
+      *(.gnu.linkonce.r*)
+      *(.data)
+      *(.data1)
+      *(.data.*)
+      *(.gnu.linkonce.d*)
+      *(.data1)
+      *(.eh_frame)
+      *(.gcc_except_table)
+
+      *(.gnu.linkonce.s.*)
+      *(__libc_atexit)
+      *(__libc_subinit)
+      *(__libc_subfreeres)
+      *(.note.ABI-tag)
+
+      /* C++ support. For each global and static local C++ object,
+       * GCC creates a small subroutine to construct the object. Pointers
+       * to these routines (not the routines themselves) are stored as
+       * simple, linear arrays in the .ctors section of the object file.
+       * Similarly, pointers to global/static destructor routines are
+       * stored in .dtors.
+       */
+
+      *(.gnu.linkonce.d.*)
+
+      _ctors_start = . ;
+      *(.ctors)
+      _ctors_end = . ;
+      _dtors_start = . ;
+      *(.dtors)
+      _dtors_end = . ;
+
+      _edata = . ;
+      edata = ALIGN( 0x10 ) ;
+    } > DSPACE
+
+  .bss :
+    {
+      __bss_start = _edata ;
+      *(.dynsbss)
+      *(.sbss)
+      *(.sbss.*)
+      *(.scommon)
+      *(.dynbss)
+      *(.bss)
+      *(.bss.*)
+      *(.bss*)
+      *(.gnu.linkonce.b*)
+      *(COMMON)
+      end = ALIGN( 0x10 ) ;
+      _end = ALIGN( 0x10 ) ;
+    } > DSPACE
+
+    .got 0 : { *(.got.plt) *(.got) }
+    .junk 0 : { *(.rel*) *(.rela*) }
+    /* Stabs debugging sections.    */
+    .stab 0 : { *(.stab) }
+    .stabstr 0 : { *(.stabstr) }
+    .stab.excl 0 : { *(.stab.excl) }
+    .stab.exclstr 0 : { *(.stab.exclstr) }
+    .stab.index 0 : { *(.stab.index) }
+    .stab.indexstr 0 : { *(.stab.indexstr) }
+    .comment 0 : { *(.comment) }
+    .debug_abbrev 0 : { *(.debug_abbrev) }
+    .debug_info 0 : { *(.debug_info) }
+    .debug_line 0 : { *(.debug_line) }
+    .debug_pubnames 0 : { *(.debug_pubnames) }
+    .debug_aranges 0 : { *(.debug_aranges) }
+}
diff --git a/nuttx/configs/amber/hello/Make.defs b/nuttx/configs/amber/hello/Make.defs
index 66f3ff7993..1c2d8b89e1 100644
--- a/nuttx/configs/amber/hello/Make.defs
+++ b/nuttx/configs/amber/hello/Make.defs
@@ -107,7 +107,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/c5471evm/httpd/Make.defs b/nuttx/configs/c5471evm/httpd/Make.defs
index ffc267530d..4d94d83427 100644
--- a/nuttx/configs/c5471evm/httpd/Make.defs
+++ b/nuttx/configs/c5471evm/httpd/Make.defs
@@ -74,7 +74,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/c5471evm/nettest/Make.defs b/nuttx/configs/c5471evm/nettest/Make.defs
index e784c11194..1f8b7afa17 100644
--- a/nuttx/configs/c5471evm/nettest/Make.defs
+++ b/nuttx/configs/c5471evm/nettest/Make.defs
@@ -74,7 +74,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/c5471evm/nsh/Make.defs b/nuttx/configs/c5471evm/nsh/Make.defs
index d9e569158b..68a15703e3 100644
--- a/nuttx/configs/c5471evm/nsh/Make.defs
+++ b/nuttx/configs/c5471evm/nsh/Make.defs
@@ -74,7 +74,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/c5471evm/ostest/Make.defs b/nuttx/configs/c5471evm/ostest/Make.defs
index 9cbfc1d1d5..8a0f8c812f 100644
--- a/nuttx/configs/c5471evm/ostest/Make.defs
+++ b/nuttx/configs/c5471evm/ostest/Make.defs
@@ -74,7 +74,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/compal_e88/nsh_highram/Make.defs b/nuttx/configs/compal_e88/nsh_highram/Make.defs
index e99d5635d0..c5890828f8 100644
--- a/nuttx/configs/compal_e88/nsh_highram/Make.defs
+++ b/nuttx/configs/compal_e88/nsh_highram/Make.defs
@@ -83,7 +83,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/compal_e99/nsh_compalram/Make.defs b/nuttx/configs/compal_e99/nsh_compalram/Make.defs
index 4759fc76a4..16e38b666b 100644
--- a/nuttx/configs/compal_e99/nsh_compalram/Make.defs
+++ b/nuttx/configs/compal_e99/nsh_compalram/Make.defs
@@ -83,7 +83,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/compal_e99/nsh_highram/Make.defs b/nuttx/configs/compal_e99/nsh_highram/Make.defs
index e99d5635d0..c5890828f8 100644
--- a/nuttx/configs/compal_e99/nsh_highram/Make.defs
+++ b/nuttx/configs/compal_e99/nsh_highram/Make.defs
@@ -83,7 +83,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/demo9s12ne64/ostest/Make.defs b/nuttx/configs/demo9s12ne64/ostest/Make.defs
index 727ebb5614..9edf5adf9c 100644
--- a/nuttx/configs/demo9s12ne64/ostest/Make.defs
+++ b/nuttx/configs/demo9s12ne64/ostest/Make.defs
@@ -105,7 +105,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/ea3131/nsh/Make.defs b/nuttx/configs/ea3131/nsh/Make.defs
index cd49f56af7..28e881ccb4 100644
--- a/nuttx/configs/ea3131/nsh/Make.defs
+++ b/nuttx/configs/ea3131/nsh/Make.defs
@@ -115,7 +115,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/ea3131/ostest/Make.defs b/nuttx/configs/ea3131/ostest/Make.defs
index f07f4d4529..ed7eb92903 100644
--- a/nuttx/configs/ea3131/ostest/Make.defs
+++ b/nuttx/configs/ea3131/ostest/Make.defs
@@ -115,7 +115,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/ea3131/pgnsh/Make.defs b/nuttx/configs/ea3131/pgnsh/Make.defs
index 1097a8d728..7b09759ead 100644
--- a/nuttx/configs/ea3131/pgnsh/Make.defs
+++ b/nuttx/configs/ea3131/pgnsh/Make.defs
@@ -115,7 +115,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/ea3131/usbserial/Make.defs b/nuttx/configs/ea3131/usbserial/Make.defs
index 3fe5f8f931..614221fb37 100644
--- a/nuttx/configs/ea3131/usbserial/Make.defs
+++ b/nuttx/configs/ea3131/usbserial/Make.defs
@@ -115,7 +115,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/ea3131/usbstorage/Make.defs b/nuttx/configs/ea3131/usbstorage/Make.defs
index de351b2567..4aa007069e 100644
--- a/nuttx/configs/ea3131/usbstorage/Make.defs
+++ b/nuttx/configs/ea3131/usbstorage/Make.defs
@@ -115,7 +115,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/ea3152/ostest/Make.defs b/nuttx/configs/ea3152/ostest/Make.defs
index 9bb350e36c..8ca8f6e6a9 100644
--- a/nuttx/configs/ea3152/ostest/Make.defs
+++ b/nuttx/configs/ea3152/ostest/Make.defs
@@ -115,7 +115,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/eagle100/README.txt b/nuttx/configs/eagle100/README.txt
index 105bd5ff18..b4bca39cb6 100644
--- a/nuttx/configs/eagle100/README.txt
+++ b/nuttx/configs/eagle100/README.txt
@@ -157,12 +157,14 @@ NuttX OABI "buildroot" Toolchain
      configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
      configuration such as cortexm3-defconfig-4.3.3
 
-  2. Modify the Make.defs file to use the OABI converntions:
+  2. Modify the Make.defs file to use the OABI conventions:
 
     +CROSSDEV = arm-nuttx-elf-
     +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    +NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
     -CROSSDEV = arm-nuttx-eabi-
     -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+    -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 
 NXFLAT Toolchain
 ^^^^^^^^^^^^^^^^
diff --git a/nuttx/configs/eagle100/httpd/Make.defs b/nuttx/configs/eagle100/httpd/Make.defs
index 8d3cc9c25f..dc252dfb3a 100644
--- a/nuttx/configs/eagle100/httpd/Make.defs
+++ b/nuttx/configs/eagle100/httpd/Make.defs
@@ -98,7 +98,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/eagle100/nettest/Make.defs b/nuttx/configs/eagle100/nettest/Make.defs
index ca50492828..3de14846e6 100644
--- a/nuttx/configs/eagle100/nettest/Make.defs
+++ b/nuttx/configs/eagle100/nettest/Make.defs
@@ -98,7 +98,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/eagle100/nsh/Make.defs b/nuttx/configs/eagle100/nsh/Make.defs
index 4992994951..ff66759339 100644
--- a/nuttx/configs/eagle100/nsh/Make.defs
+++ b/nuttx/configs/eagle100/nsh/Make.defs
@@ -98,7 +98,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/eagle100/nxflat/Make.defs b/nuttx/configs/eagle100/nxflat/Make.defs
index d735c3942a..41e738ec8b 100644
--- a/nuttx/configs/eagle100/nxflat/Make.defs
+++ b/nuttx/configs/eagle100/nxflat/Make.defs
@@ -101,7 +101,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/eagle100/ostest/Make.defs b/nuttx/configs/eagle100/ostest/Make.defs
index 641fcbaba2..78db5644e4 100644
--- a/nuttx/configs/eagle100/ostest/Make.defs
+++ b/nuttx/configs/eagle100/ostest/Make.defs
@@ -98,7 +98,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/eagle100/thttpd/Make.defs b/nuttx/configs/eagle100/thttpd/Make.defs
index 999db3a591..92f68d9f11 100644
--- a/nuttx/configs/eagle100/thttpd/Make.defs
+++ b/nuttx/configs/eagle100/thttpd/Make.defs
@@ -101,7 +101,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/ekk-lm3s9b96/README.txt b/nuttx/configs/ekk-lm3s9b96/README.txt
index 16568dbda2..2ad4354779 100644
--- a/nuttx/configs/ekk-lm3s9b96/README.txt
+++ b/nuttx/configs/ekk-lm3s9b96/README.txt
@@ -235,12 +235,14 @@ NuttX OABI "buildroot" Toolchain
      configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
      configuration such as cortexm3-defconfig-4.3.3
 
-  2. Modify the Make.defs file to use the OABI converntions:
+  2. Modify the Make.defs file to use the OABI conventions:
 
     +CROSSDEV = arm-nuttx-elf-
     +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    +NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
     -CROSSDEV = arm-nuttx-eabi-
     -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+    -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 
 NXFLAT Toolchain
 ^^^^^^^^^^^^^^^^
diff --git a/nuttx/configs/ekk-lm3s9b96/nsh/Make.defs b/nuttx/configs/ekk-lm3s9b96/nsh/Make.defs
index e810ec175a..c14dccbb91 100644
--- a/nuttx/configs/ekk-lm3s9b96/nsh/Make.defs
+++ b/nuttx/configs/ekk-lm3s9b96/nsh/Make.defs
@@ -118,7 +118,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/ekk-lm3s9b96/ostest/Make.defs b/nuttx/configs/ekk-lm3s9b96/ostest/Make.defs
index ca38be836c..4068b73fd4 100644
--- a/nuttx/configs/ekk-lm3s9b96/ostest/Make.defs
+++ b/nuttx/configs/ekk-lm3s9b96/ostest/Make.defs
@@ -118,7 +118,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/fire-stm32v2/README.txt b/nuttx/configs/fire-stm32v2/README.txt
index 74f3c72948..9e5d94c230 100644
--- a/nuttx/configs/fire-stm32v2/README.txt
+++ b/nuttx/configs/fire-stm32v2/README.txt
@@ -357,12 +357,14 @@ NuttX OABI "buildroot" Toolchain
      configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
      configuration such as cortexm3-defconfig-4.3.3
 
-  2. Modify the Make.defs file to use the OABI converntions:
+  2. Modify the Make.defs file to use the OABI conventions:
 
     +CROSSDEV = arm-nuttx-elf-
     +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    +NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
     -CROSSDEV = arm-nuttx-eabi-
     -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+    -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 
 NXFLAT Toolchain
 ================
diff --git a/nuttx/configs/fire-stm32v2/nsh/Make.defs b/nuttx/configs/fire-stm32v2/nsh/Make.defs
index f64dda4d20..bd63f7c6be 100644
--- a/nuttx/configs/fire-stm32v2/nsh/Make.defs
+++ b/nuttx/configs/fire-stm32v2/nsh/Make.defs
@@ -153,7 +153,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/hymini-stm32v/README.txt b/nuttx/configs/hymini-stm32v/README.txt
index 03658be0ac..51f3c1fe3b 100644
--- a/nuttx/configs/hymini-stm32v/README.txt
+++ b/nuttx/configs/hymini-stm32v/README.txt
@@ -177,12 +177,14 @@ NuttX OABI "buildroot" Toolchain
      configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
      configuration such as cortexm3-defconfig-4.3.3
 
-  2. Modify the Make.defs file to use the OABI converntions:
+  2. Modify the Make.defs file to use the OABI conventions:
 
     +CROSSDEV = arm-nuttx-elf-
     +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    +NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
     -CROSSDEV = arm-nuttx-eabi-
     -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+    -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 
 NXFLAT Toolchain
 ================
diff --git a/nuttx/configs/hymini-stm32v/buttons/Make.defs b/nuttx/configs/hymini-stm32v/buttons/Make.defs
index eb121c2cbe..efc29cb1dc 100644
--- a/nuttx/configs/hymini-stm32v/buttons/Make.defs
+++ b/nuttx/configs/hymini-stm32v/buttons/Make.defs
@@ -129,7 +129,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/hymini-stm32v/nsh/Make.defs b/nuttx/configs/hymini-stm32v/nsh/Make.defs
index a0809f98a0..cade80762c 100644
--- a/nuttx/configs/hymini-stm32v/nsh/Make.defs
+++ b/nuttx/configs/hymini-stm32v/nsh/Make.defs
@@ -129,7 +129,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/hymini-stm32v/nsh2/Make.defs b/nuttx/configs/hymini-stm32v/nsh2/Make.defs
index 72960ee270..269b4979ea 100644
--- a/nuttx/configs/hymini-stm32v/nsh2/Make.defs
+++ b/nuttx/configs/hymini-stm32v/nsh2/Make.defs
@@ -129,7 +129,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/hymini-stm32v/nx/Make.defs b/nuttx/configs/hymini-stm32v/nx/Make.defs
index d647c7fcd6..fce4ec279b 100644
--- a/nuttx/configs/hymini-stm32v/nx/Make.defs
+++ b/nuttx/configs/hymini-stm32v/nx/Make.defs
@@ -129,7 +129,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/hymini-stm32v/nxlines/Make.defs b/nuttx/configs/hymini-stm32v/nxlines/Make.defs
index fa66e6be05..8943c4cb72 100644
--- a/nuttx/configs/hymini-stm32v/nxlines/Make.defs
+++ b/nuttx/configs/hymini-stm32v/nxlines/Make.defs
@@ -131,7 +131,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/hymini-stm32v/usbserial/Make.defs b/nuttx/configs/hymini-stm32v/usbserial/Make.defs
index d0a2a80cc3..1e8c90b123 100644
--- a/nuttx/configs/hymini-stm32v/usbserial/Make.defs
+++ b/nuttx/configs/hymini-stm32v/usbserial/Make.defs
@@ -129,7 +129,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/hymini-stm32v/usbstorage/Make.defs b/nuttx/configs/hymini-stm32v/usbstorage/Make.defs
index ee870eab44..8acc8db4aa 100644
--- a/nuttx/configs/hymini-stm32v/usbstorage/Make.defs
+++ b/nuttx/configs/hymini-stm32v/usbstorage/Make.defs
@@ -129,7 +129,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/kwikstik-k40/README.txt b/nuttx/configs/kwikstik-k40/README.txt
index a320cbb054..246fa912e6 100644
--- a/nuttx/configs/kwikstik-k40/README.txt
+++ b/nuttx/configs/kwikstik-k40/README.txt
@@ -300,12 +300,14 @@ NuttX OABI "buildroot" Toolchain
      configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
      configuration such as cortexm3-defconfig-4.3.3
 
-  2. Modify the Make.defs file to use the OABI converntions:
+  2. Modify the Make.defs file to use the OABI conventions:
 
     +CROSSDEV = arm-nuttx-elf-
     +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    +NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
     -CROSSDEV = arm-nuttx-eabi-
     -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+    -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 
 NXFLAT Toolchain
 ================
diff --git a/nuttx/configs/kwikstik-k40/ostest/Make.defs b/nuttx/configs/kwikstik-k40/ostest/Make.defs
index beba9e3978..a51f37e94f 100644
--- a/nuttx/configs/kwikstik-k40/ostest/Make.defs
+++ b/nuttx/configs/kwikstik-k40/ostest/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/lincoln60/README.txt b/nuttx/configs/lincoln60/README.txt
index abbc572046..35fe32267c 100644
--- a/nuttx/configs/lincoln60/README.txt
+++ b/nuttx/configs/lincoln60/README.txt
@@ -199,12 +199,14 @@ NuttX OABI "buildroot" Toolchain
      configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
      configuration such as cortexm3-defconfig-4.3.3
 
-  2. Modify the Make.defs file to use the OABI converntions:
+  2. Modify the Make.defs file to use the OABI conerntions:
 
     +CROSSDEV = arm-nuttx-elf-
     +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    +NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
     -CROSSDEV = arm-nuttx-eabi-
     -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+    -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 
 NXFLAT Toolchain
 ^^^^^^^^^^^^^^^^
diff --git a/nuttx/configs/lincoln60/nsh/Make.defs b/nuttx/configs/lincoln60/nsh/Make.defs
index 7b3c3318a6..cf76f97f28 100644
--- a/nuttx/configs/lincoln60/nsh/Make.defs
+++ b/nuttx/configs/lincoln60/nsh/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/lincoln60/ostest/Make.defs b/nuttx/configs/lincoln60/ostest/Make.defs
index bd4b25701b..044b27dc43 100644
--- a/nuttx/configs/lincoln60/ostest/Make.defs
+++ b/nuttx/configs/lincoln60/ostest/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/lm3s6432-s2e/README.txt b/nuttx/configs/lm3s6432-s2e/README.txt
index 10ceda15ac..460b5546d7 100644
--- a/nuttx/configs/lm3s6432-s2e/README.txt
+++ b/nuttx/configs/lm3s6432-s2e/README.txt
@@ -229,12 +229,14 @@ NuttX OABI "buildroot" Toolchain
      configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
      configuration such as cortexm3-defconfig-4.3.3
 
-  2. Modify the Make.defs file to use the OABI converntions:
+  2. Modify the Make.defs file to use the OABI conventions:
 
     +CROSSDEV = arm-nuttx-elf-
     +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    +NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
     -CROSSDEV = arm-nuttx-eabi-
     -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+    -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 
 NXFLAT Toolchain
 ^^^^^^^^^^^^^^^^
diff --git a/nuttx/configs/lm3s6432-s2e/nsh/Make.defs b/nuttx/configs/lm3s6432-s2e/nsh/Make.defs
index e463a17429..c9ade8028a 100644
--- a/nuttx/configs/lm3s6432-s2e/nsh/Make.defs
+++ b/nuttx/configs/lm3s6432-s2e/nsh/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/lm3s6432-s2e/ostest/Make.defs b/nuttx/configs/lm3s6432-s2e/ostest/Make.defs
index 33f0d43ede..5f48145bfd 100644
--- a/nuttx/configs/lm3s6432-s2e/ostest/Make.defs
+++ b/nuttx/configs/lm3s6432-s2e/ostest/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/lm3s6965-ek/README.txt b/nuttx/configs/lm3s6965-ek/README.txt
index fc70b75fc0..4aba09beeb 100644
--- a/nuttx/configs/lm3s6965-ek/README.txt
+++ b/nuttx/configs/lm3s6965-ek/README.txt
@@ -261,12 +261,14 @@ NuttX OABI "buildroot" Toolchain
      configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
      configuration such as cortexm3-defconfig-4.3.3
 
-  2. Modify the Make.defs file to use the OABI converntions:
+  2. Modify the Make.defs file to use the OABI conventions:
 
     +CROSSDEV = arm-nuttx-elf-
     +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    +NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
     -CROSSDEV = arm-nuttx-eabi-
     -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+    -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 
 NXFLAT Toolchain
 ^^^^^^^^^^^^^^^^
diff --git a/nuttx/configs/lm3s6965-ek/nsh/Make.defs b/nuttx/configs/lm3s6965-ek/nsh/Make.defs
index 5aaed90095..6fc8616aab 100644
--- a/nuttx/configs/lm3s6965-ek/nsh/Make.defs
+++ b/nuttx/configs/lm3s6965-ek/nsh/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/lm3s6965-ek/nx/Make.defs b/nuttx/configs/lm3s6965-ek/nx/Make.defs
index 8b99d7de7f..887bb823a3 100644
--- a/nuttx/configs/lm3s6965-ek/nx/Make.defs
+++ b/nuttx/configs/lm3s6965-ek/nx/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/lm3s6965-ek/ostest/Make.defs b/nuttx/configs/lm3s6965-ek/ostest/Make.defs
index 434b21e24a..0c02e22bb0 100644
--- a/nuttx/configs/lm3s6965-ek/ostest/Make.defs
+++ b/nuttx/configs/lm3s6965-ek/ostest/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/lm3s8962-ek/README.txt b/nuttx/configs/lm3s8962-ek/README.txt
index 043e5ceb38..570d158a29 100644
--- a/nuttx/configs/lm3s8962-ek/README.txt
+++ b/nuttx/configs/lm3s8962-ek/README.txt
@@ -245,12 +245,14 @@ NuttX OABI "buildroot" Toolchain
      configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
      configuration such as cortexm3-defconfig-4.3.3
 
-  2. Modify the Make.defs file to use the OABI converntions:
+  2. Modify the Make.defs file to use the OABI conventions:
 
     +CROSSDEV = arm-nuttx-elf-
     +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    +NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
     -CROSSDEV = arm-nuttx-eabi-
     -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+    -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 
 NXFLAT Toolchain
 ^^^^^^^^^^^^^^^^
diff --git a/nuttx/configs/lm3s8962-ek/nsh/Make.defs b/nuttx/configs/lm3s8962-ek/nsh/Make.defs
index d7be642cd4..671ccec32b 100644
--- a/nuttx/configs/lm3s8962-ek/nsh/Make.defs
+++ b/nuttx/configs/lm3s8962-ek/nsh/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/lm3s8962-ek/nx/Make.defs b/nuttx/configs/lm3s8962-ek/nx/Make.defs
index bf07df29a6..2563c58dd9 100644
--- a/nuttx/configs/lm3s8962-ek/nx/Make.defs
+++ b/nuttx/configs/lm3s8962-ek/nx/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/lm3s8962-ek/ostest/Make.defs b/nuttx/configs/lm3s8962-ek/ostest/Make.defs
index 94389216cd..2559ed89a1 100644
--- a/nuttx/configs/lm3s8962-ek/ostest/Make.defs
+++ b/nuttx/configs/lm3s8962-ek/ostest/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/lpc4330-xplorer/README.txt b/nuttx/configs/lpc4330-xplorer/README.txt
index a613edada1..ea1098be54 100644
--- a/nuttx/configs/lpc4330-xplorer/README.txt
+++ b/nuttx/configs/lpc4330-xplorer/README.txt
@@ -511,12 +511,14 @@ NuttX OABI "buildroot" Toolchain
      configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
      configuration such as cortexm3-defconfig-4.3.3
 
-  2. Modify the Make.defs file to use the OABI converntions:
+  2. Modify the Make.defs file to use the OABI conventions:
 
     +CROSSDEV = arm-nuttx-elf-
     +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    +NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
     -CROSSDEV = arm-nuttx-eabi-
     -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+    -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 
 NXFLAT Toolchain
 ================
diff --git a/nuttx/configs/lpc4330-xplorer/nsh/Make.defs b/nuttx/configs/lpc4330-xplorer/nsh/Make.defs
index 757759ecc9..51439ac227 100644
--- a/nuttx/configs/lpc4330-xplorer/nsh/Make.defs
+++ b/nuttx/configs/lpc4330-xplorer/nsh/Make.defs
@@ -174,7 +174,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/lpc4330-xplorer/ostest/Make.defs b/nuttx/configs/lpc4330-xplorer/ostest/Make.defs
index 757759ecc9..51439ac227 100644
--- a/nuttx/configs/lpc4330-xplorer/ostest/Make.defs
+++ b/nuttx/configs/lpc4330-xplorer/ostest/Make.defs
@@ -174,7 +174,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/lpcxpresso-lpc1768/README.txt b/nuttx/configs/lpcxpresso-lpc1768/README.txt
index 65f58d5527..cbc5f50e8c 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/README.txt
+++ b/nuttx/configs/lpcxpresso-lpc1768/README.txt
@@ -455,12 +455,14 @@ NuttX OABI "buildroot" Toolchain
      configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
      configuration such as cortexm3-defconfig-4.3.3
 
-  2. Modify the Make.defs file to use the OABI converntions:
+  2. Modify the Make.defs file to use the OABI conventions:
 
     +CROSSDEV = arm-nuttx-elf-
     +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    +NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
     -CROSSDEV = arm-nuttx-eabi-
     -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+    -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 
 NXFLAT Toolchain
 ^^^^^^^^^^^^^^^^
diff --git a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/Make.defs
index 15109a1adb..55da02a154 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/Make.defs
+++ b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/Make.defs
@@ -129,7 +129,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/lpcxpresso-lpc1768/nsh/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/nsh/Make.defs
index b29d10982f..52831a2794 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/nsh/Make.defs
+++ b/nuttx/configs/lpcxpresso-lpc1768/nsh/Make.defs
@@ -129,7 +129,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/lpcxpresso-lpc1768/nx/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/nx/Make.defs
index 31286436a8..59aeb51875 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/nx/Make.defs
+++ b/nuttx/configs/lpcxpresso-lpc1768/nx/Make.defs
@@ -129,7 +129,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/lpcxpresso-lpc1768/ostest/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/ostest/Make.defs
index 975cdf4601..6d228a9363 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/ostest/Make.defs
+++ b/nuttx/configs/lpcxpresso-lpc1768/ostest/Make.defs
@@ -129,7 +129,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs
index 67534a5c1e..b6a3245469 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs
+++ b/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs
@@ -88,14 +88,14 @@ ifeq ($(WINTOOL),y)
   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)/thttpd/ld.script}"
   MAXOPTIMIZATION = -O2
-  NXFLATLDSCRIPT = -T "${shell cygpath -w $(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld}"
+  NXFLATLDSCRIPT = -T "${shell cygpath -w $(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld}"
 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)/thttpd/ld.script
-  NXFLATLDSCRIPT = -T"$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld"
+  NXFLATLDSCRIPT = -T"$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld"
 endif
 
 CC = $(CROSSDEV)gcc
diff --git a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/Make.defs
index 087a922871..793dfcdf19 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/Make.defs
+++ b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/Make.defs
@@ -129,7 +129,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/mbed/README.txt b/nuttx/configs/mbed/README.txt
index 601c9a0b25..df509a199a 100644
--- a/nuttx/configs/mbed/README.txt
+++ b/nuttx/configs/mbed/README.txt
@@ -169,12 +169,14 @@ NuttX OABI "buildroot" Toolchain
      configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
      configuration such as cortexm3-defconfig-4.3.3
 
-  2. Modify the Make.defs file to use the OABI converntions:
+  2. Modify the Make.defs file to use the OABI conventions:
 
     +CROSSDEV = arm-nuttx-elf-
     +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    +NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
     -CROSSDEV = arm-nuttx-eabi-
     -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+    -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 
 NXFLAT Toolchain
 ^^^^^^^^^^^^^^^^
diff --git a/nuttx/configs/mbed/hidkbd/Make.defs b/nuttx/configs/mbed/hidkbd/Make.defs
index 043340da13..b1dfb73e12 100644
--- a/nuttx/configs/mbed/hidkbd/Make.defs
+++ b/nuttx/configs/mbed/hidkbd/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/mbed/nsh/Make.defs b/nuttx/configs/mbed/nsh/Make.defs
index 549178e9cb..f1983a7b7c 100644
--- a/nuttx/configs/mbed/nsh/Make.defs
+++ b/nuttx/configs/mbed/nsh/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/mcu123-lpc214x/composite/Make.defs b/nuttx/configs/mcu123-lpc214x/composite/Make.defs
index f2f0ee8e88..fcbc0b8090 100644
--- a/nuttx/configs/mcu123-lpc214x/composite/Make.defs
+++ b/nuttx/configs/mcu123-lpc214x/composite/Make.defs
@@ -110,7 +110,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/mcu123-lpc214x/nsh/Make.defs b/nuttx/configs/mcu123-lpc214x/nsh/Make.defs
index de09916e5f..eed15974a1 100644
--- a/nuttx/configs/mcu123-lpc214x/nsh/Make.defs
+++ b/nuttx/configs/mcu123-lpc214x/nsh/Make.defs
@@ -110,7 +110,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/mcu123-lpc214x/ostest/Make.defs b/nuttx/configs/mcu123-lpc214x/ostest/Make.defs
index bc72ca9bdc..46beab5265 100644
--- a/nuttx/configs/mcu123-lpc214x/ostest/Make.defs
+++ b/nuttx/configs/mcu123-lpc214x/ostest/Make.defs
@@ -110,7 +110,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/mcu123-lpc214x/usbserial/Make.defs b/nuttx/configs/mcu123-lpc214x/usbserial/Make.defs
index 106224ef12..377c39b1d4 100644
--- a/nuttx/configs/mcu123-lpc214x/usbserial/Make.defs
+++ b/nuttx/configs/mcu123-lpc214x/usbserial/Make.defs
@@ -110,7 +110,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/mcu123-lpc214x/usbstorage/Make.defs b/nuttx/configs/mcu123-lpc214x/usbstorage/Make.defs
index bf1b9cab45..d26a22d6fc 100644
--- a/nuttx/configs/mcu123-lpc214x/usbstorage/Make.defs
+++ b/nuttx/configs/mcu123-lpc214x/usbstorage/Make.defs
@@ -110,7 +110,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/micropendous3/hello/Make.defs b/nuttx/configs/micropendous3/hello/Make.defs
index 178f355567..bd48d79c9e 100644
--- a/nuttx/configs/micropendous3/hello/Make.defs
+++ b/nuttx/configs/micropendous3/hello/Make.defs
@@ -107,7 +107,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/mirtoo/nsh/Make.defs b/nuttx/configs/mirtoo/nsh/Make.defs
index 17b7cad213..de0a190f66 100644
--- a/nuttx/configs/mirtoo/nsh/Make.defs
+++ b/nuttx/configs/mirtoo/nsh/Make.defs
@@ -154,7 +154,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/mirtoo/nxffs/Make.defs b/nuttx/configs/mirtoo/nxffs/Make.defs
index 908536b66c..a6992ee533 100644
--- a/nuttx/configs/mirtoo/nxffs/Make.defs
+++ b/nuttx/configs/mirtoo/nxffs/Make.defs
@@ -154,7 +154,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/mirtoo/ostest/Make.defs b/nuttx/configs/mirtoo/ostest/Make.defs
index 7c200ea47b..71bd9d5baa 100644
--- a/nuttx/configs/mirtoo/ostest/Make.defs
+++ b/nuttx/configs/mirtoo/ostest/Make.defs
@@ -154,7 +154,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/mx1ads/ostest/Make.defs b/nuttx/configs/mx1ads/ostest/Make.defs
index 71e053b0aa..9b9c61df8f 100644
--- a/nuttx/configs/mx1ads/ostest/Make.defs
+++ b/nuttx/configs/mx1ads/ostest/Make.defs
@@ -84,7 +84,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/ne64badge/ostest/Make.defs b/nuttx/configs/ne64badge/ostest/Make.defs
index 9521a0a660..2858d30f1d 100644
--- a/nuttx/configs/ne64badge/ostest/Make.defs
+++ b/nuttx/configs/ne64badge/ostest/Make.defs
@@ -105,7 +105,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/ntosd-dm320/nettest/Make.defs b/nuttx/configs/ntosd-dm320/nettest/Make.defs
index 30d369c2ac..e28c1a3609 100644
--- a/nuttx/configs/ntosd-dm320/nettest/Make.defs
+++ b/nuttx/configs/ntosd-dm320/nettest/Make.defs
@@ -120,7 +120,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/ntosd-dm320/nsh/Make.defs b/nuttx/configs/ntosd-dm320/nsh/Make.defs
index 14038f7562..aff7f4240b 100644
--- a/nuttx/configs/ntosd-dm320/nsh/Make.defs
+++ b/nuttx/configs/ntosd-dm320/nsh/Make.defs
@@ -120,7 +120,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/ntosd-dm320/ostest/Make.defs b/nuttx/configs/ntosd-dm320/ostest/Make.defs
index 4618c42467..6766b49153 100644
--- a/nuttx/configs/ntosd-dm320/ostest/Make.defs
+++ b/nuttx/configs/ntosd-dm320/ostest/Make.defs
@@ -120,7 +120,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/ntosd-dm320/poll/Make.defs b/nuttx/configs/ntosd-dm320/poll/Make.defs
index c06139bd6d..a111fed657 100644
--- a/nuttx/configs/ntosd-dm320/poll/Make.defs
+++ b/nuttx/configs/ntosd-dm320/poll/Make.defs
@@ -120,7 +120,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/ntosd-dm320/thttpd/Make.defs b/nuttx/configs/ntosd-dm320/thttpd/Make.defs
index 075f72eaa2..a0e501376e 100644
--- a/nuttx/configs/ntosd-dm320/thttpd/Make.defs
+++ b/nuttx/configs/ntosd-dm320/thttpd/Make.defs
@@ -120,7 +120,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/ntosd-dm320/udp/Make.defs b/nuttx/configs/ntosd-dm320/udp/Make.defs
index 66750f13d6..16ed8ecebf 100644
--- a/nuttx/configs/ntosd-dm320/udp/Make.defs
+++ b/nuttx/configs/ntosd-dm320/udp/Make.defs
@@ -120,7 +120,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/ntosd-dm320/uip/Make.defs b/nuttx/configs/ntosd-dm320/uip/Make.defs
index d59b96e7c7..d9425c05eb 100644
--- a/nuttx/configs/ntosd-dm320/uip/Make.defs
+++ b/nuttx/configs/ntosd-dm320/uip/Make.defs
@@ -120,7 +120,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/nucleus2g/README.txt b/nuttx/configs/nucleus2g/README.txt
index 01b6adef71..39ae370ccc 100644
--- a/nuttx/configs/nucleus2g/README.txt
+++ b/nuttx/configs/nucleus2g/README.txt
@@ -229,12 +229,14 @@ NuttX OABI "buildroot" Toolchain
      configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
      configuration such as cortexm3-defconfig-4.3.3
 
-  2. Modify the Make.defs file to use the OABI converntions:
+  2. Modify the Make.defs file to use the OABI conventions:
 
     +CROSSDEV = arm-nuttx-elf-
     +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    +NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
     -CROSSDEV = arm-nuttx-eabi-
     -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+    -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 
 NXFLAT Toolchain
 ^^^^^^^^^^^^^^^^
diff --git a/nuttx/configs/nucleus2g/nsh/Make.defs b/nuttx/configs/nucleus2g/nsh/Make.defs
index e21f7f1c88..85e175df0d 100644
--- a/nuttx/configs/nucleus2g/nsh/Make.defs
+++ b/nuttx/configs/nucleus2g/nsh/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/nucleus2g/ostest/Make.defs b/nuttx/configs/nucleus2g/ostest/Make.defs
index 5696eae227..fc12eccad0 100644
--- a/nuttx/configs/nucleus2g/ostest/Make.defs
+++ b/nuttx/configs/nucleus2g/ostest/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/nucleus2g/usbserial/Make.defs b/nuttx/configs/nucleus2g/usbserial/Make.defs
index 2cdccc9596..d82b5d1bcc 100644
--- a/nuttx/configs/nucleus2g/usbserial/Make.defs
+++ b/nuttx/configs/nucleus2g/usbserial/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/nucleus2g/usbstorage/Make.defs b/nuttx/configs/nucleus2g/usbstorage/Make.defs
index 79f1b8c1f4..d5819e82a7 100644
--- a/nuttx/configs/nucleus2g/usbstorage/Make.defs
+++ b/nuttx/configs/nucleus2g/usbstorage/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/olimex-lpc1766stk/README.txt b/nuttx/configs/olimex-lpc1766stk/README.txt
index 96692688c5..dcea9d0b71 100644
--- a/nuttx/configs/olimex-lpc1766stk/README.txt
+++ b/nuttx/configs/olimex-lpc1766stk/README.txt
@@ -317,12 +317,14 @@ NuttX OABI "buildroot" Toolchain
      configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
      configuration such as cortexm3-defconfig-4.3.3
 
-  2. Modify the Make.defs file to use the OABI converntions:
+  2. Modify the Make.defs file to use the OABI conventions:
 
     +CROSSDEV = arm-nuttx-elf-
     +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    +NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
     -CROSSDEV = arm-nuttx-eabi-
     -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+    -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 
 NXFLAT Toolchain
 ^^^^^^^^^^^^^^^^
diff --git a/nuttx/configs/olimex-lpc1766stk/ftpc/Make.defs b/nuttx/configs/olimex-lpc1766stk/ftpc/Make.defs
index fb8d550235..352c031749 100644
--- a/nuttx/configs/olimex-lpc1766stk/ftpc/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/ftpc/Make.defs
@@ -120,7 +120,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/olimex-lpc1766stk/hidkbd/Make.defs b/nuttx/configs/olimex-lpc1766stk/hidkbd/Make.defs
index 1997d66b3b..017a79e7dc 100644
--- a/nuttx/configs/olimex-lpc1766stk/hidkbd/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/hidkbd/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/olimex-lpc1766stk/nettest/Make.defs b/nuttx/configs/olimex-lpc1766stk/nettest/Make.defs
index 2036629411..652899c083 100644
--- a/nuttx/configs/olimex-lpc1766stk/nettest/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/nettest/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/olimex-lpc1766stk/nsh/Make.defs b/nuttx/configs/olimex-lpc1766stk/nsh/Make.defs
index 7110759bac..b517fae43c 100644
--- a/nuttx/configs/olimex-lpc1766stk/nsh/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/nsh/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/olimex-lpc1766stk/nx/Make.defs b/nuttx/configs/olimex-lpc1766stk/nx/Make.defs
index e8325f7808..2d0d63b190 100644
--- a/nuttx/configs/olimex-lpc1766stk/nx/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/nx/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/olimex-lpc1766stk/ostest/Make.defs b/nuttx/configs/olimex-lpc1766stk/ostest/Make.defs
index f7775e0727..6883694a3f 100644
--- a/nuttx/configs/olimex-lpc1766stk/ostest/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/ostest/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/olimex-lpc1766stk/slip-httpd/Make.defs b/nuttx/configs/olimex-lpc1766stk/slip-httpd/Make.defs
index 7f7278d06d..984d4e1874 100644
--- a/nuttx/configs/olimex-lpc1766stk/slip-httpd/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/slip-httpd/Make.defs
@@ -120,7 +120,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs b/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs
index 96270bc288..11e155ed89 100644
--- a/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs
@@ -120,7 +120,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/olimex-lpc1766stk/usbserial/Make.defs b/nuttx/configs/olimex-lpc1766stk/usbserial/Make.defs
index 2d7321efde..1cedb01d72 100644
--- a/nuttx/configs/olimex-lpc1766stk/usbserial/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/usbserial/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/olimex-lpc1766stk/usbstorage/Make.defs b/nuttx/configs/olimex-lpc1766stk/usbstorage/Make.defs
index 8c62990aeb..f879340f14 100644
--- a/nuttx/configs/olimex-lpc1766stk/usbstorage/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/usbstorage/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/olimex-lpc1766stk/wlan/Make.defs b/nuttx/configs/olimex-lpc1766stk/wlan/Make.defs
index 593d5f9391..a316a0e6a6 100644
--- a/nuttx/configs/olimex-lpc1766stk/wlan/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/wlan/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/olimex-lpc2378/nsh/Make.defs b/nuttx/configs/olimex-lpc2378/nsh/Make.defs
index 2821aa73c2..022f3670b7 100644
--- a/nuttx/configs/olimex-lpc2378/nsh/Make.defs
+++ b/nuttx/configs/olimex-lpc2378/nsh/Make.defs
@@ -129,7 +129,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/olimex-lpc2378/ostest/Make.defs b/nuttx/configs/olimex-lpc2378/ostest/Make.defs
index 69be8db5b1..043f7ad8e9 100644
--- a/nuttx/configs/olimex-lpc2378/ostest/Make.defs
+++ b/nuttx/configs/olimex-lpc2378/ostest/Make.defs
@@ -129,7 +129,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/olimex-stm32-p107/nsh/Make.defs b/nuttx/configs/olimex-stm32-p107/nsh/Make.defs
index 5175c2f8f6..3314a82bef 100644
--- a/nuttx/configs/olimex-stm32-p107/nsh/Make.defs
+++ b/nuttx/configs/olimex-stm32-p107/nsh/Make.defs
@@ -129,7 +129,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/olimex-stm32-p107/ostest/Make.defs b/nuttx/configs/olimex-stm32-p107/ostest/Make.defs
index 28c9ab8138..fdceac03ba 100644
--- a/nuttx/configs/olimex-stm32-p107/ostest/Make.defs
+++ b/nuttx/configs/olimex-stm32-p107/ostest/Make.defs
@@ -129,7 +129,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/olimex-strp711/nettest/Make.defs b/nuttx/configs/olimex-strp711/nettest/Make.defs
index e4b8a9852c..1c751be09d 100644
--- a/nuttx/configs/olimex-strp711/nettest/Make.defs
+++ b/nuttx/configs/olimex-strp711/nettest/Make.defs
@@ -110,7 +110,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/olimex-strp711/nsh/Make.defs b/nuttx/configs/olimex-strp711/nsh/Make.defs
index 9ef265d0e1..d2c674d3a5 100644
--- a/nuttx/configs/olimex-strp711/nsh/Make.defs
+++ b/nuttx/configs/olimex-strp711/nsh/Make.defs
@@ -110,7 +110,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/olimex-strp711/ostest/Make.defs b/nuttx/configs/olimex-strp711/ostest/Make.defs
index f4bb09d991..37adf602a4 100644
--- a/nuttx/configs/olimex-strp711/ostest/Make.defs
+++ b/nuttx/configs/olimex-strp711/ostest/Make.defs
@@ -110,7 +110,7 @@ AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
 			  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
diff --git a/nuttx/configs/pcblogic-pic32mx/nsh/Make.defs b/nuttx/configs/pcblogic-pic32mx/nsh/Make.defs
index ecc50dc29d..9608ce0ee4 100644
--- a/nuttx/configs/pcblogic-pic32mx/nsh/Make.defs
+++ b/nuttx/configs/pcblogic-pic32mx/nsh/Make.defs
@@ -118,7 +118,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/pcblogic-pic32mx/ostest/Make.defs b/nuttx/configs/pcblogic-pic32mx/ostest/Make.defs
index 31be1dc8d6..0376ee339f 100644
--- a/nuttx/configs/pcblogic-pic32mx/ostest/Make.defs
+++ b/nuttx/configs/pcblogic-pic32mx/ostest/Make.defs
@@ -118,7 +118,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/pic32-starterkit/nsh/Make.defs b/nuttx/configs/pic32-starterkit/nsh/Make.defs
index 9f8762bf78..962801567f 100644
--- a/nuttx/configs/pic32-starterkit/nsh/Make.defs
+++ b/nuttx/configs/pic32-starterkit/nsh/Make.defs
@@ -118,7 +118,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/pic32-starterkit/nsh2/Make.defs b/nuttx/configs/pic32-starterkit/nsh2/Make.defs
index 08be39d396..2068db849d 100644
--- a/nuttx/configs/pic32-starterkit/nsh2/Make.defs
+++ b/nuttx/configs/pic32-starterkit/nsh2/Make.defs
@@ -118,7 +118,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/pic32-starterkit/ostest/Make.defs b/nuttx/configs/pic32-starterkit/ostest/Make.defs
index d00518b98f..370ac7f1fb 100644
--- a/nuttx/configs/pic32-starterkit/ostest/Make.defs
+++ b/nuttx/configs/pic32-starterkit/ostest/Make.defs
@@ -118,7 +118,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/pic32mx7mmb/nsh/Make.defs b/nuttx/configs/pic32mx7mmb/nsh/Make.defs
index 608a31442a..ed776bc191 100644
--- a/nuttx/configs/pic32mx7mmb/nsh/Make.defs
+++ b/nuttx/configs/pic32mx7mmb/nsh/Make.defs
@@ -118,7 +118,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/pic32mx7mmb/ostest/Make.defs b/nuttx/configs/pic32mx7mmb/ostest/Make.defs
index a203f30e9f..54806fb95a 100644
--- a/nuttx/configs/pic32mx7mmb/ostest/Make.defs
+++ b/nuttx/configs/pic32mx7mmb/ostest/Make.defs
@@ -118,7 +118,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/sam3u-ek/README.txt b/nuttx/configs/sam3u-ek/README.txt
index b13c689457..91f8824098 100644
--- a/nuttx/configs/sam3u-ek/README.txt
+++ b/nuttx/configs/sam3u-ek/README.txt
@@ -172,12 +172,14 @@ NuttX OABI "buildroot" Toolchain
      configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
      configuration such as cortexm3-defconfig-4.3.3
 
-  2. Modify the Make.defs file to use the OABI converntions:
+  2. Modify the Make.defs file to use the OABI conventions:
 
     +CROSSDEV = arm-nuttx-elf-
     +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    +NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
     -CROSSDEV = arm-nuttx-eabi-
     -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+    -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 
 NXFLAT Toolchain
 ^^^^^^^^^^^^^^^^
diff --git a/nuttx/configs/sam3u-ek/knsh/Make.defs b/nuttx/configs/sam3u-ek/knsh/Make.defs
index f65420bcf0..a402a4d512 100644
--- a/nuttx/configs/sam3u-ek/knsh/Make.defs
+++ b/nuttx/configs/sam3u-ek/knsh/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/sam3u-ek/nsh/Make.defs b/nuttx/configs/sam3u-ek/nsh/Make.defs
index c73b1f785a..5bf989aad8 100644
--- a/nuttx/configs/sam3u-ek/nsh/Make.defs
+++ b/nuttx/configs/sam3u-ek/nsh/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/sam3u-ek/nx/Make.defs b/nuttx/configs/sam3u-ek/nx/Make.defs
index 31b4407818..e4140a1103 100644
--- a/nuttx/configs/sam3u-ek/nx/Make.defs
+++ b/nuttx/configs/sam3u-ek/nx/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/sam3u-ek/ostest/Make.defs b/nuttx/configs/sam3u-ek/ostest/Make.defs
index 9fcea29f61..8c765976b1 100644
--- a/nuttx/configs/sam3u-ek/ostest/Make.defs
+++ b/nuttx/configs/sam3u-ek/ostest/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/sam3u-ek/touchscreen/Make.defs b/nuttx/configs/sam3u-ek/touchscreen/Make.defs
index fb8ab9358a..99410a652c 100644
--- a/nuttx/configs/sam3u-ek/touchscreen/Make.defs
+++ b/nuttx/configs/sam3u-ek/touchscreen/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/shenzhou/README.txt b/nuttx/configs/shenzhou/README.txt
index c04c55ad02..ff4cf74508 100644
--- a/nuttx/configs/shenzhou/README.txt
+++ b/nuttx/configs/shenzhou/README.txt
@@ -40,7 +40,9 @@ Contents
   - Development Environment
   - GNU Toolchain Options
   - IDEs
-  - NuttX buildroot Toolchain
+  - NuttX EABI buildroot Toolchain
+  - NuttX OABI buildroot Toolchain
+  - NXFLAT Toolchain
   - Shenzhou-specific Configuration Options
   - LEDs
   - Shenzhou-specific Configuration Options
@@ -330,8 +332,8 @@ IDEs
   one time from the Cygwin command line in order to obtain the pre-built
   startup object needed by RIDE.
 
-NuttX buildroot Toolchain
-=========================
+NuttX EABI buildroot Toolchain
+==============================
 
   A GNU GCC-based toolchain is assumed.  The files */setenv.sh should
   be modified to point to the correct path to the Cortex-M3 GCC toolchain (if
@@ -382,6 +384,58 @@ NuttX buildroot Toolchain
   detailed PLUS some special instructions that you will need to follow if you are
   building a Cortex-M3 toolchain for Cygwin under Windows.
 
+NuttX OABI "buildroot" Toolchain
+================================
+
+  The older, OABI buildroot toolchain is also available.  To use the OABI
+  toolchain:
+
+  1. When building the buildroot toolchain, either (1) modify the cortexm3-eabi-defconfig-4.6.3
+     configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
+     configuration such as cortexm3-defconfig-4.3.3
+
+  2. Modify the Make.defs file to use the OABI conventions:
+
+    +CROSSDEV = arm-nuttx-elf-
+    +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    +NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
+    -CROSSDEV = arm-nuttx-eabi-
+    -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+    -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
+
+NXFLAT Toolchain
+================
+
+  If you are *not* using the NuttX buildroot toolchain and you want to use
+  the NXFLAT tools, then you will still have to build a portion of the buildroot
+  tools -- just the NXFLAT tools.  The buildroot with the NXFLAT tools can
+  be downloaded from the NuttX SourceForge download site
+  (https://sourceforge.net/projects/nuttx/files/).
+ 
+  This GNU toolchain builds and executes in the Linux or Cygwin environment.
+
+  1. You must have already configured Nuttx in <some-dir>/nuttx.
+
+     cd tools
+     ./configure.sh lpcxpresso-lpc1768/<sub-dir>
+
+  2. Download the latest buildroot package into <some-dir>
+
+  3. unpack the buildroot tarball.  The resulting directory may
+     have versioning information on it like buildroot-x.y.z.  If so,
+     rename <some-dir>/buildroot-x.y.z to <some-dir>/buildroot.
+
+  4. cd <some-dir>/buildroot
+
+  5. cp configs/cortexm3-defconfig-nxflat .config
+
+  6. make oldconfig
+
+  7. make
+
+  8. Edit setenv.h, if necessary, so that the PATH variable includes
+     the path to the newly builtNXFLAT binaries.
+
 LEDs
 ====
 
diff --git a/nuttx/configs/shenzhou/nsh/Make.defs b/nuttx/configs/shenzhou/nsh/Make.defs
index 588bb27600..2318e6c9cb 100644
--- a/nuttx/configs/shenzhou/nsh/Make.defs
+++ b/nuttx/configs/shenzhou/nsh/Make.defs
@@ -151,7 +151,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/shenzhou/nxwm/Make.defs b/nuttx/configs/shenzhou/nxwm/Make.defs
index d94f0c38a1..84e0df782d 100644
--- a/nuttx/configs/shenzhou/nxwm/Make.defs
+++ b/nuttx/configs/shenzhou/nxwm/Make.defs
@@ -151,7 +151,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3210e-eval/README.txt b/nuttx/configs/stm3210e-eval/README.txt
index 704fadb62c..65f511320a 100644
--- a/nuttx/configs/stm3210e-eval/README.txt
+++ b/nuttx/configs/stm3210e-eval/README.txt
@@ -180,12 +180,14 @@ NuttX OABI "buildroot" Toolchain
      configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
      configuration such as cortexm3-defconfig-4.3.3
 
-  2. Modify the Make.defs file to use the OABI converntions:
+  2. Modify the Make.defs file to use the OABI conventions:
 
     +CROSSDEV = arm-nuttx-elf-
     +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    +NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
     -CROSSDEV = arm-nuttx-eabi-
     -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+    -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 
 NXFLAT Toolchain
 ================
diff --git a/nuttx/configs/stm3210e-eval/RIDE/Make.defs b/nuttx/configs/stm3210e-eval/RIDE/Make.defs
index 30dfda704b..6e69590c7a 100644
--- a/nuttx/configs/stm3210e-eval/RIDE/Make.defs
+++ b/nuttx/configs/stm3210e-eval/RIDE/Make.defs
@@ -129,7 +129,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3210e-eval/buttons/Make.defs b/nuttx/configs/stm3210e-eval/buttons/Make.defs
index f18619f80c..860d81c1fb 100644
--- a/nuttx/configs/stm3210e-eval/buttons/Make.defs
+++ b/nuttx/configs/stm3210e-eval/buttons/Make.defs
@@ -129,7 +129,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3210e-eval/composite/Make.defs b/nuttx/configs/stm3210e-eval/composite/Make.defs
index 8486635736..c0d85bf227 100644
--- a/nuttx/configs/stm3210e-eval/composite/Make.defs
+++ b/nuttx/configs/stm3210e-eval/composite/Make.defs
@@ -129,7 +129,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3210e-eval/nsh/Make.defs b/nuttx/configs/stm3210e-eval/nsh/Make.defs
index e3e4888fed..03d19fbc80 100644
--- a/nuttx/configs/stm3210e-eval/nsh/Make.defs
+++ b/nuttx/configs/stm3210e-eval/nsh/Make.defs
@@ -129,7 +129,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3210e-eval/nsh2/Make.defs b/nuttx/configs/stm3210e-eval/nsh2/Make.defs
index 3305166962..f84c115529 100644
--- a/nuttx/configs/stm3210e-eval/nsh2/Make.defs
+++ b/nuttx/configs/stm3210e-eval/nsh2/Make.defs
@@ -129,7 +129,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3210e-eval/nx/Make.defs b/nuttx/configs/stm3210e-eval/nx/Make.defs
index 6aaa6644be..7f253873a1 100644
--- a/nuttx/configs/stm3210e-eval/nx/Make.defs
+++ b/nuttx/configs/stm3210e-eval/nx/Make.defs
@@ -129,7 +129,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3210e-eval/nxconsole/Make.defs b/nuttx/configs/stm3210e-eval/nxconsole/Make.defs
index 7b2be02a51..8993a53aab 100644
--- a/nuttx/configs/stm3210e-eval/nxconsole/Make.defs
+++ b/nuttx/configs/stm3210e-eval/nxconsole/Make.defs
@@ -131,7 +131,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3210e-eval/nxlines/Make.defs b/nuttx/configs/stm3210e-eval/nxlines/Make.defs
index 1469658a0e..190ed098f8 100644
--- a/nuttx/configs/stm3210e-eval/nxlines/Make.defs
+++ b/nuttx/configs/stm3210e-eval/nxlines/Make.defs
@@ -131,7 +131,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3210e-eval/nxtext/Make.defs b/nuttx/configs/stm3210e-eval/nxtext/Make.defs
index b130e56225..d4f8ec2fe3 100644
--- a/nuttx/configs/stm3210e-eval/nxtext/Make.defs
+++ b/nuttx/configs/stm3210e-eval/nxtext/Make.defs
@@ -131,7 +131,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3210e-eval/ostest/Make.defs b/nuttx/configs/stm3210e-eval/ostest/Make.defs
index bd50d3b69d..ef1a3d4234 100644
--- a/nuttx/configs/stm3210e-eval/ostest/Make.defs
+++ b/nuttx/configs/stm3210e-eval/ostest/Make.defs
@@ -129,7 +129,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3210e-eval/pm/Make.defs b/nuttx/configs/stm3210e-eval/pm/Make.defs
index 6ad7e3a4ca..a60e4a7745 100644
--- a/nuttx/configs/stm3210e-eval/pm/Make.defs
+++ b/nuttx/configs/stm3210e-eval/pm/Make.defs
@@ -129,7 +129,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3210e-eval/usbserial/Make.defs b/nuttx/configs/stm3210e-eval/usbserial/Make.defs
index 586c361a92..f08d5b68c4 100644
--- a/nuttx/configs/stm3210e-eval/usbserial/Make.defs
+++ b/nuttx/configs/stm3210e-eval/usbserial/Make.defs
@@ -129,7 +129,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3210e-eval/usbstorage/Make.defs b/nuttx/configs/stm3210e-eval/usbstorage/Make.defs
index c305b42c9f..7f2cb73b66 100644
--- a/nuttx/configs/stm3210e-eval/usbstorage/Make.defs
+++ b/nuttx/configs/stm3210e-eval/usbstorage/Make.defs
@@ -129,7 +129,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3220g-eval/README.txt b/nuttx/configs/stm3220g-eval/README.txt
index 79311150d3..36fd75d256 100644
--- a/nuttx/configs/stm3220g-eval/README.txt
+++ b/nuttx/configs/stm3220g-eval/README.txt
@@ -219,12 +219,14 @@ NuttX OABI "buildroot" Toolchain
      configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
      configuration such as cortexm3-defconfig-4.3.3
 
-  2. Modify the Make.defs file to use the OABI converntions:
+  2. Modify the Make.defs file to use the OABI conventions:
 
     +CROSSDEV = arm-nuttx-elf-
     +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    +NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
     -CROSSDEV = arm-nuttx-eabi-
     -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+    -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 
 NXFLAT Toolchain
 ================
diff --git a/nuttx/configs/stm3220g-eval/dhcpd/Make.defs b/nuttx/configs/stm3220g-eval/dhcpd/Make.defs
index 3f2c4e0661..e8bb28c762 100644
--- a/nuttx/configs/stm3220g-eval/dhcpd/Make.defs
+++ b/nuttx/configs/stm3220g-eval/dhcpd/Make.defs
@@ -153,7 +153,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3220g-eval/nettest/Make.defs b/nuttx/configs/stm3220g-eval/nettest/Make.defs
index c6b2f895b1..2c6b8a1f4e 100644
--- a/nuttx/configs/stm3220g-eval/nettest/Make.defs
+++ b/nuttx/configs/stm3220g-eval/nettest/Make.defs
@@ -153,7 +153,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3220g-eval/nsh/Make.defs b/nuttx/configs/stm3220g-eval/nsh/Make.defs
index 3bd7c15283..834db56bca 100644
--- a/nuttx/configs/stm3220g-eval/nsh/Make.defs
+++ b/nuttx/configs/stm3220g-eval/nsh/Make.defs
@@ -153,7 +153,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3220g-eval/nsh2/Make.defs b/nuttx/configs/stm3220g-eval/nsh2/Make.defs
index dfd41d5c53..f29c472148 100644
--- a/nuttx/configs/stm3220g-eval/nsh2/Make.defs
+++ b/nuttx/configs/stm3220g-eval/nsh2/Make.defs
@@ -153,7 +153,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3220g-eval/nxwm/Make.defs b/nuttx/configs/stm3220g-eval/nxwm/Make.defs
index 65442d7312..4b770ba64e 100644
--- a/nuttx/configs/stm3220g-eval/nxwm/Make.defs
+++ b/nuttx/configs/stm3220g-eval/nxwm/Make.defs
@@ -153,7 +153,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3220g-eval/ostest/Make.defs b/nuttx/configs/stm3220g-eval/ostest/Make.defs
index 270d533394..a67036f78a 100644
--- a/nuttx/configs/stm3220g-eval/ostest/Make.defs
+++ b/nuttx/configs/stm3220g-eval/ostest/Make.defs
@@ -153,7 +153,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3220g-eval/telnetd/Make.defs b/nuttx/configs/stm3220g-eval/telnetd/Make.defs
index 0d7f1a078f..4a69279062 100644
--- a/nuttx/configs/stm3220g-eval/telnetd/Make.defs
+++ b/nuttx/configs/stm3220g-eval/telnetd/Make.defs
@@ -153,7 +153,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3240g-eval/README.txt b/nuttx/configs/stm3240g-eval/README.txt
index d77609e126..6da18b7e50 100644
--- a/nuttx/configs/stm3240g-eval/README.txt
+++ b/nuttx/configs/stm3240g-eval/README.txt
@@ -226,12 +226,14 @@ NuttX OABI "buildroot" Toolchain
      configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
      configuration such as cortexm3-defconfig-4.3.3
 
-  2. Modify the Make.defs file to use the OABI converntions:
+  2. Modify the Make.defs file to use the OABI conventions:
 
     +CROSSDEV = arm-nuttx-elf-
     +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    +NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
     -CROSSDEV = arm-nuttx-eabi-
     -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+    -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 
 NXFLAT Toolchain
 ================
diff --git a/nuttx/configs/stm3240g-eval/dhcpd/Make.defs b/nuttx/configs/stm3240g-eval/dhcpd/Make.defs
index e84648b105..5b1334a073 100644
--- a/nuttx/configs/stm3240g-eval/dhcpd/Make.defs
+++ b/nuttx/configs/stm3240g-eval/dhcpd/Make.defs
@@ -153,7 +153,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3240g-eval/discover/Make.defs b/nuttx/configs/stm3240g-eval/discover/Make.defs
index 561bed1e0c..58afd39038 100644
--- a/nuttx/configs/stm3240g-eval/discover/Make.defs
+++ b/nuttx/configs/stm3240g-eval/discover/Make.defs
@@ -153,7 +153,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3240g-eval/nettest/Make.defs b/nuttx/configs/stm3240g-eval/nettest/Make.defs
index 71764aa24a..a7e4f9e077 100644
--- a/nuttx/configs/stm3240g-eval/nettest/Make.defs
+++ b/nuttx/configs/stm3240g-eval/nettest/Make.defs
@@ -153,7 +153,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3240g-eval/nsh/Make.defs b/nuttx/configs/stm3240g-eval/nsh/Make.defs
index 71da0724ab..d63876e754 100644
--- a/nuttx/configs/stm3240g-eval/nsh/Make.defs
+++ b/nuttx/configs/stm3240g-eval/nsh/Make.defs
@@ -153,7 +153,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3240g-eval/nsh2/Make.defs b/nuttx/configs/stm3240g-eval/nsh2/Make.defs
index 51aaf553ec..16fef33447 100644
--- a/nuttx/configs/stm3240g-eval/nsh2/Make.defs
+++ b/nuttx/configs/stm3240g-eval/nsh2/Make.defs
@@ -153,7 +153,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3240g-eval/nxconsole/Make.defs b/nuttx/configs/stm3240g-eval/nxconsole/Make.defs
index 34865b5c28..20fabfc9d2 100644
--- a/nuttx/configs/stm3240g-eval/nxconsole/Make.defs
+++ b/nuttx/configs/stm3240g-eval/nxconsole/Make.defs
@@ -153,7 +153,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3240g-eval/nxwm/Make.defs b/nuttx/configs/stm3240g-eval/nxwm/Make.defs
index b15333c96f..bf2da32464 100644
--- a/nuttx/configs/stm3240g-eval/nxwm/Make.defs
+++ b/nuttx/configs/stm3240g-eval/nxwm/Make.defs
@@ -153,7 +153,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3240g-eval/ostest/Make.defs b/nuttx/configs/stm3240g-eval/ostest/Make.defs
index 768a095f8e..c984a7e85c 100644
--- a/nuttx/configs/stm3240g-eval/ostest/Make.defs
+++ b/nuttx/configs/stm3240g-eval/ostest/Make.defs
@@ -153,7 +153,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3240g-eval/telnetd/Make.defs b/nuttx/configs/stm3240g-eval/telnetd/Make.defs
index 8255e07674..498ee33861 100644
--- a/nuttx/configs/stm3240g-eval/telnetd/Make.defs
+++ b/nuttx/configs/stm3240g-eval/telnetd/Make.defs
@@ -153,7 +153,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3240g-eval/webserver/Make.defs b/nuttx/configs/stm3240g-eval/webserver/Make.defs
index 855ca4186e..fb47d40050 100644
--- a/nuttx/configs/stm3240g-eval/webserver/Make.defs
+++ b/nuttx/configs/stm3240g-eval/webserver/Make.defs
@@ -152,7 +152,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm3240g-eval/xmlrpc/Make.defs b/nuttx/configs/stm3240g-eval/xmlrpc/Make.defs
index dab94db502..8f7fe96dc1 100644
--- a/nuttx/configs/stm3240g-eval/xmlrpc/Make.defs
+++ b/nuttx/configs/stm3240g-eval/xmlrpc/Make.defs
@@ -153,7 +153,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm32f4discovery/README.txt b/nuttx/configs/stm32f4discovery/README.txt
index 65b4bf7527..2054e90c63 100644
--- a/nuttx/configs/stm32f4discovery/README.txt
+++ b/nuttx/configs/stm32f4discovery/README.txt
@@ -223,12 +223,14 @@ NuttX OABI "buildroot" Toolchain
      configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
      configuration such as cortexm3-defconfig-4.3.3
 
-  2. Modify the Make.defs file to use the OABI converntions:
+  2. Modify the Make.defs file to use the OABI conventions:
 
     +CROSSDEV = arm-nuttx-elf-
     +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    +NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
     -CROSSDEV = arm-nuttx-eabi-
     -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+    -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 
 NXFLAT Toolchain
 ================
diff --git a/nuttx/configs/stm32f4discovery/nsh/Make.defs b/nuttx/configs/stm32f4discovery/nsh/Make.defs
index bab095abcc..ed1662af5d 100644
--- a/nuttx/configs/stm32f4discovery/nsh/Make.defs
+++ b/nuttx/configs/stm32f4discovery/nsh/Make.defs
@@ -153,7 +153,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm32f4discovery/nxlines/Make.defs b/nuttx/configs/stm32f4discovery/nxlines/Make.defs
index 042da6a928..cfdb79a74a 100644
--- a/nuttx/configs/stm32f4discovery/nxlines/Make.defs
+++ b/nuttx/configs/stm32f4discovery/nxlines/Make.defs
@@ -153,7 +153,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm32f4discovery/ostest/Make.defs b/nuttx/configs/stm32f4discovery/ostest/Make.defs
index 10025ad9d7..6ed8530ad2 100644
--- a/nuttx/configs/stm32f4discovery/ostest/Make.defs
+++ b/nuttx/configs/stm32f4discovery/ostest/Make.defs
@@ -153,7 +153,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/stm32f4discovery/pm/Make.defs b/nuttx/configs/stm32f4discovery/pm/Make.defs
index 1a67f1b8c4..3643548d47 100644
--- a/nuttx/configs/stm32f4discovery/pm/Make.defs
+++ b/nuttx/configs/stm32f4discovery/pm/Make.defs
@@ -153,7 +153,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/sure-pic32mx/nsh/Make.defs b/nuttx/configs/sure-pic32mx/nsh/Make.defs
index ac6df4056e..debf622d28 100644
--- a/nuttx/configs/sure-pic32mx/nsh/Make.defs
+++ b/nuttx/configs/sure-pic32mx/nsh/Make.defs
@@ -118,7 +118,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/sure-pic32mx/ostest/Make.defs b/nuttx/configs/sure-pic32mx/ostest/Make.defs
index ac93ceeb00..0c8d4346a5 100644
--- a/nuttx/configs/sure-pic32mx/ostest/Make.defs
+++ b/nuttx/configs/sure-pic32mx/ostest/Make.defs
@@ -118,7 +118,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/sure-pic32mx/usbnsh/Make.defs b/nuttx/configs/sure-pic32mx/usbnsh/Make.defs
index 8faadcf961..fa8d3700fa 100644
--- a/nuttx/configs/sure-pic32mx/usbnsh/Make.defs
+++ b/nuttx/configs/sure-pic32mx/usbnsh/Make.defs
@@ -118,7 +118,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/teensy/hello/Make.defs b/nuttx/configs/teensy/hello/Make.defs
index cca88363cd..b79a52ed91 100644
--- a/nuttx/configs/teensy/hello/Make.defs
+++ b/nuttx/configs/teensy/hello/Make.defs
@@ -107,7 +107,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/teensy/nsh/Make.defs b/nuttx/configs/teensy/nsh/Make.defs
index 13f8e79027..65838649cb 100644
--- a/nuttx/configs/teensy/nsh/Make.defs
+++ b/nuttx/configs/teensy/nsh/Make.defs
@@ -107,7 +107,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/teensy/usbstorage/Make.defs b/nuttx/configs/teensy/usbstorage/Make.defs
index 706daf81f6..fa2997fb06 100644
--- a/nuttx/configs/teensy/usbstorage/Make.defs
+++ b/nuttx/configs/teensy/usbstorage/Make.defs
@@ -107,7 +107,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/twr-k60n512/README.txt b/nuttx/configs/twr-k60n512/README.txt
index 3ac70cf7eb..27644deaef 100644
--- a/nuttx/configs/twr-k60n512/README.txt
+++ b/nuttx/configs/twr-k60n512/README.txt
@@ -437,12 +437,14 @@ NuttX OABI "buildroot" Toolchain
      configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
      configuration such as cortexm3-defconfig-4.3.3
 
-  2. Modify the Make.defs file to use the OABI converntions:
+  2. Modify the Make.defs file to use the OABI conventions:
 
     +CROSSDEV = arm-nuttx-elf-
     +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    +NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
     -CROSSDEV = arm-nuttx-eabi-
     -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+    -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 
 NXFLAT Toolchain
 ================
diff --git a/nuttx/configs/twr-k60n512/nsh/Make.defs b/nuttx/configs/twr-k60n512/nsh/Make.defs
index 7bb9f09d4a..f2922c575b 100644
--- a/nuttx/configs/twr-k60n512/nsh/Make.defs
+++ b/nuttx/configs/twr-k60n512/nsh/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/twr-k60n512/ostest/Make.defs b/nuttx/configs/twr-k60n512/ostest/Make.defs
index 9254223dca..871141640d 100644
--- a/nuttx/configs/twr-k60n512/ostest/Make.defs
+++ b/nuttx/configs/twr-k60n512/ostest/Make.defs
@@ -117,7 +117,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/ubw32/nsh/Make.defs b/nuttx/configs/ubw32/nsh/Make.defs
index ca73b9defd..07a966446f 100644
--- a/nuttx/configs/ubw32/nsh/Make.defs
+++ b/nuttx/configs/ubw32/nsh/Make.defs
@@ -118,7 +118,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/ubw32/ostest/Make.defs b/nuttx/configs/ubw32/ostest/Make.defs
index 739d78075e..4f2971768d 100644
--- a/nuttx/configs/ubw32/ostest/Make.defs
+++ b/nuttx/configs/ubw32/ostest/Make.defs
@@ -118,7 +118,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/configs/vsn/README.txt b/nuttx/configs/vsn/README.txt
index b05ffa5dde..ae5f374ddd 100644
--- a/nuttx/configs/vsn/README.txt
+++ b/nuttx/configs/vsn/README.txt
@@ -177,12 +177,14 @@ NuttX OABI "buildroot" Toolchain
      configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
      configuration such as cortexm3-defconfig-4.3.3
 
-  2. Modify the Make.defs file to use the OABI converntions:
+  2. Modify the Make.defs file to use the OABI conventions:
 
     +CROSSDEV = arm-nuttx-elf-
     +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    +NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
     -CROSSDEV = arm-nuttx-eabi-
     -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+    -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 
 NXFLAT Toolchain
 ^^^^^^^^^^^^^^^^
diff --git a/nuttx/configs/vsn/nsh/Make.defs b/nuttx/configs/vsn/nsh/Make.defs
index 292abcc726..64b972ee27 100644
--- a/nuttx/configs/vsn/nsh/Make.defs
+++ b/nuttx/configs/vsn/nsh/Make.defs
@@ -129,7 +129,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o

From 6cb1bc7e67e65faecdafc169b0f897645bb8ea83 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Wed, 10 Oct 2012 17:17:50 +0000
Subject: [PATCH 29/43] Oop.  Part of last change was still in the editor

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5226 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/binfmt/libnxflat/gnu-nxflat-pcrel.ld | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/nuttx/binfmt/libnxflat/gnu-nxflat-pcrel.ld b/nuttx/binfmt/libnxflat/gnu-nxflat-pcrel.ld
index eb79023d01..71e4399ba9 100644
--- a/nuttx/binfmt/libnxflat/gnu-nxflat-pcrel.ld
+++ b/nuttx/binfmt/libnxflat/gnu-nxflat-pcrel.ld
@@ -97,6 +97,15 @@ SECTIONS
       *(.call_table_data)
       *(.call_table_text)
 
+      /* In this model, .rodata is access using PC-relative addressing
+       * and, hence, must also reside in the .text section.
+       */
+
+      *(.rodata)
+      *(.rodata1)
+      *(.rodata.*)
+      *(.gnu.linkonce.r*)
+
       _etext = . ;
 
     } > ISPACE
@@ -108,10 +117,6 @@ SECTIONS
   .data 0x00000000 :
     {
       __data_start = . ;
-      *(.rodata)
-      *(.rodata1)
-      *(.rodata.*)
-      *(.gnu.linkonce.r*)
       *(.data)
       *(.data1)
       *(.data.*)

From b71fcbb0de3d1e1ad8011303ade8bc38c83486d2 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Wed, 10 Oct 2012 19:36:32 +0000
Subject: [PATCH 30/43] More fixes for ldnxflat.  There are still problems with
 the GCC 4.6.3

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5227 42af7a65-404d-4744-a932-0658087f49c3
---
 misc/buildroot/ChangeLog                    |  3 +
 misc/buildroot/toolchain/nxflat/ldnxflat.c  | 97 +++++++++++++++++----
 nuttx/Documentation/NuttXNxFlat.html        |  2 +-
 nuttx/TODO                                  | 42 ++++++++-
 nuttx/binfmt/libnxflat/gnu-nxflat-gotoff.ld |  5 ++
 5 files changed, 131 insertions(+), 18 deletions(-)

diff --git a/misc/buildroot/ChangeLog b/misc/buildroot/ChangeLog
index 3cfd60bf2e..cdbef5da14 100644
--- a/misc/buildroot/ChangeLog
+++ b/misc/buildroot/ChangeLog
@@ -123,4 +123,7 @@ buildroot-1.11 2011-xx-xx <gnutt@nuttx.org>
 	  type was not generated by GCC/LD prior to gcc-4.6.3
 	* R_ARM_REL32 logic is conditionally disabled because it has not been
 	  tested.
+	* ldnxflat: Correct a memory allocation error that could cause written
+	  past the end of allocated memory.  Partial restoration of R_ARM_REL32
+	  logic.  There are lots of issues that I still do not understand here.
 
diff --git a/misc/buildroot/toolchain/nxflat/ldnxflat.c b/misc/buildroot/toolchain/nxflat/ldnxflat.c
index 5343e6b438..39fc98ce98 100644
--- a/misc/buildroot/toolchain/nxflat/ldnxflat.c
+++ b/misc/buildroot/toolchain/nxflat/ldnxflat.c
@@ -800,11 +800,83 @@ static void alloc_got_entry(asymbol *sym)
 }
 
 /***********************************************************************
- * relocate_arm32
+ * relocate_rel32
  ***********************************************************************/
 
 static void
-relocate_arm32(arelent *relp, int32_t *target, symvalue sym_value)
+relocate_rel32(arelent *relp, int32_t *target, symvalue sym_value)
+{
+  reloc_howto_type      *how_to      = relp->howto;
+  asymbol               *rel_sym     = *relp->sym_ptr_ptr;
+  asection              *rel_section = rel_sym->section;
+  int32_t                value;
+  int32_t                temp;
+  int32_t                saved;
+  int                    reloc_type;
+
+  if (verbose > 1)
+    {
+      vdbg("  Original location %p is %08lx ",
+#ifdef ARCH_BIG_ENDIAN
+           target, (long)nxflat_swap32(*target));
+#else
+          target, (long)*target);
+#endif
+      if (verbose > 2)
+        {
+          printf("rsh %d ", how_to->rightshift);
+          printf(" sz %d ", how_to->size);
+          printf("bit %d ", how_to->bitsize);
+          printf("rel %d ", how_to->pc_relative);
+          printf("smask %08lx ", (long)how_to->src_mask);
+          printf("dmask %08lx ", (long)how_to->dst_mask);
+          printf("off %d ", how_to->pcrel_offset);
+        }
+
+      printf("\n");
+    }
+
+#ifdef ARCH_BIG_ENDIAN
+  saved = temp = (int32_t) nxflat_swap32(*target);
+#else
+  saved = temp = *target;
+#endif
+  /* Mask  and sign extend */
+
+  temp &= how_to->src_mask;
+  temp <<= (32 - how_to->bitsize);
+  temp >>= (32 - how_to->bitsize);
+
+  /* Calculate the new value:  Current value + VMA - current PC */
+
+  value = temp + sym_value + rel_section->vma - relp->address;
+
+  /* Offset */
+
+  temp += (value >> how_to->rightshift);
+
+  /* Mask upper bits from rollover */
+
+  temp &= how_to->dst_mask;
+
+  /* Replace data that was masked */
+
+  temp |= saved & (~how_to->dst_mask);
+
+  vdbg("  Modified location: %08lx\n", (long)temp);
+#ifdef ARCH_BIG_ENDIAN
+  *target = (long)nxflat_swap32(temp);
+#else
+  *target = (long)temp;
+#endif
+ }
+
+/***********************************************************************
+ * relocate_abs32
+ ***********************************************************************/
+
+static void
+relocate_abs32(arelent *relp, int32_t *target, symvalue sym_value)
 {
   reloc_howto_type      *how_to      = relp->howto;
   asymbol               *rel_sym     = *relp->sym_ptr_ptr;
@@ -901,7 +973,7 @@ relocate_arm32(arelent *relp, int32_t *target, symvalue sym_value)
   /* Re-allocate memory to include this relocation */
 
   relocs = (struct nxflat_reloc_s*)
-  realloc(nxflat_relocs, sizeof(struct nxflat_reloc_s) * nxflat_nrelocs + 1);
+  realloc(nxflat_relocs, sizeof(struct nxflat_reloc_s) * (nxflat_nrelocs + 1));
   if (!relocs)
     {
       err("Failed to re-allocate memory ABS32 relocations (%d relocations)\n",
@@ -1105,7 +1177,7 @@ resolve_segment_relocs(bfd *input_bfd, segment_info *inf, asymbol **syms)
                 dbg("Performing ABS32 link at addr %08lx [%08lx] to sym '%s' [%08lx]\n",
                      (long)relpp[j]->address, (long)*target, rel_sym->name, (long)sym_value);
 
-                relocate_arm32(relpp[j], target, sym_value);
+                relocate_abs32(relpp[j], target, sym_value);
               }
               break;
 
@@ -1114,18 +1186,12 @@ resolve_segment_relocs(bfd *input_bfd, segment_info *inf, asymbol **syms)
                 dbg("Performing REL32 link at addr %08lx [%08lx] to sym '%s' [%08lx]\n",
                      (long)relpp[j]->address, (long)*target, rel_sym->name, (long)sym_value);
 
-                /* The REL32 relocation is just like the ABS32 relocation except that (1)
-                 * the symbol value is relative to the PC, and (2) we cannot permit
-                 * REL32 relocations to data in I-Space.  That just would not make sense.
-                 */
-#if 1
-                /* The logic below may or may not be correct.  It has not been verified
-                 * so, for now, it is disabled.
+                /* The only valid REL32 relocation would be to relocate a reference from
+                 * I-Space to another symbol in I-Space.  That should be handled by the
+                 * partially linking logic so we don't expect to see any R_ARM_REL32
+                 * relocations here.
                  */
 
-                err("REL32 relocation not yet supported\n");
-                nerrors++;
-#else
                 switch (get_reloc_type(rel_section, NULL))
                   {
                     case NXFLAT_RELOC_TARGET_UNKNOWN:
@@ -1148,11 +1214,10 @@ resolve_segment_relocs(bfd *input_bfd, segment_info *inf, asymbol **syms)
                     case NXFLAT_RELOC_TARGET_TEXT:
                       {
                         vdbg("Symbol '%s' lies in I-Space\n", rel_sym->name);
-                        relocate_arm32(relpp[j], target, sym_value - relpp[j]->address);
+                        relocate_rel32(relpp[j], target, sym_value - relpp[j]->address);
                       }
                       break;
                   }
-#endif
               }
               break;
 
diff --git a/nuttx/Documentation/NuttXNxFlat.html b/nuttx/Documentation/NuttXNxFlat.html
index 4d70ed9c37..c51e3b6a1d 100644
--- a/nuttx/Documentation/NuttXNxFlat.html
+++ b/nuttx/Documentation/NuttXNxFlat.html
@@ -522,7 +522,7 @@ cat ../syscall/syscall.csv ../lib/lib.csv | sort >tmp.csv
 </p>
 
 <p><b>NOTE:</b>
-  There are two linker scripts located at <code>binfmt/libnxflat/gnu-nxflat-gotoff.ld</code>.
+  There are two linker scripts located at <code>binfmt/libnxflat/</code>.
 </p>
 <ol>
   <li>
diff --git a/nuttx/TODO b/nuttx/TODO
index 30015ef50b..90333c74ca 100644
--- a/nuttx/TODO
+++ b/nuttx/TODO
@@ -12,7 +12,7 @@ nuttx/
   (2)  Signals (sched/, arch/)
   (2)  pthreads (sched/)
   (2)  C++ Support
-  (5)  Binary loaders (binfmt/)
+  (6)  Binary loaders (binfmt/)
  (17)  Network (net/, drivers/net)
   (3)  USB (drivers/usbdev, drivers/usbhost)
  (11)  Libraries (lib/)
@@ -395,6 +395,46 @@ o Binary loaders (binfmt/)
   Priority:    There are too many references like the above.  They will have
                to get fixed as needed for Windows native tool builds.
 
+  Title:       TOOLCHAIN COMPATIBILITY PROBLEM
+  Descripton:  The older 4.3.3 compiler generates GOTOFF relocations to the constant
+               strings, like:
+
+               .L3:
+                  .word   .LC0(GOTOFF)
+                  .word   .LC1(GOTOFF)
+                  .word   .LC2(GOTOFF)
+                  .word   .LC3(GOTOFF)
+                  .word   .LC4(GOTOFF)
+
+               Where .LC0, LC1, LC2, LC3, and .LC4 are the labels correponding to strings in
+               the .rodata.str1.1 section.  One consequence of this is that .rodata must reside
+               in D-Space since it will addressed relative to the GOT (see the section entitled
+               "Read-Only Data in RAM" at
+               http://nuttx.org/Documentation/NuttXNxFlat.html#limitations).
+
+               The newer 4.6.3compiler generated PC relative relocations to the strings:
+
+               .L2:
+                  .word   .LC0-(.LPIC0+4)
+                  .word   .LC1-(.LPIC1+4)
+                  .word   .LC2-(.LPIC2+4)
+                  .word   .LC3-(.LPIC4+4)
+                  .word   .LC4-(.LPIC5+4)
+
+               This is good and bad.  This is good because it means that .rodata.str1.1 can not
+               reside in FLASH with .text and can be accessed using PC-relative addressing. 
+               That can be accomplished by simply moving the .rodata from the .data section to
+               the .text section in the linker script.  (The NXFLAT linker script is located at
+               nuttx/binfmt/libnxflat/gnu-nxflat.ld).
+
+               This is bad because a lot of stuff may get broken an a lot of test will need to
+               be done.  One question that I have is does this apply to all kinds of .rodata? 
+               Or just to .rodata.str1.1?
+  
+  Status:      Open.  Many of the required changes are in place but, unfortunately, not enought
+               go be fully functional.
+  Priority:    Medium.  The workaround for now is to use the older, 4.3.3 OABI compiler.
+
 o Network (net/, drivers/net)
   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/nuttx/binfmt/libnxflat/gnu-nxflat-gotoff.ld b/nuttx/binfmt/libnxflat/gnu-nxflat-gotoff.ld
index c0487212aa..47debd6633 100644
--- a/nuttx/binfmt/libnxflat/gnu-nxflat-gotoff.ld
+++ b/nuttx/binfmt/libnxflat/gnu-nxflat-gotoff.ld
@@ -107,11 +107,16 @@ SECTIONS
 
   .data 0x00000000 :
     {
+      /* In this model, .rodata is access using PC-relative addressing
+       * and, hence, must also reside in the .text section.
+       */
+
       __data_start = . ;
       *(.rodata)
       *(.rodata1)
       *(.rodata.*)
       *(.gnu.linkonce.r*)
+
       *(.data)
       *(.data1)
       *(.data.*)

From ca71c149e2a6d8c0b7c2aca8ae8c8571ab8d8a59 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Wed, 10 Oct 2012 19:58:57 +0000
Subject: [PATCH 31/43] Document problem with GCC 4.8.3 and the NXFLAT tools

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5228 42af7a65-404d-4744-a932-0658087f49c3
---
 misc/buildroot/toolchain/nxflat/ldnxflat.c  | 1 -
 nuttx/TODO                                  | 6 ++++--
 nuttx/configs/eagle100/README.txt           | 6 ++++++
 nuttx/configs/ekk-lm3s9b96/README.txt       | 6 ++++++
 nuttx/configs/fire-stm32v2/README.txt       | 6 ++++++
 nuttx/configs/hymini-stm32v/README.txt      | 6 ++++++
 nuttx/configs/kwikstik-k40/README.txt       | 6 ++++++
 nuttx/configs/lincoln60/README.txt          | 6 ++++++
 nuttx/configs/lm3s6432-s2e/README.txt       | 6 ++++++
 nuttx/configs/lm3s6965-ek/README.txt        | 6 +++++-
 nuttx/configs/lm3s8962-ek/README.txt        | 6 +++++-
 nuttx/configs/lpc4330-xplorer/README.txt    | 6 ++++++
 nuttx/configs/lpcxpresso-lpc1768/README.txt | 6 ++++++
 nuttx/configs/mbed/README.txt               | 6 ++++++
 nuttx/configs/nucleus2g/README.txt          | 6 ++++++
 nuttx/configs/olimex-lpc1766stk/README.txt  | 6 ++++++
 nuttx/configs/sam3u-ek/README.txt           | 6 ++++++
 nuttx/configs/shenzhou/README.txt           | 6 ++++++
 nuttx/configs/stm3210e-eval/README.txt      | 6 ++++++
 nuttx/configs/stm3220g-eval/README.txt      | 6 ++++++
 nuttx/configs/stm3240g-eval/README.txt      | 6 ++++++
 nuttx/configs/stm32f4discovery/README.txt   | 6 ++++++
 nuttx/configs/twr-k60n512/README.txt        | 6 ++++++
 nuttx/configs/vsn/README.txt                | 6 ++++++
 24 files changed, 134 insertions(+), 5 deletions(-)

diff --git a/misc/buildroot/toolchain/nxflat/ldnxflat.c b/misc/buildroot/toolchain/nxflat/ldnxflat.c
index 39fc98ce98..620df15667 100644
--- a/misc/buildroot/toolchain/nxflat/ldnxflat.c
+++ b/misc/buildroot/toolchain/nxflat/ldnxflat.c
@@ -812,7 +812,6 @@ relocate_rel32(arelent *relp, int32_t *target, symvalue sym_value)
   int32_t                value;
   int32_t                temp;
   int32_t                saved;
-  int                    reloc_type;
 
   if (verbose > 1)
     {
diff --git a/nuttx/TODO b/nuttx/TODO
index 90333c74ca..906601192c 100644
--- a/nuttx/TODO
+++ b/nuttx/TODO
@@ -431,8 +431,10 @@ o Binary loaders (binfmt/)
                be done.  One question that I have is does this apply to all kinds of .rodata? 
                Or just to .rodata.str1.1?
   
-  Status:      Open.  Many of the required changes are in place but, unfortunately, not enought
-               go be fully functional.
+  Status:      Open.  Many of the required changes are in place but, unfortunately, not enough
+               go be fully functional.  I think all of the I-Space-to-I-Space fixes are in place.
+               However, the generated code also includes PC-relative references to .bss which
+               just cannot be done.
   Priority:    Medium.  The workaround for now is to use the older, 4.3.3 OABI compiler.
 
 o Network (net/, drivers/net)
diff --git a/nuttx/configs/eagle100/README.txt b/nuttx/configs/eagle100/README.txt
index b4bca39cb6..d868817cc0 100644
--- a/nuttx/configs/eagle100/README.txt
+++ b/nuttx/configs/eagle100/README.txt
@@ -147,6 +147,12 @@ NuttX EABI "buildroot" Toolchain
   details PLUS some special instructions that you will need to follow if you are
   building a Cortex-M3 toolchain for Cygwin under Windows.
 
+  NOTE:  Unfortunately, the 4.6.3 EABI toolchain is not compatible with the
+  the NXFLAT tools.  See the top-level TODO file (under "Binary loaders") for
+  more information about this problem. If you plan to use NXFLAT, please do not
+  use the GCC 4.6.3 EABI toochain; instead use the GCC 4.3.3 OABI toolchain.
+  See instructions below.
+
 NuttX OABI "buildroot" Toolchain
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/nuttx/configs/ekk-lm3s9b96/README.txt b/nuttx/configs/ekk-lm3s9b96/README.txt
index 2ad4354779..78fe96ef55 100644
--- a/nuttx/configs/ekk-lm3s9b96/README.txt
+++ b/nuttx/configs/ekk-lm3s9b96/README.txt
@@ -225,6 +225,12 @@ NuttX EABI "buildroot" Toolchain
   details PLUS some special instructions that you will need to follow if you
   are building a Cortex-M3 toolchain for Cygwin under Windows.
 
+  NOTE:  Unfortunately, the 4.6.3 EABI toolchain is not compatible with the
+  the NXFLAT tools.  See the top-level TODO file (under "Binary loaders") for
+  more information about this problem. If you plan to use NXFLAT, please do not
+  use the GCC 4.6.3 EABI toochain; instead use the GCC 4.3.3 OABI toolchain.
+  See instructions below.
+
 NuttX OABI "buildroot" Toolchain
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/nuttx/configs/fire-stm32v2/README.txt b/nuttx/configs/fire-stm32v2/README.txt
index 9e5d94c230..0cf782a943 100644
--- a/nuttx/configs/fire-stm32v2/README.txt
+++ b/nuttx/configs/fire-stm32v2/README.txt
@@ -347,6 +347,12 @@ NuttX EABI "buildroot" Toolchain
   details PLUS some special instructions that you will need to follow if you are
   building a Cortex-M3 toolchain for Cygwin under Windows.
 
+  NOTE:  Unfortunately, the 4.6.3 EABI toolchain is not compatible with the
+  the NXFLAT tools.  See the top-level TODO file (under "Binary loaders") for
+  more information about this problem. If you plan to use NXFLAT, please do not
+  use the GCC 4.6.3 EABI toochain; instead use the GCC 4.3.3 OABI toolchain.
+  See instructions below.
+
 NuttX OABI "buildroot" Toolchain
 ================================
 
diff --git a/nuttx/configs/hymini-stm32v/README.txt b/nuttx/configs/hymini-stm32v/README.txt
index 51f3c1fe3b..2c8f3a16af 100644
--- a/nuttx/configs/hymini-stm32v/README.txt
+++ b/nuttx/configs/hymini-stm32v/README.txt
@@ -167,6 +167,12 @@ NuttX EABI "buildroot" Toolchain
   details PLUS some special instructions that you will need to follow if you are
   building a Cortex-M3 toolchain for Cygwin under Windows.
 
+  NOTE:  Unfortunately, the 4.6.3 EABI toolchain is not compatible with the
+  the NXFLAT tools.  See the top-level TODO file (under "Binary loaders") for
+  more information about this problem. If you plan to use NXFLAT, please do not
+  use the GCC 4.6.3 EABI toochain; instead use the GCC 4.3.3 OABI toolchain.
+  See instructions below.
+
 NuttX OABI "buildroot" Toolchain
 ================================
 
diff --git a/nuttx/configs/kwikstik-k40/README.txt b/nuttx/configs/kwikstik-k40/README.txt
index 246fa912e6..7a68fcffa8 100644
--- a/nuttx/configs/kwikstik-k40/README.txt
+++ b/nuttx/configs/kwikstik-k40/README.txt
@@ -290,6 +290,12 @@ NuttX EABI "buildroot" Toolchain
   details PLUS some special instructions that you will need to follow if you are
   building a Cortex-M4 toolchain for Cygwin under Windows.
 
+  NOTE:  Unfortunately, the 4.6.3 EABI toolchain is not compatible with the
+  the NXFLAT tools.  See the top-level TODO file (under "Binary loaders") for
+  more information about this problem. If you plan to use NXFLAT, please do not
+  use the GCC 4.6.3 EABI toochain; instead use the GCC 4.3.3 OABI toolchain.
+  See instructions below.
+
 NuttX OABI "buildroot" Toolchain
 ================================
 
diff --git a/nuttx/configs/lincoln60/README.txt b/nuttx/configs/lincoln60/README.txt
index 35fe32267c..07ca167cd1 100644
--- a/nuttx/configs/lincoln60/README.txt
+++ b/nuttx/configs/lincoln60/README.txt
@@ -189,6 +189,12 @@ NuttX EABI "buildroot" Toolchain
   details PLUS some special instructions that you will need to follow if you
   are building a Cortex-M3 toolchain for Cygwin under Windows.
 
+  NOTE:  Unfortunately, the 4.6.3 EABI toolchain is not compatible with the
+  the NXFLAT tools.  See the top-level TODO file (under "Binary loaders") for
+  more information about this problem. If you plan to use NXFLAT, please do not
+  use the GCC 4.6.3 EABI toochain; instead use the GCC 4.3.3 OABI toolchain.
+  See instructions below.
+
 NuttX OABI "buildroot" Toolchain
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/nuttx/configs/lm3s6432-s2e/README.txt b/nuttx/configs/lm3s6432-s2e/README.txt
index 460b5546d7..3630ccc5ec 100644
--- a/nuttx/configs/lm3s6432-s2e/README.txt
+++ b/nuttx/configs/lm3s6432-s2e/README.txt
@@ -219,6 +219,12 @@ NuttX EABI "buildroot" Toolchain
   details PLUS some special instructions that you will need to follow if you
   are building a Cortex-M3 toolchain for Cygwin under Windows.
 
+  NOTE:  Unfortunately, the 4.6.3 EABI toolchain is not compatible with the
+  the NXFLAT tools.  See the top-level TODO file (under "Binary loaders") for
+  more information about this problem. If you plan to use NXFLAT, please do not
+  use the GCC 4.6.3 EABI toochain; instead use the GCC 4.3.3 OABI toolchain.
+  See instructions below.
+
 NuttX OABI "buildroot" Toolchain
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/nuttx/configs/lm3s6965-ek/README.txt b/nuttx/configs/lm3s6965-ek/README.txt
index 4aba09beeb..f6c32ee82a 100644
--- a/nuttx/configs/lm3s6965-ek/README.txt
+++ b/nuttx/configs/lm3s6965-ek/README.txt
@@ -249,7 +249,11 @@ NuttX EABI "buildroot" Toolchain
   details PLUS some special instructions that you will need to follow if you
   are building a Cortex-M3 toolchain for Cygwin under Windows.
 
-  NOTE: This is an OABI toolchain.
+  NOTE:  Unfortunately, the 4.6.3 EABI toolchain is not compatible with the
+  the NXFLAT tools.  See the top-level TODO file (under "Binary loaders") for
+  more information about this problem. If you plan to use NXFLAT, please do not
+  use the GCC 4.6.3 EABI toochain; instead use the GCC 4.3.3 OABI toolchain.
+  See instructions below.
 
 NuttX OABI "buildroot" Toolchain
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/nuttx/configs/lm3s8962-ek/README.txt b/nuttx/configs/lm3s8962-ek/README.txt
index 570d158a29..310edabc57 100644
--- a/nuttx/configs/lm3s8962-ek/README.txt
+++ b/nuttx/configs/lm3s8962-ek/README.txt
@@ -233,7 +233,11 @@ NuttX EABI "buildroot" Toolchain
   details PLUS some special instructions that you will need to follow if you
   are building a Cortex-M3 toolchain for Cygwin under Windows.
 
-  NOTE: This is an OABI toolchain.
+  NOTE:  Unfortunately, the 4.6.3 EABI toolchain is not compatible with the
+  the NXFLAT tools.  See the top-level TODO file (under "Binary loaders") for
+  more information about this problem. If you plan to use NXFLAT, please do not
+  use the GCC 4.6.3 EABI toochain; instead use the GCC 4.3.3 OABI toolchain.
+  See instructions below.
 
 NuttX OABI "buildroot" Toolchain
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/nuttx/configs/lpc4330-xplorer/README.txt b/nuttx/configs/lpc4330-xplorer/README.txt
index ea1098be54..8c88b5758b 100644
--- a/nuttx/configs/lpc4330-xplorer/README.txt
+++ b/nuttx/configs/lpc4330-xplorer/README.txt
@@ -501,6 +501,12 @@ NuttX EABI "buildroot" Toolchain
   details PLUS some special instructions that you will need to follow if you
   are building a Cortex-M3 toolchain for Cygwin under Windows.
 
+  NOTE:  Unfortunately, the 4.6.3 EABI toolchain is not compatible with the
+  the NXFLAT tools.  See the top-level TODO file (under "Binary loaders") for
+  more information about this problem. If you plan to use NXFLAT, please do not
+  use the GCC 4.6.3 EABI toochain; instead use the GCC 4.3.3 OABI toolchain.
+  See instructions below.
+
 NuttX OABI "buildroot" Toolchain
 ================================
 
diff --git a/nuttx/configs/lpcxpresso-lpc1768/README.txt b/nuttx/configs/lpcxpresso-lpc1768/README.txt
index cbc5f50e8c..8ea038514b 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/README.txt
+++ b/nuttx/configs/lpcxpresso-lpc1768/README.txt
@@ -445,6 +445,12 @@ NuttX EABI "buildroot" Toolchain
   details PLUS some special instructions that you will need to follow if you
   are building a Cortex-M3 toolchain for Cygwin under Windows.
 
+  NOTE:  Unfortunately, the 4.6.3 EABI toolchain is not compatible with the
+  the NXFLAT tools.  See the top-level TODO file (under "Binary loaders") for
+  more information about this problem. If you plan to use NXFLAT, please do not
+  use the GCC 4.6.3 EABI toochain; instead use the GCC 4.3.3 OABI toolchain.
+  See instructions below.
+
 NuttX OABI "buildroot" Toolchain
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/nuttx/configs/mbed/README.txt b/nuttx/configs/mbed/README.txt
index df509a199a..4b413560ab 100644
--- a/nuttx/configs/mbed/README.txt
+++ b/nuttx/configs/mbed/README.txt
@@ -159,6 +159,12 @@ NuttX EABI "buildroot" Toolchain
   details PLUS some special instructions that you will need to follow if you
   are building a Cortex-M3 toolchain for Cygwin under Windows.
 
+  NOTE:  Unfortunately, the 4.6.3 EABI toolchain is not compatible with the
+  the NXFLAT tools.  See the top-level TODO file (under "Binary loaders") for
+  more information about this problem. If you plan to use NXFLAT, please do not
+  use the GCC 4.6.3 EABI toochain; instead use the GCC 4.3.3 OABI toolchain.
+  See instructions below.
+
 NuttX OABI "buildroot" Toolchain
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/nuttx/configs/nucleus2g/README.txt b/nuttx/configs/nucleus2g/README.txt
index 39ae370ccc..86a8944abe 100644
--- a/nuttx/configs/nucleus2g/README.txt
+++ b/nuttx/configs/nucleus2g/README.txt
@@ -219,6 +219,12 @@ NuttX EABI "buildroot" Toolchain
   details PLUS some special instructions that you will need to follow if you
   are building a Cortex-M3 toolchain for Cygwin under Windows.
 
+  NOTE:  Unfortunately, the 4.6.3 EABI toolchain is not compatible with the
+  the NXFLAT tools.  See the top-level TODO file (under "Binary loaders") for
+  more information about this problem. If you plan to use NXFLAT, please do not
+  use the GCC 4.6.3 EABI toochain; instead use the GCC 4.3.3 OABI toolchain.
+  See instructions below.
+
 NuttX OABI "buildroot" Toolchain
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/nuttx/configs/olimex-lpc1766stk/README.txt b/nuttx/configs/olimex-lpc1766stk/README.txt
index dcea9d0b71..f53ed4647d 100644
--- a/nuttx/configs/olimex-lpc1766stk/README.txt
+++ b/nuttx/configs/olimex-lpc1766stk/README.txt
@@ -307,6 +307,12 @@ NuttX EABI "buildroot" Toolchain
   details PLUS some special instructions that you will need to follow if you
   are building a Cortex-M3 toolchain for Cygwin under Windows.
 
+  NOTE:  Unfortunately, the 4.6.3 EABI toolchain is not compatible with the
+  the NXFLAT tools.  See the top-level TODO file (under "Binary loaders") for
+  more information about this problem. If you plan to use NXFLAT, please do not
+  use the GCC 4.6.3 EABI toochain; instead use the GCC 4.3.3 OABI toolchain.
+  See instructions below.
+
 NuttX OABI "buildroot" Toolchain
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/nuttx/configs/sam3u-ek/README.txt b/nuttx/configs/sam3u-ek/README.txt
index 91f8824098..fa5d52b69c 100644
--- a/nuttx/configs/sam3u-ek/README.txt
+++ b/nuttx/configs/sam3u-ek/README.txt
@@ -162,6 +162,12 @@ NuttX EABI "buildroot" Toolchain
   details PLUS some special instructions that you will need to follow if you are
   building a Cortex-M3 toolchain for Cygwin under Windows.
 
+  NOTE:  Unfortunately, the 4.6.3 EABI toolchain is not compatible with the
+  the NXFLAT tools.  See the top-level TODO file (under "Binary loaders") for
+  more information about this problem. If you plan to use NXFLAT, please do not
+  use the GCC 4.6.3 EABI toochain; instead use the GCC 4.3.3 OABI toolchain.
+  See instructions below.
+
 NuttX OABI "buildroot" Toolchain
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/nuttx/configs/shenzhou/README.txt b/nuttx/configs/shenzhou/README.txt
index ff4cf74508..772c59a174 100644
--- a/nuttx/configs/shenzhou/README.txt
+++ b/nuttx/configs/shenzhou/README.txt
@@ -384,6 +384,12 @@ NuttX EABI buildroot Toolchain
   detailed PLUS some special instructions that you will need to follow if you are
   building a Cortex-M3 toolchain for Cygwin under Windows.
 
+  NOTE:  Unfortunately, the 4.6.3 EABI toolchain is not compatible with the
+  the NXFLAT tools.  See the top-level TODO file (under "Binary loaders") for
+  more information about this problem. If you plan to use NXFLAT, please do not
+  use the GCC 4.6.3 EABI toochain; instead use the GCC 4.3.3 OABI toolchain.
+  See instructions below.
+
 NuttX OABI "buildroot" Toolchain
 ================================
 
diff --git a/nuttx/configs/stm3210e-eval/README.txt b/nuttx/configs/stm3210e-eval/README.txt
index 65f511320a..50e413b42c 100644
--- a/nuttx/configs/stm3210e-eval/README.txt
+++ b/nuttx/configs/stm3210e-eval/README.txt
@@ -170,6 +170,12 @@ NuttX EABI "buildroot" Toolchain
   details PLUS some special instructions that you will need to follow if you are
   building a Cortex-M3 toolchain for Cygwin under Windows.
 
+  NOTE:  Unfortunately, the 4.6.3 EABI toolchain is not compatible with the
+  the NXFLAT tools.  See the top-level TODO file (under "Binary loaders") for
+  more information about this problem. If you plan to use NXFLAT, please do not
+  use the GCC 4.6.3 EABI toochain; instead use the GCC 4.3.3 OABI toolchain.
+  See instructions below.
+
 NuttX OABI "buildroot" Toolchain
 ================================
 
diff --git a/nuttx/configs/stm3220g-eval/README.txt b/nuttx/configs/stm3220g-eval/README.txt
index 36fd75d256..58a6f156c4 100644
--- a/nuttx/configs/stm3220g-eval/README.txt
+++ b/nuttx/configs/stm3220g-eval/README.txt
@@ -209,6 +209,12 @@ NuttX EABI "buildroot" Toolchain
   details PLUS some special instructions that you will need to follow if you are
   building a Cortex-M3 toolchain for Cygwin under Windows.
 
+  NOTE:  Unfortunately, the 4.6.3 EABI toolchain is not compatible with the
+  the NXFLAT tools.  See the top-level TODO file (under "Binary loaders") for
+  more information about this problem. If you plan to use NXFLAT, please do not
+  use the GCC 4.6.3 EABI toochain; instead use the GCC 4.3.3 OABI toolchain.
+  See instructions below.
+
 NuttX OABI "buildroot" Toolchain
 ================================
 
diff --git a/nuttx/configs/stm3240g-eval/README.txt b/nuttx/configs/stm3240g-eval/README.txt
index 6da18b7e50..8604f344a5 100644
--- a/nuttx/configs/stm3240g-eval/README.txt
+++ b/nuttx/configs/stm3240g-eval/README.txt
@@ -216,6 +216,12 @@ NuttX EABI "buildroot" Toolchain
   details PLUS some special instructions that you will need to follow if you are
   building a Cortex-M3 toolchain for Cygwin under Windows.
 
+  NOTE:  Unfortunately, the 4.6.3 EABI toolchain is not compatible with the
+  the NXFLAT tools.  See the top-level TODO file (under "Binary loaders") for
+  more information about this problem. If you plan to use NXFLAT, please do not
+  use the GCC 4.6.3 EABI toochain; instead use the GCC 4.3.3 OABI toolchain.
+  See instructions below.
+
 NuttX OABI "buildroot" Toolchain
 ================================
 
diff --git a/nuttx/configs/stm32f4discovery/README.txt b/nuttx/configs/stm32f4discovery/README.txt
index 2054e90c63..dc25b220e4 100644
--- a/nuttx/configs/stm32f4discovery/README.txt
+++ b/nuttx/configs/stm32f4discovery/README.txt
@@ -213,6 +213,12 @@ NuttX EABI "buildroot" Toolchain
   details PLUS some special instructions that you will need to follow if you are
   building a Cortex-M3 toolchain for Cygwin under Windows.
 
+  NOTE:  Unfortunately, the 4.6.3 EABI toolchain is not compatible with the
+  the NXFLAT tools.  See the top-level TODO file (under "Binary loaders") for
+  more information about this problem. If you plan to use NXFLAT, please do not
+  use the GCC 4.6.3 EABI toochain; instead use the GCC 4.3.3 OABI toolchain.
+  See instructions below.
+
 NuttX OABI "buildroot" Toolchain
 ================================
 
diff --git a/nuttx/configs/twr-k60n512/README.txt b/nuttx/configs/twr-k60n512/README.txt
index 27644deaef..3b7b402d7e 100644
--- a/nuttx/configs/twr-k60n512/README.txt
+++ b/nuttx/configs/twr-k60n512/README.txt
@@ -427,6 +427,12 @@ NuttX EABI "buildroot" Toolchain
   details PLUS some special instructions that you will need to follow if you are
   building a Cortex-M4 toolchain for Cygwin under Windows.
 
+  NOTE:  Unfortunately, the 4.6.3 EABI toolchain is not compatible with the
+  the NXFLAT tools.  See the top-level TODO file (under "Binary loaders") for
+  more information about this problem. If you plan to use NXFLAT, please do not
+  use the GCC 4.6.3 EABI toochain; instead use the GCC 4.3.3 OABI toolchain.
+  See instructions below.
+
 NuttX OABI "buildroot" Toolchain
 ================================
 
diff --git a/nuttx/configs/vsn/README.txt b/nuttx/configs/vsn/README.txt
index ae5f374ddd..657cfdd899 100644
--- a/nuttx/configs/vsn/README.txt
+++ b/nuttx/configs/vsn/README.txt
@@ -167,6 +167,12 @@ NuttX EABI "buildroot" Toolchain
   details PLUS some special instructions that you will need to follow if you are
   building a Cortex-M3 toolchain for Cygwin under Windows.
 
+  NOTE:  Unfortunately, the 4.6.3 EABI toolchain is not compatible with the
+  the NXFLAT tools.  See the top-level TODO file (under "Binary loaders") for
+  more information about this problem. If you plan to use NXFLAT, please do not
+  use the GCC 4.6.3 EABI toochain; instead use the GCC 4.3.3 OABI toolchain.
+  See instructions below.
+
 NuttX OABI "buildroot" Toolchain
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

From e62b420882181f9dd656cd5598f6f8b86ada3fa8 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Thu, 11 Oct 2012 13:42:14 +0000
Subject: [PATCH 32/43] Another dtoa() fix from Mike Smith

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5229 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/ChangeLog                               |  1 +
 nuttx/configs/eagle100/README.txt             | 13 +++-
 nuttx/configs/eagle100/nxflat/Make.defs       | 78 +++++++++----------
 nuttx/configs/eagle100/thttpd/Make.defs       | 78 +++++++++----------
 nuttx/configs/lpcxpresso-lpc1768/README.txt   |  4 +
 .../lpcxpresso-lpc1768/thttpd/Make.defs       | 14 ++--
 nuttx/configs/olimex-lpc1766stk/README.txt    |  4 +
 .../olimex-lpc1766stk/thttpd/Make.defs        | 12 +--
 nuttx/lib/stdio/lib_libdtoa.c                 | 11 ++-
 9 files changed, 121 insertions(+), 94 deletions(-)

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 7121c506f1..a8e045616e 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3469,4 +3469,5 @@
 	  xxx-nuttx-elf- vs. xxx-elf-
 	* configs/shenzhou/*/Make.defs:  Now uses the new buildroot 4.6.3
 	  EABI toolchain.
+	* lib/stdio/lib_libdtoa.c:  Another dtoa() fix from Mike Smith.
 
diff --git a/nuttx/configs/eagle100/README.txt b/nuttx/configs/eagle100/README.txt
index d868817cc0..c9253960a2 100644
--- a/nuttx/configs/eagle100/README.txt
+++ b/nuttx/configs/eagle100/README.txt
@@ -416,13 +416,24 @@ Where <subdir> is one of the following:
     interface should also be functional, but is not enabled in this
     configuration).
 
+  nxflat:
+    This builds the NXFLAT example at apps/examples/nxfalt.
+
+    NOTE: See note above with regard to the EABI/OABI buildroot
+    toolchains.  This example can only be built using the older
+    OABI toolchain.
+
   ostest:
     This configuration directory, performs a simple OS test using
     examples/ostest.
 
   thttpd:
     This builds the THTTPD web server example using the THTTPD and
-    the examples/thttpd application.
+    the apps/examples/thttpd application.
+
+    NOTE: See note above with regard to the EABI/OABI buildroot
+    toolchains.  This example can only be built using the older
+    OABI toolchain.
 
 By default, all of these examples are built to be used with the Luminary
 Ethernet Bootloader (you can change the ld.script file in any of these
diff --git a/nuttx/configs/eagle100/nxflat/Make.defs b/nuttx/configs/eagle100/nxflat/Make.defs
index 41e738ec8b..780e858504 100644
--- a/nuttx/configs/eagle100/nxflat/Make.defs
+++ b/nuttx/configs/eagle100/nxflat/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/eagle100/nxflat/Make.defs
 #
-#   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -40,36 +40,36 @@ include ${TOPDIR}/tools/Config.mk
 #   make                         -- Will build for the devkitARM 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-nuttx-elf- -- Will build for the NuttX buildroot toolchain
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX OABI buildroot toolchain
 
-CROSSDEV		= arm-eabi-
-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
+CROSSDEV			= arm-eabi-
+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
 
-MKNXFLAT		= mknxflat
-LDNXFLAT		= ldnxflat
+MKNXFLAT			= mknxflat
+LDNXFLAT			= ldnxflat
 
 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}
+ARCHCCMAJOR			= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
 
 ifeq ($(CROSSDEV),arm-nuttx-elf-)
-  MKDEP			= $(TOPDIR)/tools/mkdeps.sh
+  MKDEP				= $(TOPDIR)/tools/mkdeps.sh
   ARCHCPUFLAGS		= -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES	= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
   ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nxflat/ld.script
   MAXOPTIMIZATION	= -Os
 else
-  WINTOOL		= y
-  DIRLINK 		= $(TOPDIR)/tools/winlink.sh
-  DIRUNLINK		= $(TOPDIR)/tools/unlink.sh
-  MKDEP			= $(TOPDIR)/tools/mknulldeps.sh
+  WINTOOL			= y
+  DIRLINK 			= $(TOPDIR)/tools/winlink.sh
+  DIRUNLINK			= $(TOPDIR)/tools/unlink.sh
+  MKDEP				= $(TOPDIR)/tools/mknulldeps.sh
   ARCHCPUFLAGS		= -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   ARCHINCLUDES		= -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
   ARCHXXINCLUDES	= -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
@@ -83,42 +83,42 @@ else
   ARCHOPTIMIZATION	= $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif
 
-ARCHCFLAGS		= -fno-builtin
+ARCHCFLAGS			= -fno-builtin
 ARCHCXXFLAGS		= -fno-builtin -fno-exceptions
 ARCHWARNINGS		= -Wall -Wstrict-prototypes -Wshadow
 ARCHWARNINGSXX		= -Wall -Wshadow
-ARCHDEFINES		=
+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__
+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
+					  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoffset.ld \
+					  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
-OBJEXT			= .o
-LIBEXT			= .a
-EXEEXT			=
+OBJEXT				= .o
+LIBEXT				= .a
+EXEEXT				=
 
 ifneq ($(CROSSDEV),arm-nuttx-elf-)
-  LDFLAGS		+= -nostartfiles -nodefaultlibs
+  LDFLAGS			+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  LDFLAGS		+= -g
+  LDFLAGS			+= -g
 endif
 
 
-HOSTCC			= gcc
+HOSTCC				= gcc
 HOSTINCLUDES		= -I.
-HOSTCFLAGS		= -Wall -Wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS		=
+HOSTCFLAGS			= -Wall -Wstrict-prototypes -Wshadow -g -pipe
+HOSTLDFLAGS			=
 
diff --git a/nuttx/configs/eagle100/thttpd/Make.defs b/nuttx/configs/eagle100/thttpd/Make.defs
index 92f68d9f11..87157525b3 100644
--- a/nuttx/configs/eagle100/thttpd/Make.defs
+++ b/nuttx/configs/eagle100/thttpd/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/eagle100/thttpd/Make.defs
 #
-#   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -40,36 +40,36 @@ include ${TOPDIR}/tools/Config.mk
 #   make                         -- Will build for the devkitARM 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-nuttx-elf- -- Will build for the NuttX buildroot toolchain
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX OABI buildroot toolchain
 
-CROSSDEV		= arm-eabi-
-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
+CROSSDEV			= arm-eabi-
+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
 
-MKNXFLAT		= mknxflat
-LDNXFLAT		= ldnxflat
+MKNXFLAT			= mknxflat
+LDNXFLAT			= ldnxflat
 
 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}
+ARCHCCMAJOR			= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
 
 ifeq ($(CROSSDEV),arm-nuttx-elf-)
-  MKDEP			= $(TOPDIR)/tools/mkdeps.sh
+  MKDEP				= $(TOPDIR)/tools/mkdeps.sh
   ARCHCPUFLAGS		= -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES	= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
   ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/thttpd/ld.script
   MAXOPTIMIZATION	= -Os
 else
-  WINTOOL		= y
-  DIRLINK 		= $(TOPDIR)/tools/winlink.sh
-  DIRUNLINK		= $(TOPDIR)/tools/unlink.sh
-  MKDEP			= $(TOPDIR)/tools/mknulldeps.sh
+  WINTOOL			= y
+  DIRLINK 			= $(TOPDIR)/tools/winlink.sh
+  DIRUNLINK			= $(TOPDIR)/tools/unlink.sh
+  MKDEP				= $(TOPDIR)/tools/mknulldeps.sh
   ARCHCPUFLAGS		= -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   ARCHINCLUDES		= -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
   ARCHXXINCLUDES	= -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
@@ -83,42 +83,42 @@ else
   ARCHOPTIMIZATION	= $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif
 
-ARCHCFLAGS		= -fno-builtin
+ARCHCFLAGS			= -fno-builtin
 ARCHCXXFLAGS		= -fno-builtin -fno-exceptions
 ARCHWARNINGS		= -Wall -Wstrict-prototypes -Wshadow
 ARCHWARNINGSXX		= -Wall -Wshadow
-ARCHDEFINES		=
+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__
+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
+					  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
+					  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
-OBJEXT			= .o
-LIBEXT			= .a
-EXEEXT			=
+OBJEXT				= .o
+LIBEXT				= .a
+EXEEXT				=
 
 ifneq ($(CROSSDEV),arm-nuttx-elf-)
-  LDFLAGS		+= -nostartfiles -nodefaultlibs
+  LDFLAGS			+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  LDFLAGS		+= -g
+  LDFLAGS			+= -g
 endif
 
 
-HOSTCC			= gcc
+HOSTCC				= gcc
 HOSTINCLUDES		= -I.
-HOSTCFLAGS		= -Wall -Wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS		=
+HOSTCFLAGS			= -Wall -Wstrict-prototypes -Wshadow -g -pipe
+HOSTLDFLAGS			=
 
diff --git a/nuttx/configs/lpcxpresso-lpc1768/README.txt b/nuttx/configs/lpcxpresso-lpc1768/README.txt
index 8ea038514b..9660e12fee 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/README.txt
+++ b/nuttx/configs/lpcxpresso-lpc1768/README.txt
@@ -800,6 +800,10 @@ Where <subdir> is one of the following:
     NOTE:  You will need to build the NXFLAT toolchain as described
     above in order to use this example.
 
+    See also note above with regard to the EABI/OABI buildroot
+    toolchains.  This example can only be built using the older
+    OABI toolchain.
+
     Jumpers: Nothing special.  Use the default base board jumper
     settings.
 
diff --git a/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs
index b6a3245469..0f3212522f 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs
+++ b/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/lpcxpresso-lpc1768/thttpd/Make.defs
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   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
@@ -59,11 +59,11 @@ endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
   # OABI
-  # CROSSDEV = arm-nuttx-elf-
-  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  CROSSDEV = arm-nuttx-elf-
+  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   # EABI
-  CROSSDEV = arm-nuttx-eabi-
-  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+  # CROSSDEV = arm-nuttx-eabi-
+  # ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 ifeq ($(CONFIG_LPC17_CODEREDW),y)
@@ -88,14 +88,14 @@ ifeq ($(WINTOOL),y)
   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)/thttpd/ld.script}"
   MAXOPTIMIZATION = -O2
-  NXFLATLDSCRIPT = -T "${shell cygpath -w $(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld}"
+  NXFLATLDSCRIPT = -T "${shell cygpath -w $(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld}"
 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)/thttpd/ld.script
-  NXFLATLDSCRIPT = -T"$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld"
+  NXFLATLDSCRIPT = -T"$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld"
 endif
 
 CC = $(CROSSDEV)gcc
diff --git a/nuttx/configs/olimex-lpc1766stk/README.txt b/nuttx/configs/olimex-lpc1766stk/README.txt
index f53ed4647d..b0b54f4091 100644
--- a/nuttx/configs/olimex-lpc1766stk/README.txt
+++ b/nuttx/configs/olimex-lpc1766stk/README.txt
@@ -1025,6 +1025,10 @@ Where <subdir> is one of the following:
     This builds the THTTPD web server example using the THTTPD and
     the apps/examples/thttpd application.
 
+    NOTE: See note above with regard to the EABI/OABI buildroot
+    toolchains.  This example can only be built using the older
+    OABI toolchain.
+
   usbserial:
     This configuration directory exercises the USB serial class
     driver at apps/examples/usbserial.  See apps/examples/README.txt for
diff --git a/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs b/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs
index 11e155ed89..39e5ed299e 100644
--- a/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/olimex-lpc1766stk/thttpd/Make.defs
 #
-#   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -59,11 +59,11 @@ endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
   # OABI
-  # CROSSDEV = arm-nuttx-elf-
-  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  CROSSDEV = arm-nuttx-elf-
+  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   # EABI
-  CROSSDEV = arm-nuttx-eabi-
-  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+  # CROSSDEV = arm-nuttx-eabi-
+  # ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
@@ -120,7 +120,7 @@ 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
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/lib/stdio/lib_libdtoa.c b/nuttx/lib/stdio/lib_libdtoa.c
index 1e022a8ebe..667c49c535 100644
--- a/nuttx/lib/stdio/lib_libdtoa.c
+++ b/nuttx/lib/stdio/lib_libdtoa.c
@@ -224,8 +224,15 @@ static void lib_dtoa(FAR struct lib_outstream_s *obj, int fmt, int prec,
 
           for (i = expt; i > 0; i--)
             {
-              obj->put(obj, *digits);
-              digits++;
+              if (*digits != '\0')
+                { 
+                  obj->put(obj, *digits);
+                  digits++;
+                }
+              else
+                {
+                  obj->put(obj, '0');
+                }
             }
 
           /* Get the length of the fractional part */

From 8de1d1d182bed68c075f279541c32a7493aef0bc Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Fri, 12 Oct 2012 15:38:42 +0000
Subject: [PATCH 33/43] Update Olimex-LPC1766STK setenv.sh to make it faster to
 use CodeSourcery.

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5230 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/ReleaseNotes                            |  4 ++
 nuttx/configs/olimex-lpc1766stk/README.txt    |  2 +-
 .../configs/olimex-lpc1766stk/ftpc/setenv.sh  | 41 ++++++++++++++++---
 .../olimex-lpc1766stk/hidkbd/setenv.sh        | 41 ++++++++++++++++---
 .../olimex-lpc1766stk/nettest/setenv.sh       | 41 ++++++++++++++++---
 nuttx/configs/olimex-lpc1766stk/nsh/defconfig |  1 +
 nuttx/configs/olimex-lpc1766stk/nsh/setenv.sh | 41 ++++++++++++++++---
 nuttx/configs/olimex-lpc1766stk/nx/setenv.sh  | 41 ++++++++++++++++---
 .../olimex-lpc1766stk/ostest/setenv.sh        | 41 ++++++++++++++++---
 .../olimex-lpc1766stk/slip-httpd/setenv.sh    | 41 ++++++++++++++++---
 .../olimex-lpc1766stk/thttpd/setenv.sh        | 41 ++++++++++++++++---
 .../olimex-lpc1766stk/usbserial/setenv.sh     | 41 ++++++++++++++++---
 .../olimex-lpc1766stk/usbstorage/setenv.sh    | 41 ++++++++++++++++---
 .../configs/olimex-lpc1766stk/wlan/setenv.sh  | 41 ++++++++++++++++---
 14 files changed, 402 insertions(+), 56 deletions(-)

diff --git a/nuttx/ReleaseNotes b/nuttx/ReleaseNotes
index 80362f5ddc..b1d5f6064c 100644
--- a/nuttx/ReleaseNotes
+++ b/nuttx/ReleaseNotes
@@ -1606,6 +1606,8 @@ The 61st release of NuttX, NuttX-5.14, was made on November 27,
 2010.  This release includes multiple, important bugfixes as well
 as a new driver for the NXP LPC1766.
 
+This release corresponds with SVN release number: r3137
+
 Important bugfixes include:
 
   * Cortex-M3 Hard Fault.  Fixed a hard fault problem that can occur
@@ -2052,6 +2054,8 @@ interest expressed by members of the forum and because of the
 availability of newer, larger capacity AVR parts (that I don't have
 yet).
 
+This release corresponds with SVN release number: r3730
+
 This release includes support for the following AVR boards.  As
 with any initial support for new architectures, there are some
 incomplete areas and a few caveats that need to be stated.  Here
diff --git a/nuttx/configs/olimex-lpc1766stk/README.txt b/nuttx/configs/olimex-lpc1766stk/README.txt
index b0b54f4091..f638ed4ff6 100644
--- a/nuttx/configs/olimex-lpc1766stk/README.txt
+++ b/nuttx/configs/olimex-lpc1766stk/README.txt
@@ -605,7 +605,7 @@ Using OpenOCD and GDB with an FT2232 JTAG emulator
 
     NOTES:
     1. Loading the symbol-file is only useful if you have built NuttX to
-       inclulde debug symbols (by setting CONFIG_DEBUG_SYMBOLS=y in the
+       include debug symbols (by setting CONFIG_DEBUG_SYMBOLS=y in the
        .config file).
     2. I usually have to reset, halt, and 'load nuttx' a second time.  For
        some reason, the first time apparently does not fully program the
diff --git a/nuttx/configs/olimex-lpc1766stk/ftpc/setenv.sh b/nuttx/configs/olimex-lpc1766stk/ftpc/setenv.sh
index df10916900..f9194c00d3 100755
--- a/nuttx/configs/olimex-lpc1766stk/ftpc/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/ftpc/setenv.sh
@@ -32,16 +32,47 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-if [ "$(basename $0)" = "setenv.sh" ] ; then
+if [ "$_" = "$0" ] ; 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`
+if [ ! -x "setenv.sh" ]; then
+  echo "This script must be executed from the top-level NuttX build directory"
+  exit 1
+fi
+
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+# This is the Cygwin path to the location where I installed the RIDE
+# toolchain under windows.  You will also have to edit this if you install
+# the RIDE toolchain in any other location
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
+
+# This is 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"
+
+# These are the Cygwin paths to the locations where I installed the Atollic
+# toolchain under windows.  You will also have to edit this if you install
+# the Atollic toolchain in any other location.  /usr/bin is added before
+# the Atollic bin path because there is are binaries named gcc.exe and g++.exe
+# at those locations as well.
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
+
+# This is the Cygwin path to the location where I build the buildroot
+# toolchain.
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+
+# The Olimex-lpc1766stk/tools directory
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
-export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
+
+# Add the path to the toolchain and tools directory to the PATH varialble
+export PATH="${TOOLCHAIN_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/olimex-lpc1766stk/hidkbd/setenv.sh b/nuttx/configs/olimex-lpc1766stk/hidkbd/setenv.sh
index e4e130c24a..4c76646f9f 100755
--- a/nuttx/configs/olimex-lpc1766stk/hidkbd/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/hidkbd/setenv.sh
@@ -32,16 +32,47 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-if [ "$(basename $0)" = "setenv.sh" ] ; then
+if [ "$_" = "$0" ] ; 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`
+if [ ! -x "setenv.sh" ]; then
+  echo "This script must be executed from the top-level NuttX build directory"
+  exit 1
+fi
+
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+# This is the Cygwin path to the location where I installed the RIDE
+# toolchain under windows.  You will also have to edit this if you install
+# the RIDE toolchain in any other location
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
+
+# This is 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"
+
+# These are the Cygwin paths to the locations where I installed the Atollic
+# toolchain under windows.  You will also have to edit this if you install
+# the Atollic toolchain in any other location.  /usr/bin is added before
+# the Atollic bin path because there is are binaries named gcc.exe and g++.exe
+# at those locations as well.
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
+
+# This is the Cygwin path to the location where I build the buildroot
+# toolchain.
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+
+# The Olimex-lpc1766stk/tools directory
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
-export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
+
+# Add the path to the toolchain and tools directory to the PATH varialble
+export PATH="${TOOLCHAIN_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/olimex-lpc1766stk/nettest/setenv.sh b/nuttx/configs/olimex-lpc1766stk/nettest/setenv.sh
index 92c6bdf5ec..d544f44706 100755
--- a/nuttx/configs/olimex-lpc1766stk/nettest/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/nettest/setenv.sh
@@ -32,16 +32,47 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-if [ "$(basename $0)" = "setenv.sh" ] ; then
+if [ "$_" = "$0" ] ; 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`
+if [ ! -x "setenv.sh" ]; then
+  echo "This script must be executed from the top-level NuttX build directory"
+  exit 1
+fi
+
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+# This is the Cygwin path to the location where I installed the RIDE
+# toolchain under windows.  You will also have to edit this if you install
+# the RIDE toolchain in any other location
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
+
+# This is 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"
+
+# These are the Cygwin paths to the locations where I installed the Atollic
+# toolchain under windows.  You will also have to edit this if you install
+# the Atollic toolchain in any other location.  /usr/bin is added before
+# the Atollic bin path because there is are binaries named gcc.exe and g++.exe
+# at those locations as well.
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
+
+# This is the Cygwin path to the location where I build the buildroot
+# toolchain.
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+
+# The Olimex-lpc1766stk/tools directory
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
-export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
+
+# Add the path to the toolchain and tools directory to the PATH varialble
+export PATH="${TOOLCHAIN_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig
index c2722cb9be..d5333a9f33 100755
--- a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig
@@ -262,6 +262,7 @@ CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NFILE_STREAMS=8
 CONFIG_NAME_MAX=32
 CONFIG_STDIO_BUFFER_SIZE=256
+CONFIG_STDIO_LINEBUFFER=y
 CONFIG_NUNGET_CHARS=2
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
diff --git a/nuttx/configs/olimex-lpc1766stk/nsh/setenv.sh b/nuttx/configs/olimex-lpc1766stk/nsh/setenv.sh
index 089165f694..84150b0687 100755
--- a/nuttx/configs/olimex-lpc1766stk/nsh/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/nsh/setenv.sh
@@ -32,16 +32,47 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-if [ "$(basename $0)" = "setenv.sh" ] ; then
+if [ "$_" = "$0" ] ; 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`
+if [ ! -x "setenv.sh" ]; then
+  echo "This script must be executed from the top-level NuttX build directory"
+  exit 1
+fi
+
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+# This is the Cygwin path to the location where I installed the RIDE
+# toolchain under windows.  You will also have to edit this if you install
+# the RIDE toolchain in any other location
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
+
+# This is 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"
+
+# These are the Cygwin paths to the locations where I installed the Atollic
+# toolchain under windows.  You will also have to edit this if you install
+# the Atollic toolchain in any other location.  /usr/bin is added before
+# the Atollic bin path because there is are binaries named gcc.exe and g++.exe
+# at those locations as well.
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
+
+# This is the Cygwin path to the location where I build the buildroot
+# toolchain.
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+
+# The Olimex-lpc1766stk/tools directory
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
-export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
+
+# Add the path to the toolchain and tools directory to the PATH varialble
+export PATH="${TOOLCHAIN_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/olimex-lpc1766stk/nx/setenv.sh b/nuttx/configs/olimex-lpc1766stk/nx/setenv.sh
index 69cee3997c..b94b47ad48 100755
--- a/nuttx/configs/olimex-lpc1766stk/nx/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/nx/setenv.sh
@@ -32,16 +32,47 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-if [ "$(basename $0)" = "setenv.sh" ] ; then
+if [ "$_" = "$0" ] ; 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`
+if [ ! -x "setenv.sh" ]; then
+  echo "This script must be executed from the top-level NuttX build directory"
+  exit 1
+fi
+
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+# This is the Cygwin path to the location where I installed the RIDE
+# toolchain under windows.  You will also have to edit this if you install
+# the RIDE toolchain in any other location
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
+
+# This is 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"
+
+# These are the Cygwin paths to the locations where I installed the Atollic
+# toolchain under windows.  You will also have to edit this if you install
+# the Atollic toolchain in any other location.  /usr/bin is added before
+# the Atollic bin path because there is are binaries named gcc.exe and g++.exe
+# at those locations as well.
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
+
+# This is the Cygwin path to the location where I build the buildroot
+# toolchain.
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+
+# The Olimex-lpc1766stk/tools directory
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
-export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
+
+# Add the path to the toolchain and tools directory to the PATH varialble
+export PATH="${TOOLCHAIN_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/olimex-lpc1766stk/ostest/setenv.sh b/nuttx/configs/olimex-lpc1766stk/ostest/setenv.sh
index b61805da06..a5547b3bfd 100755
--- a/nuttx/configs/olimex-lpc1766stk/ostest/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/ostest/setenv.sh
@@ -32,16 +32,47 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-if [ "$(basename $0)" = "setenv.sh" ] ; then
+if [ "$_" = "$0" ] ; 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`
+if [ ! -x "setenv.sh" ]; then
+  echo "This script must be executed from the top-level NuttX build directory"
+  exit 1
+fi
+
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+# This is the Cygwin path to the location where I installed the RIDE
+# toolchain under windows.  You will also have to edit this if you install
+# the RIDE toolchain in any other location
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
+
+# This is 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"
+
+# These are the Cygwin paths to the locations where I installed the Atollic
+# toolchain under windows.  You will also have to edit this if you install
+# the Atollic toolchain in any other location.  /usr/bin is added before
+# the Atollic bin path because there is are binaries named gcc.exe and g++.exe
+# at those locations as well.
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
+
+# This is the Cygwin path to the location where I build the buildroot
+# toolchain.
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+
+# The Olimex-lpc1766stk/tools directory
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
-export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
+
+# Add the path to the toolchain and tools directory to the PATH varialble
+export PATH="${TOOLCHAIN_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/olimex-lpc1766stk/slip-httpd/setenv.sh b/nuttx/configs/olimex-lpc1766stk/slip-httpd/setenv.sh
index 50364e4a1c..35dbd55b38 100755
--- a/nuttx/configs/olimex-lpc1766stk/slip-httpd/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/slip-httpd/setenv.sh
@@ -32,16 +32,47 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-if [ "$(basename $0)" = "setenv.sh" ] ; then
+if [ "$_" = "$0" ] ; 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`
+if [ ! -x "setenv.sh" ]; then
+  echo "This script must be executed from the top-level NuttX build directory"
+  exit 1
+fi
+
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+# This is the Cygwin path to the location where I installed the RIDE
+# toolchain under windows.  You will also have to edit this if you install
+# the RIDE toolchain in any other location
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
+
+# This is 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"
+
+# These are the Cygwin paths to the locations where I installed the Atollic
+# toolchain under windows.  You will also have to edit this if you install
+# the Atollic toolchain in any other location.  /usr/bin is added before
+# the Atollic bin path because there is are binaries named gcc.exe and g++.exe
+# at those locations as well.
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
+
+# This is the Cygwin path to the location where I build the buildroot
+# toolchain.
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+
+# The Olimex-lpc1766stk/tools directory
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
-export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
+
+# Add the path to the toolchain and tools directory to the PATH varialble
+export PATH="${TOOLCHAIN_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/olimex-lpc1766stk/thttpd/setenv.sh b/nuttx/configs/olimex-lpc1766stk/thttpd/setenv.sh
index 2a9ddae159..bcf0c4dead 100755
--- a/nuttx/configs/olimex-lpc1766stk/thttpd/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/thttpd/setenv.sh
@@ -32,16 +32,47 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-if [ "$(basename $0)" = "setenv.sh" ] ; then
+if [ "$_" = "$0" ] ; 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`
+if [ ! -x "setenv.sh" ]; then
+  echo "This script must be executed from the top-level NuttX build directory"
+  exit 1
+fi
+
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+# This is the Cygwin path to the location where I installed the RIDE
+# toolchain under windows.  You will also have to edit this if you install
+# the RIDE toolchain in any other location
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
+
+# This is 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"
+
+# These are the Cygwin paths to the locations where I installed the Atollic
+# toolchain under windows.  You will also have to edit this if you install
+# the Atollic toolchain in any other location.  /usr/bin is added before
+# the Atollic bin path because there is are binaries named gcc.exe and g++.exe
+# at those locations as well.
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
+
+# This is the Cygwin path to the location where I build the buildroot
+# toolchain.
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+
+# The Olimex-lpc1766stk/tools directory
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
-export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
+
+# Add the path to the toolchain and tools directory to the PATH varialble
+export PATH="${TOOLCHAIN_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/olimex-lpc1766stk/usbserial/setenv.sh b/nuttx/configs/olimex-lpc1766stk/usbserial/setenv.sh
index b12d65852e..ea9fe6c67e 100755
--- a/nuttx/configs/olimex-lpc1766stk/usbserial/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/usbserial/setenv.sh
@@ -32,16 +32,47 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-if [ "$(basename $0)" = "setenv.sh" ] ; then
+if [ "$_" = "$0" ] ; 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`
+if [ ! -x "setenv.sh" ]; then
+  echo "This script must be executed from the top-level NuttX build directory"
+  exit 1
+fi
+
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+# This is the Cygwin path to the location where I installed the RIDE
+# toolchain under windows.  You will also have to edit this if you install
+# the RIDE toolchain in any other location
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
+
+# This is 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"
+
+# These are the Cygwin paths to the locations where I installed the Atollic
+# toolchain under windows.  You will also have to edit this if you install
+# the Atollic toolchain in any other location.  /usr/bin is added before
+# the Atollic bin path because there is are binaries named gcc.exe and g++.exe
+# at those locations as well.
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
+
+# This is the Cygwin path to the location where I build the buildroot
+# toolchain.
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+
+# The Olimex-lpc1766stk/tools directory
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
-export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
+
+# Add the path to the toolchain and tools directory to the PATH varialble
+export PATH="${TOOLCHAIN_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/olimex-lpc1766stk/usbstorage/setenv.sh b/nuttx/configs/olimex-lpc1766stk/usbstorage/setenv.sh
index 58fd5d04d5..fa23269fbe 100755
--- a/nuttx/configs/olimex-lpc1766stk/usbstorage/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/usbstorage/setenv.sh
@@ -32,16 +32,47 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-if [ "$(basename $0)" = "setenv.sh" ] ; then
+if [ "$_" = "$0" ] ; 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`
+if [ ! -x "setenv.sh" ]; then
+  echo "This script must be executed from the top-level NuttX build directory"
+  exit 1
+fi
+
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+# This is the Cygwin path to the location where I installed the RIDE
+# toolchain under windows.  You will also have to edit this if you install
+# the RIDE toolchain in any other location
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
+
+# This is 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"
+
+# These are the Cygwin paths to the locations where I installed the Atollic
+# toolchain under windows.  You will also have to edit this if you install
+# the Atollic toolchain in any other location.  /usr/bin is added before
+# the Atollic bin path because there is are binaries named gcc.exe and g++.exe
+# at those locations as well.
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
+
+# This is the Cygwin path to the location where I build the buildroot
+# toolchain.
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+
+# The Olimex-lpc1766stk/tools directory
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
-export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
+
+# Add the path to the toolchain and tools directory to the PATH varialble
+export PATH="${TOOLCHAIN_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/olimex-lpc1766stk/wlan/setenv.sh b/nuttx/configs/olimex-lpc1766stk/wlan/setenv.sh
index 6e6c79ab2e..b7ada2bc25 100755
--- a/nuttx/configs/olimex-lpc1766stk/wlan/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/wlan/setenv.sh
@@ -32,16 +32,47 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-if [ "$(basename $0)" = "setenv.sh" ] ; then
+if [ "$_" = "$0" ] ; 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`
+if [ ! -x "setenv.sh" ]; then
+  echo "This script must be executed from the top-level NuttX build directory"
+  exit 1
+fi
+
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+# This is the Cygwin path to the location where I installed the RIDE
+# toolchain under windows.  You will also have to edit this if you install
+# the RIDE toolchain in any other location
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
+
+# This is 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"
+
+# These are the Cygwin paths to the locations where I installed the Atollic
+# toolchain under windows.  You will also have to edit this if you install
+# the Atollic toolchain in any other location.  /usr/bin is added before
+# the Atollic bin path because there is are binaries named gcc.exe and g++.exe
+# at those locations as well.
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
+
+# This is the Cygwin path to the location where I build the buildroot
+# toolchain.
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+
+# The Olimex-lpc1766stk/tools directory
 export LPCTOOL_DIR="${WD}/configs/olimex-lpc1766stk/tools"
-export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
-export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
+
+# Add the path to the toolchain and tools directory to the PATH varialble
+export PATH="${TOOLCHAIN_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"

From e4ccbe7508fd31b76790986fc654dc588efb9dfe Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Fri, 12 Oct 2012 16:59:17 +0000
Subject: [PATCH 34/43] You can now configure a login for Telnet NSH session --
 from Darcy Gong

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5231 42af7a65-404d-4744-a932-0658087f49c3
---
 apps/nshlib/Kconfig       |  58 ++++++++++++++------
 apps/nshlib/nsh.h         |  35 +++++++++++-
 apps/nshlib/nsh_console.c |  15 ++++--
 apps/nshlib/nsh_console.h |   2 +-
 apps/nshlib/nsh_parse.c   |  11 ++++
 apps/nshlib/nsh_telnetd.c | 110 +++++++++++++++++++++++++++++++++++++-
 6 files changed, 208 insertions(+), 23 deletions(-)

diff --git a/apps/nshlib/Kconfig b/apps/nshlib/Kconfig
index c0f7d6a92f..d12a329738 100644
--- a/apps/nshlib/Kconfig
+++ b/apps/nshlib/Kconfig
@@ -291,19 +291,18 @@ config NSH_CONSOLE
 		console front-end is selected (/dev/console).
 
 		Normally, the serial console device is a UART and RS-232
-		interface.  However, if CONFIG_USBDEV is defined, then a USB
+		interface.  However, if USBDEV is defined, then a USB
 		serial device may, instead, be used if the one of
 		the following are defined:
 
-		CONFIG_PL2303 and CONFIG_PL2303_CONSOLE - Sets up the
-		Prolifics PL2303 emulation as a console device at /dev/console.
+		PL2303 and PL2303_CONSOLE - Set up the Prolifics PL2303
+		emulation as a console device at /dev/console.
 
-		CONFIG_CDCACM and CONFIG_CDCACM_CONSOLE - Sets up the
-		CDC/ACM serial device as a console device at dev/console.
+		CDCACM and CDCACM_CONSOLE - Set up the CDC/ACM serial
+		device as a console device at dev/console.
 
-		CONFIG_NSH_USBCONSOLE and CONFIG_NSH_USBCONDEV - Sets up the
-		some other USB serial device as the NSH console (not necessarily
-		dev/console).
+		NSH_USBCONSOLE and NSH_USBCONDEV - Sets up some other USB
+		serial device as the NSH console (not necessarily dev/console).
 
 config NSH_USBCONSOLE
 	bool "Use a USB console"
@@ -311,20 +310,20 @@ config NSH_USBCONSOLE
 	depends on NSH_CONSOLE && USBDEV
 	---help---
 		If defined, then the an arbitrary USB device may be used
-		to as the NSH console.  In this case, CONFIG_NSH_USBCONDEV
-		must be defined to indicate which USB device to use as
-		the console.
+		to as the NSH console.  In this case, NSH_USBCONDEV must
+		be defined to indicate which USB device to use as the
+		console.
 
 config NSH_USBCONDEV
 	string "USB console device"
 	default "/dev/ttyACM0"
 	depends on NSH_USBCONSOLE
 	---help---
-		If CONFIG_NSH_USBCONSOLE is set to 'y', then CONFIG_NSH_USBCONDEV
-		must also be set to select the USB device used to support
-		the NSH console.   This should be set to the quoted name of a
+		If NSH_USBCONSOLE is set to 'y', then NSH_USBCONDEV must
+		also be set to select the USB device used to support the
+		NSH console.   This should be set to the quoted name of a
 		readable/write-able USB driver such as:
-		CONFIG_NSH_USBCONDEV="/dev/ttyACM0".
+		NSH_USBCONDEV="/dev/ttyACM0".
 
 config UBSDEV_MINOR
 	int "USB console device minor number"
@@ -448,6 +447,35 @@ config NSH_IOBUFFER_SIZE
 	---help---
 		Determines the size of the I/O buffer to use for sending/
 		receiving TELNET commands/reponses.  Default: 512
+
+config NSH_TELNET_LOGIN
+	bool "Telnet Login"
+	default n
+	---help---
+		If defined, then the Telnet user will be required to provide a
+		username and password to start the NSH shell.
+
+if NSH_TELNET_LOGIN
+
+config NSH_TELNET_USERNAME
+	string "Login Username"
+	default "admin"
+	---help---
+		Login user name.  Default: "admin"
+
+config NSH_TELNET_PASSWORD
+	string "Login Password"
+	default "nuttx"
+	---help---
+		Login password:  Default: "nuttx"
+
+config NSH_TELNET_FAILCOUNT
+	int "Login Retry Count"
+	default 3
+	---help---
+		Number of login retry attempts.
+
+endif
 endif
 
 config NSH_DHCPC
diff --git a/apps/nshlib/nsh.h b/apps/nshlib/nsh.h
index dac91ba05d..cfab262710 100644
--- a/apps/nshlib/nsh.h
+++ b/apps/nshlib/nsh.h
@@ -164,10 +164,19 @@
  *   Default: SCHED_PRIORITY_DEFAULT
  * CONFIG_NSH_TELNETD_DAEMONSTACKSIZE - Stack size allocated for the
  *   Telnet daemon. Default: 2048
- * CONFIG_NSH_TELNETD_CLIENTPRIO- Priority of the Telnet client.
+ * CONFIG_NSH_TELNETD_CLIENTPRIO - Priority of the Telnet client.
  *   Default: SCHED_PRIORITY_DEFAULT
  * CONFIG_NSH_TELNETD_CLIENTSTACKSIZE - Stack size allocated for the
  *   Telnet client. Default: 2048
+ * CONFIG_NSH_TELNET_LOGIN - Support a simple Telnet login.
+ *
+ * If CONFIG_NSH_TELNET_LOGIN is defined, then these additional
+ * options may be specified:
+ *
+ * CONFIG_NSH_TELNET_USERNAME - Login user name.  Default: "admin"
+ * CONFIG_NSH_TELNET_PASSWORD - Login password:  Default: "nuttx"
+ * CONFIG_NSH_TELNET_FAILCOUNT - Number of login retry attempts.
+ *   Default 3.
  */
 
 #ifndef CONFIG_NSH_TELNETD_PORT
@@ -190,6 +199,22 @@
 #  define CONFIG_NSH_TELNETD_CLIENTSTACKSIZE 2048
 #endif
 
+#ifdef CONFIG_NSH_TELNET_LOGIN
+
+#  ifndef CONFIG_NSH_TELNET_USERNAME
+#    define CONFIG_NSH_TELNET_USERNAME  "admin"
+#  endif
+
+#  ifndef CONFIG_NSH_TELNET_PASSWORD
+#    define CONFIG_NSH_TELNET_PASSWORD  "nuttx"
+#  endif
+
+#  ifndef CONFIG_NSH_TELNET_FAILCOUNT
+#    define CONFIG_NSH_TELNET_FAILCOUNT 3
+#  endif
+
+#endif /* CONFIG_NSH_TELNET_LOGIN */
+
 /* Verify support for ROMFS /etc directory support options */
 
 #ifdef CONFIG_NSH_ROMFSETC
@@ -362,6 +387,14 @@ typedef int (*cmd_t)(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv);
  ****************************************************************************/
 
 extern const char g_nshgreeting[];
+#if defined(CONFIG_NSH_TELNET_LOGIN) && defined(CONFIG_NSH_TELNET)
+extern const char g_telnetgreeting[];
+extern const char g_userprompt[];
+extern const char g_passwordprompt[];
+extern const char g_loginsuccess[];
+extern const char g_badcredentials[];
+extern const char g_loginfailure[];
+#endif
 extern const char g_nshprompt[];
 extern const char g_nshsyntax[];
 extern const char g_fmtargrequired[];
diff --git a/apps/nshlib/nsh_console.c b/apps/nshlib/nsh_console.c
index b066e71f53..1b8f5f6ac8 100644
--- a/apps/nshlib/nsh_console.c
+++ b/apps/nshlib/nsh_console.c
@@ -75,12 +75,17 @@ struct serialsave_s
 static FAR struct nsh_vtbl_s *nsh_consoleclone(FAR struct nsh_vtbl_s *vtbl);
 #endif
 static void nsh_consolerelease(FAR struct nsh_vtbl_s *vtbl);
-static ssize_t nsh_consolewrite(FAR struct nsh_vtbl_s *vtbl, FAR const void *buffer, size_t nbytes);
-static int nsh_consoleoutput(FAR struct nsh_vtbl_s *vtbl, const char *fmt, ...);
+static ssize_t nsh_consolewrite(FAR struct nsh_vtbl_s *vtbl,
+  FAR const void *buffer, size_t nbytes);
+static int nsh_consoleoutput(FAR struct nsh_vtbl_s *vtbl,
+  FAR const char *fmt, ...);
 static FAR char *nsh_consolelinebuffer(FAR struct nsh_vtbl_s *vtbl);
-static void nsh_consoleredirect(FAR struct nsh_vtbl_s *vtbl, int fd, FAR uint8_t *save);
-static void nsh_consoleundirect(FAR struct nsh_vtbl_s *vtbl, FAR uint8_t *save);
-static void nsh_consoleexit(FAR struct nsh_vtbl_s *vtbl, int exitstatus);
+static void nsh_consoleredirect(FAR struct nsh_vtbl_s *vtbl, int fd,
+  FAR uint8_t *save);
+static void nsh_consoleundirect(FAR struct nsh_vtbl_s *vtbl,
+  FAR uint8_t *save);
+static void nsh_consoleexit(FAR struct nsh_vtbl_s *vtbl, int exitstatus)
+  noreturn_function;
 
 /****************************************************************************
  * Private Data
diff --git a/apps/nshlib/nsh_console.h b/apps/nshlib/nsh_console.h
index 53e8c78976..4dc2938cb4 100644
--- a/apps/nshlib/nsh_console.h
+++ b/apps/nshlib/nsh_console.h
@@ -109,7 +109,7 @@ struct nsh_vtbl_s
   FAR char *(*linebuffer)(FAR struct nsh_vtbl_s *vtbl);
   void (*redirect)(FAR struct nsh_vtbl_s *vtbl, int fd, FAR uint8_t *save);
   void (*undirect)(FAR struct nsh_vtbl_s *vtbl, FAR uint8_t *save);
-  void (*exit)(FAR struct nsh_vtbl_s *vtbl, int exitstatus);
+  void (*exit)(FAR struct nsh_vtbl_s *vtbl, int exitstatus) noreturn_function;
 
   /* Parser state data */
 
diff --git a/apps/nshlib/nsh_parse.c b/apps/nshlib/nsh_parse.c
index ba597a0628..df2f7c3e39 100644
--- a/apps/nshlib/nsh_parse.c
+++ b/apps/nshlib/nsh_parse.c
@@ -395,6 +395,17 @@ const char g_nshgreeting[]       = "\nNuttShell (NSH) NuttX-" CONFIG_VERSION_STR
 const char g_nshgreeting[]       = "\nNuttShell (NSH)\n";
 #endif
 
+/* Telnet login prompts */
+
+#if defined(CONFIG_NSH_TELNET_LOGIN) && defined(CONFIG_NSH_TELNET)
+const char g_telnetgreeting[]    = "\nWelcome to NuttShell(NSH) Telnet Server...\n";
+const char g_userprompt[]        = "login: ";
+const char g_passwordprompt[]    = "password: ";
+const char g_loginsuccess[]      = "\nUser Logged-in!\n";
+const char g_badcredentials[]    = "\nInvalid username or password\n";
+const char g_loginfailure[]      = "Login failed!\n";
+#endif
+
 /* The NSH prompt */
 
 const char g_nshprompt[]         = "nsh> ";
diff --git a/apps/nshlib/nsh_telnetd.c b/apps/nshlib/nsh_telnetd.c
index 0117aad042..478935d7f6 100644
--- a/apps/nshlib/nsh_telnetd.c
+++ b/apps/nshlib/nsh_telnetd.c
@@ -43,6 +43,7 @@
 #include <unistd.h>
 #include <assert.h>
 #include <debug.h>
+#include <string.h>
 
 #include <apps/netutils/telnetd.h>
 
@@ -55,6 +56,18 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
+#ifdef CONFIG_NSH_TELNET_LOGIN
+
+#  define TELNET_IAC              255
+#  define TELNET_WILL             251
+#  define TELNET_WONT             252
+#  define TELNET_DO               253
+#  define TELNET_DONT             254
+#  define TELNET_USE_ECHO         1
+#  define TELNET_NOTUSE_ECHO      0
+
+#endif /* CONFIG_NSH_TELNET_LOGIN */
+
 /****************************************************************************
  * Private Types
  ****************************************************************************/
@@ -75,6 +88,91 @@
  * Private Functions
  ****************************************************************************/
 
+/****************************************************************************
+ * Name: nsh_telnetecho
+ ****************************************************************************/
+
+#ifdef CONFIG_NSH_TELNET_LOGIN
+void nsh_telnetecho(struct console_stdio_s *pstate, uint8_t is_use)
+{
+  uint8_t optbuf[4];
+  optbuf[0] = TELNET_IAC;
+  optbuf[1] = (is_use == TELNET_USE_ECHO) ? TELNET_WILL : TELNET_DO;
+  optbuf[2] = 1;
+  optbuf[3] = 0;
+  fputs((char *)optbuf, pstate->cn_outstream);
+  fflush(pstate->cn_outstream);
+}
+#endif
+
+/****************************************************************************
+ * Name: nsh_telnetlogin
+ ****************************************************************************/
+
+#ifdef CONFIG_NSH_TELNET_LOGIN
+int nsh_telnetlogin(struct console_stdio_s *pstate)
+{
+  char username[16];
+  char password[16];
+  uint8_t i;
+
+  /* Present the NSH Telnet greeting */
+
+  fputs(g_telnetgreeting, pstate->cn_outstream);
+  fflush(pstate->cn_outstream);
+
+  /* Loop for the configured number of retries */
+
+  for(i = 0; i < CONFIG_NSH_TELNET_FAILCOUNT; i++)
+    {
+      /* Ask for the login username */
+
+      fputs(g_userprompt, pstate->cn_outstream);
+      fflush(pstate->cn_outstream);
+      if (fgets(pstate->cn_line, CONFIG_NSH_LINELEN, INSTREAM(pstate)) != NULL)
+        {
+          strcpy(username, pstate->cn_line);
+          username[strlen(pstate->cn_line) - 1] = 0;
+        }
+
+      /* Ask for the login password */
+  
+      fputs(g_passwordprompt, pstate->cn_outstream);
+      fflush(pstate->cn_outstream);
+      nsh_telnetecho(pstate, TELNET_NOTUSE_ECHO);
+      if (fgets(pstate->cn_line, CONFIG_NSH_LINELEN, INSTREAM(pstate)) != NULL)
+        {
+          /* Verify the username and password */
+
+          strcpy(password,pstate->cn_line);
+          password[strlen(pstate->cn_line) - 1] = 0;
+
+          if (strcmp(password, CONFIG_NSH_TELNET_PASSWORD) == 0 &&
+              strcmp(username, CONFIG_NSH_TELNET_USERNAME) == 0)
+            {
+              fputs(g_loginsuccess, pstate->cn_outstream);
+              fflush(pstate->cn_outstream);
+              nsh_telnetecho(pstate, TELNET_USE_ECHO);
+              return OK;
+            }
+          else
+            {
+              fputs(g_badcredentials, pstate->cn_outstream);
+              fflush(pstate->cn_outstream);
+            }
+        }
+
+      nsh_telnetecho(pstate, TELNET_USE_ECHO);
+    }
+
+  /* Too many failed login attempts */
+
+  fputs(g_loginfailure, pstate->cn_outstream);
+  fflush(pstate->cn_outstream);
+  return -1;
+}
+#endif /* CONFIG_NSH_TELNET_LOGIN */
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -90,7 +188,17 @@ int nsh_telnetmain(int argc, char *argv[])
 
   dbg("Session [%d] Started\n", getpid());
 
-  /* Present a greeting */
+  /* Login User and Password Check */
+
+#ifdef CONFIG_NSH_TELNET_LOGIN
+  if (nsh_telnetlogin(pstate) != OK)
+    {
+      nsh_exit(&pstate->cn_vtbl, 1);
+      return -1; /* nsh_exit does not return */
+    }
+#endif /* CONFIG_NSH_TELNET_LOGIN */
+
+  /* Present the NSH greeting */
 
   fputs(g_nshgreeting, pstate->cn_outstream);
   fflush(pstate->cn_outstream);

From c1958bdaa916560ea45cb6756fe6da25fe79f091 Mon Sep 17 00:00:00 2001
From: px4dev <px4@purgatory.org>
Date: Sun, 14 Oct 2012 23:35:32 -0700
Subject: [PATCH 35/43] Teach top how to precisely determine stack usage.

---
 apps/systemcmds/top/top.c | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/apps/systemcmds/top/top.c b/apps/systemcmds/top/top.c
index e6248dd435..f4e2602114 100644
--- a/apps/systemcmds/top/top.c
+++ b/apps/systemcmds/top/top.c
@@ -135,9 +135,9 @@ int top_main(int argc, char *argv[])
 					memset(header_spaces, ' ', CONFIG_TASK_NAME_SIZE);
 					header_spaces[CONFIG_TASK_NAME_SIZE] = '\0';
 #if CONFIG_RR_INTERVAL > 0
-					printf("\033[KPID\tCOMMAND%s CPU TOTAL \t%%CPU CURR \tMIN STACK USE\tCURR (BASE) PRIO\tRR SLICE\n", header_spaces);
+					printf("\033[KPID\tCOMMAND%s CPU TOTAL \t%%CPU CURR \tSTACK USE\tCURR (BASE) PRIO\tRR SLICE\n", header_spaces);
 #else
-					printf("\033[KPID\tCOMMAND%s CPU TOTAL \t%%CPU CURR \tMIN STACK USE\tCURR (BASE) PRIO\n", header_spaces);
+					printf("\033[KPID\tCOMMAND%s CPU TOTAL \t%%CPU CURR \tSTACK USE\tCURR (BASE) PRIO\n", header_spaces);
 #endif
 
 				} else {
@@ -190,7 +190,26 @@ int top_main(int argc, char *argv[])
 						runtime_spaces = "";
 					}
 
-					printf("\033[K % 2d\t%s%s % 8lld ms%s  \t % 2d.%03d \t % 6d B", (int)system_load.tasks[i].tcb->pid, system_load.tasks[i].tcb->name, spaces, (system_load.tasks[i].total_runtime / 1000), runtime_spaces, (int)(curr_loads[i] * 100), (int)(curr_loads[i] * 100000.0f - (int)(curr_loads[i] * 1000.0f) * 100), (uint32_t)system_load.tasks[i].tcb->adj_stack_ptr - (uint32_t)system_load.tasks[i].tcb->xcp.regs[REG_R13]);
+					unsigned stack_size = (uintptr_t)system_load.tasks[i].tcb->adj_stack_ptr - 
+								(uintptr_t)system_load.tasks[i].tcb->stack_alloc_ptr;
+					unsigned stack_free = 0;
+					uint8_t *stack_sweeper = (uint8_t *)system_load.tasks[i].tcb->stack_alloc_ptr;
+					while (stack_free < stack_size) {
+						if (*stack_sweeper++ != 0xff)
+							break;
+						stack_free++;
+					}
+
+					printf("\033[K % 2d\t%s%s % 8lld ms%s  \t % 2d.%03d \t % 4u / % 4u",
+					       (int)system_load.tasks[i].tcb->pid,
+					       system_load.tasks[i].tcb->name,
+					       spaces,
+					       (system_load.tasks[i].total_runtime / 1000),
+					       runtime_spaces,
+					       (int)(curr_loads[i] * 100),
+					       (int)(curr_loads[i] * 100000.0f - (int)(curr_loads[i] * 1000.0f) * 100),
+					       stack_size - stack_free,
+					       stack_size);
 					/* Print scheduling info with RR time slice */
 #if CONFIG_RR_INTERVAL > 0
 					printf("\t%d\t(%d)\t\t%d\n", (int)system_load.tasks[i].tcb->sched_priority, (int)system_load.tasks[i].tcb->base_priority, (int)system_load.tasks[i].tcb->timeslice);

From f9a8818d1e040bdf1a4bb62041a469ceee67dbf4 Mon Sep 17 00:00:00 2001
From: px4dev <px4@purgatory.org>
Date: Mon, 15 Oct 2012 19:10:28 -0700
Subject: [PATCH 36/43] Switch from -Os to -O3.  This generates *much* faster
 code, although at a ~50% size penalty.  We can afford the space.

---
 nuttx/configs/px4fmu/common/Make.defs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nuttx/configs/px4fmu/common/Make.defs b/nuttx/configs/px4fmu/common/Make.defs
index 7ba4e694a1..00a489eabf 100644
--- a/nuttx/configs/px4fmu/common/Make.defs
+++ b/nuttx/configs/px4fmu/common/Make.defs
@@ -55,7 +55,7 @@ NM			 = $(CROSSDEV)nm
 OBJCOPY			 = $(CROSSDEV)objcopy
 OBJDUMP			 = $(CROSSDEV)objdump
 
-MAXOPTIMIZATION		 = -Os
+MAXOPTIMIZATION		 = -O3
 ARCHCPUFLAGS		 = -mcpu=cortex-m4 \
 			   -mthumb \
 			   -march=armv7e-m \

From 3292ea24a16ebd65350e9f0c618fde4b2b4e8a97 Mon Sep 17 00:00:00 2001
From: px4dev <px4@purgatory.org>
Date: Mon, 15 Oct 2012 21:08:26 -0700
Subject: [PATCH 37/43] Switch to the standard 'verbose' build option. Use a
 better way of passing options to the linker that is closer to friendly with
 'make export'.

---
 .gitignore                            |  1 +
 nuttx/configs/px4fmu/common/Make.defs | 16 ++++------------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 40957d3fb8..b5bd27d539 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ Firmware.sublime-workspace
 nsh_romfsimg.h
 cscope.out
 .configX-e
+nuttx-export.zip
diff --git a/nuttx/configs/px4fmu/common/Make.defs b/nuttx/configs/px4fmu/common/Make.defs
index 00a489eabf..ff2e4c5fac 100644
--- a/nuttx/configs/px4fmu/common/Make.defs
+++ b/nuttx/configs/px4fmu/common/Make.defs
@@ -116,7 +116,6 @@ ARCHOPTIMIZATION	 = $(MAXOPTIMIZATION) \
 
 ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
 ARCHOPTIMIZATION	+= -g
-ARCHSCRIPT		+= -g
 endif
 
 ARCHCFLAGS		 = -std=gnu99
@@ -149,7 +148,7 @@ ARCHDEFINES		 =
 ARCHPICFLAGS		 = -fpic -msingle-pic-base -mpic-register=r10
 
 # this seems to be the only way to add linker flags
-ARCHSCRIPT		+= --warn-common \
+EXTRA_LIBS		+= --warn-common \
 			   --gc-sections
 
 CFLAGS			 = $(ARCHCFLAGS) $(ARCHCWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -fno-common
@@ -167,13 +166,6 @@ OBJEXT			 = .o
 LIBEXT			 = .a
 EXEEXT			 =
 
-# If VERBOSE is set, don't hide the compiler invocations.
-ifeq ($(VERBOSE),YES)
-_v				 =
-else
-_v				 = @
-endif
-
 define PREPROCESS
 	@echo "CPP: $1->$2"
 	@$(CPP) $(CPPFLAGS) $(abspath $1) -o $2
@@ -181,17 +173,17 @@ endef
 
 define COMPILE
 	@echo "CC: $1"
-	$(_v)$(CC) -c $(CFLAGS) $(abspath $1) -o $2
+	$(Q)$(CC) -c $(CFLAGS) $(abspath $1) -o $2
 endef
 
 define COMPILEXX
 	@echo "CXX: $1"
-	$(_v)$(CXX) -c $(CXXFLAGS) $(abspath $1) -o $2
+	$(Q)$(CXX) -c $(CXXFLAGS) $(abspath $1) -o $2
 endef
 
 define ASSEMBLE
 	@echo "AS: $1"
-	$(_v)$(CC) -c $(AFLAGS) $(abspath $1) -o $2
+	$(Q)$(CC) -c $(AFLAGS) $(abspath $1) -o $2
 endef
 
 # produce partially-linked $1 from files in $2

From 7f18fcd55617bac9167c403e61b993853945e848 Mon Sep 17 00:00:00 2001
From: px4dev <px4@purgatory.org>
Date: Fri, 19 Oct 2012 18:51:50 -0700
Subject: [PATCH 38/43] Clean out old drivers we're not using anymore.

---
 nuttx/configs/px4fmu/include/drv_bma180.h   |  99 ----
 nuttx/configs/px4fmu/include/drv_hmc5883l.h | 100 ----
 nuttx/configs/px4fmu/include/drv_l3gd20.h   | 108 -----
 nuttx/configs/px4fmu/include/drv_lis331.h   |  83 ----
 nuttx/configs/px4fmu/include/drv_ms5611.h   |  76 ---
 nuttx/configs/px4fmu/src/Makefile           |   2 +-
 nuttx/configs/px4fmu/src/drv_bma180.c       | 341 -------------
 nuttx/configs/px4fmu/src/drv_hmc5833l.c     | 386 ---------------
 nuttx/configs/px4fmu/src/drv_l3gd20.c       | 364 --------------
 nuttx/configs/px4fmu/src/drv_lis331.c       | 272 -----------
 nuttx/configs/px4fmu/src/drv_ms5611.c       | 504 --------------------
 11 files changed, 1 insertion(+), 2334 deletions(-)
 delete mode 100644 nuttx/configs/px4fmu/include/drv_bma180.h
 delete mode 100644 nuttx/configs/px4fmu/include/drv_hmc5883l.h
 delete mode 100644 nuttx/configs/px4fmu/include/drv_l3gd20.h
 delete mode 100644 nuttx/configs/px4fmu/include/drv_lis331.h
 delete mode 100644 nuttx/configs/px4fmu/include/drv_ms5611.h
 delete mode 100644 nuttx/configs/px4fmu/src/drv_bma180.c
 delete mode 100644 nuttx/configs/px4fmu/src/drv_hmc5833l.c
 delete mode 100644 nuttx/configs/px4fmu/src/drv_l3gd20.c
 delete mode 100644 nuttx/configs/px4fmu/src/drv_lis331.c
 delete mode 100644 nuttx/configs/px4fmu/src/drv_ms5611.c

diff --git a/nuttx/configs/px4fmu/include/drv_bma180.h b/nuttx/configs/px4fmu/include/drv_bma180.h
deleted file mode 100644
index a403415e48..0000000000
--- a/nuttx/configs/px4fmu/include/drv_bma180.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- *   Copyright (C) 2012 Lorenz Meier. All rights reserved.
- *
- * 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 of the author or the names of 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.
- */
-
-/*
- * Driver for the BOSCH BMA180 MEMS accelerometer
- */
-
-/* IMPORTANT NOTES:
- *
- * SPI max. clock frequency: 25 Mhz
- * CS has to be high before transfer,
- * go low right before transfer and
- * go high again right after transfer
- *
- */
-
-#include <sys/ioctl.h>
-
-#define _BMA180BASE	0x6300
-#define BMA180C(_x)	_IOC(_BMA180BASE, _x)
-
-/* 
- * Sets the sensor internal sampling rate, and if a buffer
- * has been configured, the rate at which entries will be
- * added to the buffer.
- */
-#define BMA180_SETRATE		BMA180C(1)
-
-#define BMA180_RATE_LP_10HZ		(0<<4)
-#define BMA180_RATE_LP_20HZ		(1<<4)
-#define BMA180_RATE_LP_40HZ		(2<<4)
-#define BMA180_RATE_LP_75HZ		(3<<4)
-#define BMA180_RATE_LP_150HZ	(4<<4)
-#define BMA180_RATE_LP_300HZ	(5<<4)
-#define BMA180_RATE_LP_600HZ	(6<<4)
-#define BMA180_RATE_LP_1200HZ	(7<<4)
-
-/*
- * Sets the sensor internal range.
- */
-#define BMA180_SETRANGE		BMA180C(2)
-
-#define BMA180_RANGE_1G			(0<<1)
-#define BMA180_RANGE_1_5G		(1<<1)
-#define BMA180_RANGE_2G			(2<<1)
-#define BMA180_RANGE_3G			(3<<1)
-#define BMA180_RANGE_4G			(4<<1)
-#define BMA180_RANGE_8G			(5<<1)
-#define BMA180_RANGE_16G		(6<<1)
-
-/*
- * Sets the address of a shared BMA180_buffer
- * structure that is maintained by the driver.
- *
- * If zero is passed as the address, disables
- * the buffer updating.
- */
-#define BMA180_SETBUFFER	BMA180C(3)
-
-struct bma180_buffer {
-	uint32_t	size;		/* number of entries in the samples[] array */
-	uint32_t	next;		/* the next entry that will be populated */
-	struct {
-		uint16_t	x;
-		uint16_t	y;
-		uint16_t	z;
-		uint8_t		temp;
-	} samples[];
-};
-
-extern int	bma180_attach(struct spi_dev_s *spi, int spi_id);
diff --git a/nuttx/configs/px4fmu/include/drv_hmc5883l.h b/nuttx/configs/px4fmu/include/drv_hmc5883l.h
deleted file mode 100644
index 741c3e1544..0000000000
--- a/nuttx/configs/px4fmu/include/drv_hmc5883l.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/****************************************************************************
- *
- *   Copyright (C) 2012 PX4 Development Team. All rights reserved.
- *
- * 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 PX4 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.
- *
- ****************************************************************************/
-
-/*
- * Driver for the ST HMC5883L gyroscope
- */
-
-#include <sys/ioctl.h>
-
-#define _HMC5883LBASE	0x6100
-#define HMC5883LC(_x)	_IOC(_HMC5883LBASE, _x)
-
-/* 
- * Sets the sensor internal sampling rate, and if a buffer
- * has been configured, the rate at which entries will be
- * added to the buffer.
- */
-#define HMC5883L_SETRATE		HMC5883LC(1)
-
-/* set rate (configuration A register */
-#define HMC5883L_RATE_0_75HZ		(0 << 2) /* 0.75 Hz */
-#define HMC5883L_RATE_1_50HZ		(1 << 2) /* 1.5 Hz */
-#define HMC5883L_RATE_3_00HZ		(2 << 2) /* 3 Hz */
-#define HMC5883L_RATE_7_50HZ		(3 << 2) /* 7.5 Hz */
-#define HMC5883L_RATE_15HZ			(4 << 2) /* 15 Hz (default) */
-#define HMC5883L_RATE_30HZ			(5 << 2) /* 30 Hz */
-#define HMC5883L_RATE_75HZ			(6 << 2) /* 75 Hz */
-
-/*
- * Sets the sensor internal range.
- */
-#define HMC5883L_SETRANGE		HMC5883LC(2)
-
-#define HMC5883L_RANGE_0_88GA			(0 << 5)
-#define HMC5883L_RANGE_1_33GA			(1 << 5)
-#define HMC5883L_RANGE_1_90GA			(2 << 5)
-#define HMC5883L_RANGE_2_50GA			(3 << 5)
-#define HMC5883L_RANGE_4_00GA			(4 << 5)
-
-/*
- * Set the sensor measurement mode.
- */
-#define HMC5883L_MODE_NORMAL			(0 << 0)
-#define HMC5883L_MODE_POSITIVE_BIAS		(1 << 0)
-#define HMC5883L_MODE_NEGATIVE_BIAS		(1 << 1)
-
-/*
- * Sets the address of a shared HMC5883L_buffer
- * structure that is maintained by the driver.
- *
- * If zero is passed as the address, disables
- * the buffer updating.
- */
-#define HMC5883L_SETBUFFER		HMC5883LC(3)
-
-struct hmc5883l_buffer {
-	uint32_t	size;		/* number of entries in the samples[] array */
-	uint32_t	next;		/* the next entry that will be populated */
-	struct {
-		int16_t	x;
-		int16_t	y;
-		int16_t	z;
-	} samples[];
-};
-
-#define HMC5883L_RESET			HMC5883LC(4)
-#define HMC5883L_CALIBRATION_ON		HMC5883LC(5)
-#define HMC5883L_CALIBRATION_OFF	HMC5883LC(6)
-
-extern int	hmc5883l_attach(struct i2c_dev_s *i2c);
diff --git a/nuttx/configs/px4fmu/include/drv_l3gd20.h b/nuttx/configs/px4fmu/include/drv_l3gd20.h
deleted file mode 100644
index 3b284d60de..0000000000
--- a/nuttx/configs/px4fmu/include/drv_l3gd20.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/****************************************************************************
- *
- *   Copyright (C) 2012 PX4 Development Team. All rights reserved.
- *
- * 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 PX4 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.
- *
- ****************************************************************************/
-/*
- * Driver for the ST L3GD20 gyroscope
- */
-
-/* IMPORTANT NOTES:
- *
- * SPI max. clock frequency: 10 Mhz
- * CS has to be high before transfer,
- * go low right before transfer and
- * go high again right after transfer
- *
- */
-
-#include <sys/ioctl.h>
-
-#define _L3GD20BASE	0x6200
-#define L3GD20C(_x)	_IOC(_L3GD20BASE, _x)
-
-/* 
- * Sets the sensor internal sampling rate, and if a buffer
- * has been configured, the rate at which entries will be
- * added to the buffer.
- */
-#define L3GD20_SETRATE		L3GD20C(1)
-
-#define L3GD20_RATE_95HZ_LP_12_5HZ		((0<<7) | (0<<6) | (0<<5) | (0<<4))
-#define L3GD20_RATE_95HZ_LP_25HZ		((0<<7) | (0<<6) | (0<<5) | (1<<4))
-#define L3GD20_RATE_190HZ_LP_12_5HZ		((0<<7) | (1<<6) | (0<<5) | (0<<4))
-#define L3GD20_RATE_190HZ_LP_25HZ		((0<<7) | (1<<6) | (0<<5) | (1<<4))
-#define L3GD20_RATE_190HZ_LP_50HZ		((0<<7) | (1<<6) | (1<<5) | (0<<4))
-#define L3GD20_RATE_190HZ_LP_70HZ		((0<<7) | (1<<6) | (1<<5) | (1<<4))
-#define L3GD20_RATE_380HZ_LP_20HZ		((1<<7) | (0<<6) | (0<<5) | (0<<4))
-#define L3GD20_RATE_380HZ_LP_25HZ		((1<<7) | (0<<6) | (0<<5) | (1<<4))
-#define L3GD20_RATE_380HZ_LP_50HZ		((1<<7) | (0<<6) | (1<<5) | (0<<4))
-#define L3GD20_RATE_380HZ_LP_100HZ		((1<<7) | (0<<6) | (1<<5) | (1<<4))
-#define L3GD20_RATE_760HZ_LP_30HZ		((1<<7) | (1<<6) | (0<<5) | (0<<4))
-#define L3GD20_RATE_760HZ_LP_35HZ		((1<<7) | (1<<6) | (0<<5) | (1<<4))
-#define L3GD20_RATE_760HZ_LP_50HZ		((1<<7) | (1<<6) | (1<<5) | (0<<4))
-#define L3GD20_RATE_760HZ_LP_100HZ		((1<<7) | (1<<6) | (1<<5) | (1<<4))
-
-/*
- * Sets the sensor internal range.
- */
-#define L3GD20_SETRANGE		L3GD20C(2)
-
-#define L3GD20_RANGE_250DPS			(0<<4)
-#define L3GD20_RANGE_500DPS			(1<<4)
-#define L3GD20_RANGE_2000DPS		(3<<4)
-
-#define L3GD20_RATE_95HZ			((0<<6) | (0<<4))
-#define L3GD20_RATE_190HZ			((1<<6) | (0<<4))
-#define L3GD20_RATE_380HZ			((2<<6) | (1<<4))
-#define L3GD20_RATE_760HZ			((3<<6) | (2<<4))
-
-
-
-/*
- * Sets the address of a shared l3gd20_buffer
- * structure that is maintained by the driver.
- *
- * If zero is passed as the address, disables
- * the buffer updating.
- */
-#define L3GD20_SETBUFFER	L3GD20C(3)
-
-struct l3gd20_buffer {
-	uint32_t	size;		/* number of entries in the samples[] array */
-	uint32_t	next;		/* the next entry that will be populated */
-	struct {
-		int16_t	x;
-		int16_t	y;
-		int16_t	z;
-	} samples[];
-};
-
-extern int	l3gd20_attach(struct spi_dev_s *spi, int spi_id);
diff --git a/nuttx/configs/px4fmu/include/drv_lis331.h b/nuttx/configs/px4fmu/include/drv_lis331.h
deleted file mode 100644
index f4699cda06..0000000000
--- a/nuttx/configs/px4fmu/include/drv_lis331.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
- *
- *   Copyright (C) 2012 PX4 Development Team. All rights reserved.
- *
- * 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 PX4 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.
- *
- ****************************************************************************/
-
-/*
- * Driver for the ST LIS331 MEMS accelerometer
- */
-
-#include <sys/ioctl.h>
-
-#define _LIS331BASE	0x6900
-#define LIS331C(_x)	_IOC(_LIS331BASE, _x)
-
-/* 
- * Sets the sensor internal sampling rate, and if a buffer
- * has been configured, the rate at which entries will be
- * added to the buffer.
- */
-#define LIS331_SETRATE		LIS331C(1)
-
-#define LIS331_RATE_50Hz		(0<<3)
-#define LIS331_RATE_100Hz		(1<<3)
-#define LIS331_RATE_400Hz		(2<<3)
-#define LIS331_RATE_1000Hz		(3<<3)
-
-/*
- * Sets the sensor internal range.
- */
-#define LIS331_SETRANGE		LIS331C(2)
-
-#define LIS331_RANGE_2G			(0<<4)
-#define LIS331_RANGE_4G			(1<<4)
-#define LIS331_RANGE_8G			(3<<4)
-
-/*
- * Sets the address of a shared lis331_buffer
- * structure that is maintained by the driver.
- *
- * If zero is passed as the address, disables
- * the buffer updating.
- */
-#define LIS331_SETBUFFER	LIS331C(3)
-
-struct lis331_buffer {
-	uint32_t	size;		/* number of entries in the samples[] array */
-	uint32_t	next;		/* the next entry that will be populated */
-	struct {
-		uint16_t	x;
-		uint16_t	y;
-		uint16_t	z;
-	} samples[];
-};
-
-extern int	lis331_attach(struct spi_dev_s *spi, int spi_id);
diff --git a/nuttx/configs/px4fmu/include/drv_ms5611.h b/nuttx/configs/px4fmu/include/drv_ms5611.h
deleted file mode 100644
index 922a112190..0000000000
--- a/nuttx/configs/px4fmu/include/drv_ms5611.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *   Copyright (C) 2012 Lorenz Meier. All rights reserved.
- *
- * 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 of the author or the names of 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.
- */
-
-/*
- * Driver for the Meas Spec MS5611 barometric pressure sensor
- */
-
-#include <sys/ioctl.h>
-
-#define _MS5611BASE	0x6A00
-#define MS5611C(_x)	_IOC(_MS5611BASE, _x)
-
-/* 
- * Sets the sensor internal sampling rate, and if a buffer
- * has been configured, the rate at which entries will be
- * added to the buffer.
- */
-#define MS5611_SETRATE		MS5611C(1)
-
-/* set rate (configuration A register */
-#define MS5611_RATE_0_75HZ		(0 << 2) /* 0.75 Hz */
-
-/*
- * Sets the sensor internal range.
- */
-#define MS5611_SETRANGE		MS5611C(2)
-
-#define MS5611_RANGE_0_88GA			(0 << 5)
-
-/*
- * Sets the address of a shared MS5611_buffer
- * structure that is maintained by the driver.
- *
- * If zero is passed as the address, disables
- * the buffer updating.
- */
-#define MS5611_SETBUFFER	MS5611C(3)
-
-struct ms5611_buffer {
-	uint32_t	size;		/* number of entries in the samples[] array */
-	uint32_t	next;		/* the next entry that will be populated */
-	struct {
-		uint32_t	pressure;
-		uint16_t temperature;
-	} samples[];
-};
-
-extern int	ms5611_attach(struct i2c_dev_s *i2c);
diff --git a/nuttx/configs/px4fmu/src/Makefile b/nuttx/configs/px4fmu/src/Makefile
index 5a60b7d197..48b528f6a0 100644
--- a/nuttx/configs/px4fmu/src/Makefile
+++ b/nuttx/configs/px4fmu/src/Makefile
@@ -41,7 +41,7 @@ ASRCS		=
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 
 CSRCS		= up_boot.c up_leds.c up_spi.c up_hrt.c \
-		  drv_gpio.c drv_bma180.c drv_l3gd20.c \
+		  drv_gpio.c \
 		  drv_led.c drv_eeprom.c \
 		  drv_tone_alarm.c up_pwm_servo.c up_usbdev.c \
 		  up_cpuload.c
diff --git a/nuttx/configs/px4fmu/src/drv_bma180.c b/nuttx/configs/px4fmu/src/drv_bma180.c
deleted file mode 100644
index da80cc2e26..0000000000
--- a/nuttx/configs/px4fmu/src/drv_bma180.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- *   Copyright (C) 2012 Lorenz Meier. All rights reserved.
- *
- * 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 of the author or the names of 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.
- */
-
-/*
- * Driver for the Bosch BMA 180 MEMS accelerometer
- */
-
-#include <nuttx/config.h>
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <debug.h>
-#include <errno.h>
-
-#include <nuttx/spi.h>
-#include <nuttx/arch.h>
-#include <arch/board/board.h>
-
-#include <stdio.h>
-
-#include "chip.h"
-#include "px4fmu-internal.h"
-
-#include <arch/board/drv_bma180.h>
-
-/*
- * BMA180 registers
- */
-
-/* Important Notes:
- *
- *   - MAX SPI clock: 25 MHz
- *   - Readout time: 0.417 ms in high accuracy mode
- *   - Boot / ready time: 1.27 ms
- *
- */
-
-#define DIR_READ				(1<<7)
-#define DIR_WRITE				(0<<7)
-#define ADDR_INCREMENT			(1<<6)
-
-#define ADDR_CHIP_ID			0x00
-#define CHIP_ID					0x03
-#define ADDR_VERSION			0x01
-
-#define ADDR_CTRL_REG0			0x0D
-#define ADDR_CTRL_REG1			0x0E
-#define ADDR_CTRL_REG2			0x0F
-#define ADDR_BWTCS				0x20
-#define ADDR_CTRL_REG3			0x21
-#define ADDR_CTRL_REG4			0x22
-#define ADDR_OLSB1				0x35
-
-#define ADDR_ACC_X_LSB			0x02
-#define ADDR_ACC_Z_MSB			0x07
-#define ADDR_TEMPERATURE		0x08
-
-#define ADDR_STATUS_REG1		0x09
-#define ADDR_STATUS_REG2		0x0A
-#define ADDR_STATUS_REG3		0x0B
-#define ADDR_STATUS_REG4		0x0C
-
-#define ADDR_RESET				0x10
-#define SOFT_RESET				0xB6
-
-#define ADDR_DIS_I2C         	0x27
-
-#define REG0_WRITE_ENABLE		0x10
-
-#define RANGEMASK 0x0E
-#define BWMASK 0xF0
-
-
-static ssize_t	bma180_read(struct file *filp, FAR char *buffer, size_t buflen);
-static int	bma180_ioctl(struct file *filp, int cmd, unsigned long arg);
-
-static const struct file_operations bma180_fops = {
-	.read  = bma180_read,
-	.ioctl = bma180_ioctl,
-};
-
-struct bma180_dev_s
-{
-	struct spi_dev_s		*spi;
-	int						spi_id;
-	uint8_t					rate;
-	struct bma180_buffer	*buffer;
-};
-
-static struct bma180_dev_s	bma180_dev;
-
-static void	bma180_write_reg(uint8_t address, uint8_t data);
-static uint8_t	bma180_read_reg(uint8_t address);
-static bool	read_fifo(uint16_t *data);
-static int	bma180_set_range(uint8_t range);
-static int	bma180_set_rate(uint8_t rate);
-
-static void
-bma180_write_reg(uint8_t address, uint8_t data)
-{
-	uint8_t cmd[2] = { address | DIR_WRITE, data };
-    
-	SPI_SELECT(bma180_dev.spi, bma180_dev.spi_id, true);
-    SPI_SNDBLOCK(bma180_dev.spi, &cmd, sizeof(cmd));
-	SPI_SELECT(bma180_dev.spi, bma180_dev.spi_id, false);
-}
-
-static uint8_t
-bma180_read_reg(uint8_t address)
-{
-	uint8_t	cmd[2] = {address | DIR_READ, 0};
-	uint8_t data[2];
-    
-	SPI_SELECT(bma180_dev.spi, bma180_dev.spi_id, true);
-	SPI_EXCHANGE(bma180_dev.spi, cmd, data, sizeof(cmd));
-	SPI_SELECT(bma180_dev.spi, bma180_dev.spi_id, false);
-    
-	return data[1];	
-}
-
-static bool
-read_fifo(uint16_t *data)
-{
-	struct {		/* status register and data as read back from the device */
-		uint8_t		cmd;
-		int16_t		x;
-		int16_t		y;
-		int16_t		z;
-		uint8_t		temp;
-	} __attribute__((packed))	report;
-
-	report.cmd = ADDR_ACC_X_LSB | DIR_READ | ADDR_INCREMENT;
-
-	SPI_LOCK(bma180_dev.spi, true);
-	report.x = bma180_read_reg(ADDR_ACC_X_LSB);
-	report.x |= (bma180_read_reg(ADDR_ACC_X_LSB+1) << 8);
-	report.y = bma180_read_reg(ADDR_ACC_X_LSB+2);
-	report.y |= (bma180_read_reg(ADDR_ACC_X_LSB+3) << 8);
-	report.z = bma180_read_reg(ADDR_ACC_X_LSB+4);
-	report.z |= (bma180_read_reg(ADDR_ACC_X_LSB+5) << 8);
-	report.temp = bma180_read_reg(ADDR_ACC_X_LSB+6);
-	SPI_LOCK(bma180_dev.spi, false);
-
-	/* Collect status and remove two top bits */
-
-	uint8_t new_data = (report.x & 0x01) + (report.x & 0x01) + (report.x & 0x01);
-	report.x = (report.x >> 2);
-	report.y = (report.y >> 2);
-	report.z = (report.z >> 2);
-
-	data[0] = report.x;
-	data[1] = report.y;
-	data[2] = report.z;
-    
-	/* return 1 for all three axes new */
-	return (new_data > 0); // bit funky, depends on timing
-}
-
-static int
-bma180_set_range(uint8_t range)
-{
-	/* enable writing to chip config */
-	uint8_t ctrl0 = bma180_read_reg(ADDR_CTRL_REG0);
-	ctrl0 |= REG0_WRITE_ENABLE;
-	bma180_write_reg(ADDR_CTRL_REG0, ctrl0);
-
-	/* set range */
-	uint8_t olsb1 = bma180_read_reg(ADDR_OLSB1);
-	olsb1 &= (~RANGEMASK);
-	olsb1 |= (range);// & RANGEMASK);
-	bma180_write_reg(ADDR_OLSB1, olsb1);
-
-	// up_udelay(500);
-
-	/* block writing to chip config */
-	ctrl0 = bma180_read_reg(ADDR_CTRL_REG0);
-	ctrl0 &= (~REG0_WRITE_ENABLE);
-	bma180_write_reg(ADDR_CTRL_REG0, ctrl0);
-
-	uint8_t new_olsb1 = bma180_read_reg(ADDR_OLSB1);
-
-	/* return 0 on success, 1 on failure */
-	return !(olsb1 == new_olsb1);
-}
-
-static int
-bma180_set_rate(uint8_t rate)
-{
-	/* enable writing to chip config */
-	uint8_t ctrl0 = bma180_read_reg(ADDR_CTRL_REG0);
-	ctrl0 |= REG0_WRITE_ENABLE;
-	bma180_write_reg(ADDR_CTRL_REG0, ctrl0);
-
-	/* set rate / bandwidth */
-	uint8_t bwtcs = bma180_read_reg(ADDR_BWTCS);
-	bwtcs &= (~BWMASK);
-	bwtcs |= (rate);// & BWMASK);
-	bma180_write_reg(ADDR_BWTCS, bwtcs);
-
-	// up_udelay(500);
-
-	/* block writing to chip config */
-	ctrl0 = bma180_read_reg(ADDR_CTRL_REG0);
-	ctrl0 &= (~REG0_WRITE_ENABLE);
-	bma180_write_reg(ADDR_CTRL_REG0, ctrl0);
-
-	uint8_t new_bwtcs = bma180_read_reg(ADDR_BWTCS);
-
-	/* return 0 on success, 1 on failure */
-	return !(bwtcs == new_bwtcs);
-}
-
-static ssize_t
-bma180_read(struct file *filp, char *buffer, size_t buflen)
-{
-	/* if the buffer is large enough, and data are available, return success */
-	if (buflen >= 6) {
-		if (read_fifo((uint16_t *)buffer))
-			return 6;
-
-		/* no data */
-		return 0;
-	}
-    
-	/* buffer too small */
-	errno = ENOSPC;
-	return ERROR;
-}
-
-static int
-bma180_ioctl(struct file *filp, int cmd, unsigned long arg)
-{
-	int	result = ERROR;
-    
-	switch (cmd) {
-        case BMA180_SETRATE:
-            result = bma180_set_rate(arg);
-            break;
-
-        case BMA180_SETRANGE:
-            result = bma180_set_range(arg);
-            break;
-
-        case BMA180_SETBUFFER:
-            bma180_dev.buffer = (struct bma180_buffer *)arg;
-            result = 0;
-            break;
-	}
-    
-	if (result)
-		errno = EINVAL;
-	return result;
-}
-
-int
-bma180_attach(struct spi_dev_s *spi, int spi_id)
-{
-	int	result = ERROR;
-	
-	bma180_dev.spi = spi;
-	bma180_dev.spi_id = spi_id;
-    
-	SPI_LOCK(bma180_dev.spi, true);
-
-	/* verify that the device is attached and functioning */
-	if (bma180_read_reg(ADDR_CHIP_ID) == CHIP_ID) {
-        
-		bma180_write_reg(ADDR_RESET, SOFT_RESET);       // page 48
-
-		up_udelay(13000);                               // wait 12 ms, see page 49
-
-		/* Configuring the BMA180 */
-
-		/* enable writing to chip config */
-		uint8_t ctrl0 = bma180_read_reg(ADDR_CTRL_REG0);
-		ctrl0 |= REG0_WRITE_ENABLE;
-		bma180_write_reg(ADDR_CTRL_REG0, ctrl0);
-
-		/* disable I2C interface, datasheet page 31 */
-		uint8_t disi2c = bma180_read_reg(ADDR_DIS_I2C);
-		disi2c |= 0x01;
-		bma180_write_reg(ADDR_DIS_I2C, disi2c);
-
-		/* block writing to chip config */
-		ctrl0 = bma180_read_reg(ADDR_CTRL_REG0);
-		ctrl0 &= (~REG0_WRITE_ENABLE);
-		bma180_write_reg(ADDR_CTRL_REG0, ctrl0);
-
-		// up_udelay(500);
-
-		/* set rate */
-		result = bma180_set_rate(BMA180_RATE_LP_600HZ);
-
-		// up_udelay(500);
-
-		/* set range */
-		result += bma180_set_range(BMA180_RANGE_4G);
-
-		// up_udelay(500);
-
-		if (result == 0) {
-			/* make ourselves available */
-			register_driver("/dev/bma180", &bma180_fops, 0666, NULL);
-		}
-	} else {
-		errno = EIO;
-	}
-
-	SPI_LOCK(bma180_dev.spi, false);
-    
-	return result;
-}
-
diff --git a/nuttx/configs/px4fmu/src/drv_hmc5833l.c b/nuttx/configs/px4fmu/src/drv_hmc5833l.c
deleted file mode 100644
index d51d654f7b..0000000000
--- a/nuttx/configs/px4fmu/src/drv_hmc5833l.c
+++ /dev/null
@@ -1,386 +0,0 @@
-/*
- *   Copyright (C) 2012 Lorenz Meier. All rights reserved.
- *
- * 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 of the author or the names of 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.
- */
-
-/**
- * @file drv_hmc5883l.c
- * Driver for the Honeywell/ST HMC5883L MEMS magnetometer
- */
-
-#include <nuttx/config.h>
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <debug.h>
-#include <errno.h>
-
-#include <nuttx/i2c.h>
-#include <arch/board/board.h>
-
-#include "chip.h"
-#include "px4fmu-internal.h"
-
-#include <arch/board/drv_hmc5883l.h>
-
-#define ADDR_CONF_A				0x00
-#define ADDR_CONF_B				0x01
-#define ADDR_MODE				0x02
-#define ADDR_DATA_OUT_X_MSB		0x03
-#define ADDR_DATA_OUT_X_LSB		0x04
-#define ADDR_DATA_OUT_Z_MSB		0x05
-#define ADDR_DATA_OUT_Z_LSB		0x06
-#define ADDR_DATA_OUT_Y_MSB		0x07
-#define ADDR_DATA_OUT_Y_LSB		0x08
-#define ADDR_STATUS				0x09
-#define ADDR_ID_A				0x10
-#define ADDR_ID_B				0x11
-#define ADDR_ID_C				0x12
-
-#define HMC5883L_ADDRESS		0x1E
-
-/* modes not changeable outside of driver */
-#define HMC5883L_MODE_NORMAL			(0 << 0)  /* default */
-#define HMC5883L_MODE_POSITIVE_BIAS		(1 << 0)  /* positive bias */
-#define HMC5883L_MODE_NEGATIVE_BIAS		(1 << 1)  /* negative bias */
-
-#define HMC5883L_AVERAGING_1		(0 << 5) /* conf a register */
-#define HMC5883L_AVERAGING_2		(1 << 5)
-#define HMC5883L_AVERAGING_4		(2 << 5)
-#define HMC5883L_AVERAGING_8		(3 << 5)
-
-#define MODE_REG_CONTINOUS_MODE		(0 << 0)
-#define MODE_REG_SINGLE_MODE		(1 << 0) /* default */
-
-#define STATUS_REG_DATA_OUT_LOCK	(1 << 1) /* page 16: set if data is only partially read, read device to reset */
-#define STATUS_REG_DATA_READY		(1 << 0) /* page 16: set if all axes have valid measurements */
-
-#define ID_A_WHO_AM_I			'H'
-#define ID_B_WHO_AM_I			'4'
-#define ID_C_WHO_AM_I			'3'
-
-static FAR struct hmc5883l_dev_s	hmc5883l_dev;
-
-static ssize_t hmc5883l_read(struct file *filp, FAR char *buffer, size_t buflen);
-static int hmc5883l_ioctl(struct file *filp, int cmd, unsigned long arg);
-
-static const struct file_operations hmc5883l_fops = {
-	.open  = 0,
-	.close = 0,
-	.read  = hmc5883l_read,
-	.write = 0,
-	.seek  = 0,
-	.ioctl = hmc5883l_ioctl,
-#ifndef CONFIG_DISABLE_POLL
-	.poll  = 0
-#endif
-};
-
-struct hmc5883l_dev_s
-{
-	struct i2c_dev_s	*i2c;
-	uint8_t			rate;
-	struct hmc5883l_buffer	*buffer;
-};
-static bool hmc5883l_calibration_enabled = false;
-
-static int hmc5883l_write_reg(uint8_t address, uint8_t data);
-static int hmc5883l_read_reg(uint8_t address);
-static int hmc5883l_reset(void);
-
-static int
-hmc5883l_write_reg(uint8_t address, uint8_t data)
-{
-	uint8_t cmd[] = {address, data};
-	return I2C_WRITE(hmc5883l_dev.i2c, cmd, 2);
-}
-
-static int
-hmc5883l_read_reg(uint8_t address)
-{
-	uint8_t cmd = address;
-	uint8_t data;
-
-	int ret = I2C_WRITEREAD(hmc5883l_dev.i2c, &cmd, 1, &data, 1);
-	/* return data on success, error code on failure */
-	if (ret == OK) {
-		ret = data;
-	}
-	return ret;
-}
-
-static int
-hmc5883l_set_range(uint8_t range)
-{
-	I2C_SETADDRESS(hmc5883l_dev.i2c, HMC5883L_ADDRESS, 7);
-
-
-	/* mask out illegal bit positions */
-	uint8_t write_range = range; //& REG4_RANGE_MASK;
-	/* immediately return if user supplied invalid value */
-	if (write_range != range) return EINVAL;
-	/* set remaining bits to a sane value */
-//	write_range |= REG4_BDU;
-	/* write to device */
-	hmc5883l_write_reg(ADDR_CONF_B, write_range);
-	/* return 0 if register value is now written value, 1 if unchanged */
-	return !(hmc5883l_read_reg(ADDR_CONF_B) == write_range);
-}
-
-static int
-hmc5883l_set_rate(uint8_t rate)
-{
-	I2C_SETADDRESS(hmc5883l_dev.i2c, HMC5883L_ADDRESS, 7);
-	/* mask out illegal bit positions */
-	uint8_t write_rate = rate;// & REG1_RATE_LP_MASK;
-	/* immediately return if user supplied invalid value */
-	if (write_rate != rate) return EINVAL;
-	/* set remaining bits to a sane value */
-//	write_rate |= REG1_POWER_NORMAL | REG1_Z_ENABLE | REG1_Y_ENABLE | REG1_X_ENABLE;
-	write_rate |= HMC5883L_AVERAGING_8;
-	/* write to device */
-	hmc5883l_write_reg(ADDR_CONF_A, write_rate);
-	/* return 0 if register value is now written value, 1 if unchanged */
-	return !(hmc5883l_read_reg(ADDR_CONF_A) == write_rate);
-}
-
-static int
-hmc5883l_set_mode(uint8_t mode)
-{
-	// I2C_SETADDRESS(hmc5883l_dev.i2c, HMC5883L_ADDRESS, 7);
-	// /* mask out illegal bit positions */
-	// uint8_t write_mode = mode & 0x03;
-	// /* immediately return if user supplied invalid value */
-	// if (write_mode != mode) return EINVAL;
-	// /* set mode */
-	// write_mode |= hmc5883l_read_reg(ADDR_CONF_A);
-	// /* set remaining bits to a sane value */
-	// write_mode |= HMC5883L_AVERAGING_8;
-	// /* write to device */
-	// hmc5883l_write_reg(ADDR_CONF_A, write_mode);
-	// /* return 0 if register value is now written value, 1 if unchanged */
-	// return !(hmc5883l_read_reg(ADDR_CONF_A) == write_mode);
-}
-
-static bool
-read_values(int16_t *data)
-{
-	struct { /* status register and data as read back from the device */
-		int16_t		x;
-		int16_t		z;
-		int16_t		y;
-		uint8_t		status;
-	} __attribute__((packed))	hmc_report;
-	hmc_report.status = 0;
-
-	static int read_err_count = 0;
-
-	/* exchange the report structure with the device */
-
-	uint8_t cmd = ADDR_DATA_OUT_X_MSB;
-
-	int ret = 0;
-
-	I2C_SETADDRESS(hmc5883l_dev.i2c, HMC5883L_ADDRESS, 7);
-
-	/* set device into single mode, trigger next measurement */
-	ret = hmc5883l_write_reg(ADDR_MODE, MODE_REG_SINGLE_MODE);
-
-	/* Only execute consecutive steps on success */
-	if (ret == OK)
-	  {
-		cmd = ADDR_DATA_OUT_X_MSB;
-		ret = I2C_WRITEREAD(hmc5883l_dev.i2c, &cmd, 1, (uint8_t*)&hmc_report, 6);
-		if (ret == OK)
-		  {
-			/* Six bytes to read, stop if timed out */
-			int hmc_status = hmc5883l_read_reg(ADDR_STATUS);
-			if (hmc_status < 0)
-			  {
-			  	//if (hmc_status == ETIMEDOUT)
-			  	hmc5883l_reset();
-			  	ret = hmc_status;
-			  }
-			else
-			  {
-			  	hmc_report.status = hmc_status;
-			  	ret = OK;
-			  }
-		  }
-		  else
-		  {
-		  	if (ret == ETIMEDOUT || ret == -ETIMEDOUT) hmc5883l_reset();
-		  }
-	  }
-	  else
-	  {
-	  	if (ret == ETIMEDOUT || ret == -ETIMEDOUT) hmc5883l_reset();
-	  }
-
-	if (ret != OK)
-	{
-		read_err_count++;
-		/* If the last reads failed as well, reset the bus and chip */
-		if (read_err_count > 3) hmc5883l_reset();
-
-		*get_errno_ptr() = -ret;
-	} else {
-		read_err_count = 0;
-		/* write values, and exchange the two 8bit blocks (big endian to little endian) */
-		data[0] = ((hmc_report.x & 0x00FF) << 8) | ((hmc_report.x & 0xFF00) >> 8);
-		data[1] = ((hmc_report.y & 0x00FF) << 8) | ((hmc_report.y & 0xFF00) >> 8);
-		data[2] = ((hmc_report.z & 0x00FF) << 8) | ((hmc_report.z & 0xFF00) >> 8);
-		// XXX TODO
-		// write mode, range and lp-frequency enum values into data[3]-[6]
-		if ((hmc_report.status & STATUS_REG_DATA_READY) > 0)
-		{
-			ret = 14;
-		} else {
-			ret = -EAGAIN;
-		}
-	}
-
-	/* return len if new data is available, error else. hmc_report.status is 0 on errors */
-	return ret;
-}
-
-static ssize_t
-hmc5883l_read(struct file *filp, char *buffer, size_t buflen)
-{
-	/* if the buffer is large enough, and data are available, return success */
-	if (buflen >= 14) {
-		return read_values((int16_t *)buffer);
-	}
-
-	/* buffer too small */
-	*get_errno_ptr() = ENOSPC;
-	return -ERROR;
-}
-
-static int
-hmc5883l_ioctl(struct file *filp, int cmd, unsigned long arg)
-{
-	int	result = ERROR;
-
-	switch (cmd) {
-	case HMC5883L_SETRATE:
-        	result = hmc5883l_set_rate(arg);
-        	break;
-
-	case HMC5883L_SETRANGE:
-		result = hmc5883l_set_range(arg);
-		break;
-
-	case HMC5883L_CALIBRATION_ON:
-		hmc5883l_calibration_enabled = true;
-		result = OK;
-		break;
-
-	case HMC5883L_CALIBRATION_OFF:
-		hmc5883l_calibration_enabled = false;
-		result = OK;
-		break;
-//
-//    case HMC5883L_SETBUFFER:
-//        hmc5883l_dev.buffer = (struct hmc5883l_buffer *)arg;
-//        result = 0;
-//        break;
-
-	case HMC5883L_RESET:
-            result = hmc5883l_reset();
-            break;
-	}
-
-	if (result)
-		errno = EINVAL;
-	return result;
-}
-
-extern int up_i2creset(FAR struct i2c_dev_s * dev);
-
-int hmc5883l_reset()
-{
-	int ret;
-#if 1
-	ret = up_i2creset(hmc5883l_dev.i2c);
-	printf("HMC5883: BUS RESET %s\n", ret ? "FAIL" : "OK");
-#else
-	printf("[hmc5883l drv] Resettet I2C2 BUS\n");
-	up_i2cuninitialize(hmc5883l_dev.i2c);
-	hmc5883l_dev.i2c = up_i2cinitialize(2);
-	I2C_SETFREQUENCY(hmc5883l_dev.i2c, 400000);
-#endif
-	return ret;
-}
-
-int
-hmc5883l_attach(struct i2c_dev_s *i2c)
-{
-	int	result = ERROR;
-
-	hmc5883l_dev.i2c = i2c;
-
-//	I2C_LOCK(hmc5883l_dev.i2c, true);
-	I2C_SETADDRESS(hmc5883l_dev.i2c, HMC5883L_ADDRESS, 7);
-
-	uint8_t cmd = ADDR_STATUS;
-	uint8_t status_id[4] = {0, 0, 0, 0};
-
-
-	int ret = I2C_WRITEREAD(i2c, &cmd, 1, status_id, 4);
-
-	/* verify that the device is attached and functioning */
-	if ((ret >= 0) && (status_id[1] == ID_A_WHO_AM_I) && (status_id[2] == ID_B_WHO_AM_I) && (status_id[3] == ID_C_WHO_AM_I)) {
-
-		/* set update rate to 75 Hz */
-		/* set 0.88 Ga range */
-		if ((ret != 0) || (hmc5883l_set_range(HMC5883L_RANGE_0_88GA) != 0) ||
-				(hmc5883l_set_rate(HMC5883L_RATE_75HZ) != 0))
-		{
-			errno = EIO;
-		} else {
-
-			/* set device into single mode, start measurement */
-			ret = hmc5883l_write_reg(ADDR_MODE, MODE_REG_SINGLE_MODE);
-
-			/* make ourselves available */
-			register_driver("/dev/hmc5883l", &hmc5883l_fops, 0666, NULL);
-
-			result = 0;
-		}
-
-	} else {
-		errno = EIO;
-	}
-
-
-
-	return result;
-}
diff --git a/nuttx/configs/px4fmu/src/drv_l3gd20.c b/nuttx/configs/px4fmu/src/drv_l3gd20.c
deleted file mode 100644
index 19f2d032fb..0000000000
--- a/nuttx/configs/px4fmu/src/drv_l3gd20.c
+++ /dev/null
@@ -1,364 +0,0 @@
-/****************************************************************************
- *
- *   Copyright (C) 2012 PX4 Development Team. All rights reserved.
- *
- * 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 PX4 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.
- *
- ****************************************************************************/
-
-/*
- * Driver for the ST L3GD20 MEMS gyroscope
- */
-
-#include <nuttx/config.h>
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <debug.h>
-#include <errno.h>
-
-#include <nuttx/spi.h>
-#include <arch/board/board.h>
-#include <nuttx/arch.h>
-#include <arch/board/drv_l3gd20.h>
-
-#include "chip.h"
-#include "stm32_internal.h"
-#include "px4fmu-internal.h"
-
-#define DIR_READ					(1<<7)
-#define DIR_WRITE					(0<<7)
-#define ADDR_INCREMENT				(1<<6)
-
-#define ADDR_WHO_AM_I				0x0F
-#define WHO_I_AM					0xD4
-#define ADDR_CTRL_REG1				0x20
-#define ADDR_CTRL_REG2				0x21
-#define ADDR_CTRL_REG3				0x22
-#define ADDR_CTRL_REG4				0x23
-#define ADDR_CTRL_REG5				0x24
-#define ADDR_REFERENCE				0x25
-#define ADDR_OUT_TEMP				0x26
-#define ADDR_STATUS_REG				0x27
-#define ADDR_OUT_X_L				0x28
-#define ADDR_OUT_X_H				0x29
-#define ADDR_OUT_Y_L				0x2A
-#define ADDR_OUT_Y_H				0x2B
-#define ADDR_OUT_Z_L				0x2C
-#define ADDR_OUT_Z_H				0x2D
-#define ADDR_FIFO_CTRL_REG			0x2E
-#define ADDR_FIFO_SRC_REG			0x2F
-#define ADDR_INT1_CFG				0x30
-#define ADDR_INT1_SRC				0x31
-#define ADDR_INT1_TSH_XH			0x32
-#define ADDR_INT1_TSH_XL			0x33
-#define ADDR_INT1_TSH_YH			0x34
-#define ADDR_INT1_TSH_YL			0x35
-#define ADDR_INT1_TSH_ZH			0x36
-#define ADDR_INT1_TSH_ZL			0x37
-#define ADDR_INT1_DURATION			0x38
-
-#define REG1_RATE_LP_MASK			0xF0 /* Mask to guard partial register update */
-#define REG4_RANGE_MASK				0x30 /* Mask to guard partial register update */
-
-/* Internal configuration values */
-#define REG1_POWER_NORMAL			(1<<3)
-#define REG1_Z_ENABLE				(1<<2)
-#define REG1_Y_ENABLE				(1<<1)
-#define REG1_X_ENABLE				(1<<0)
-
-#define REG4_BDU					(1<<7)
-#define REG4_BLE					(1<<6)
-//#define REG4_SPI_3WIRE				(1<<0)
-
-#define REG5_FIFO_ENABLE			(1<<6)
-#define REG5_REBOOT_MEMORY			(1<<7)
-
-#define STATUS_ZYXOR				(1<<7)
-#define STATUS_ZOR					(1<<6)
-#define STATUS_YOR					(1<<5)
-#define STATUS_XOR					(1<<4)
-#define STATUS_ZYXDA				(1<<3)
-#define STATUS_ZDA					(1<<2)
-#define STATUS_YDA					(1<<1)
-#define STATUS_XDA					(1<<0)
-
-#define FIFO_CTRL_BYPASS_MODE				(0<<5)
-#define FIFO_CTRL_FIFO_MODE					(1<<5)
-#define FIFO_CTRL_STREAM_MODE				(1<<6)
-#define FIFO_CTRL_STREAM_TO_FIFO_MODE		(3<<5)
-#define FIFO_CTRL_BYPASS_TO_STREAM_MODE		(1<<7)
-
-static FAR struct l3gd20_dev_s	l3gd20_dev;
-
-static ssize_t l3gd20_read(struct file *filp, FAR char *buffer, size_t buflen);
-static int l3gd20_ioctl(struct file *filp, int cmd, unsigned long arg);
-
-static const struct file_operations l3gd20_fops = {
-	.open  = 0,
-	.close = 0,
-	.read  = l3gd20_read,
-	.write = 0,
-	.seek  = 0,
-	.ioctl = l3gd20_ioctl,
-#ifndef CONFIG_DISABLE_POLL
-	.poll  = 0
-#endif
-};
-
-struct l3gd20_dev_s
-{
-	struct spi_dev_s	*spi;
-	int			spi_id;
-	uint8_t			rate;
-	struct l3gd20_buffer	*buffer;
-};
-
-static void	l3gd20_write_reg(uint8_t address, uint8_t data);
-static uint8_t	l3gd20_read_reg(uint8_t address);
-
-static void
-l3gd20_write_reg(uint8_t address, uint8_t data)
-{
-	uint8_t cmd[2] = { address | DIR_WRITE, data };
-
-	SPI_SELECT(l3gd20_dev.spi, l3gd20_dev.spi_id, true);
-	SPI_SNDBLOCK(l3gd20_dev.spi, &cmd, sizeof(cmd));
-	SPI_SELECT(l3gd20_dev.spi, l3gd20_dev.spi_id, false);
-}
-
-static uint8_t
-l3gd20_read_reg(uint8_t address)
-{
-	uint8_t	cmd[2] = {address | DIR_READ, 0};
-	uint8_t data[2];
-
-	SPI_SELECT(l3gd20_dev.spi, l3gd20_dev.spi_id, true);
-	SPI_EXCHANGE(l3gd20_dev.spi, cmd, data, sizeof(cmd));
-	SPI_SELECT(l3gd20_dev.spi, l3gd20_dev.spi_id, false);
-
-	return data[1];
-}
-
-static int
-set_range(uint8_t range)
-{
-	/* mask out illegal bit positions */
-	uint8_t write_range = range & REG4_RANGE_MASK;
-	/* immediately return if user supplied invalid value */
-	if (write_range != range) return EINVAL;
-	/* set remaining bits to a sane value */
-	write_range |= REG4_BDU;
-	/* write to device */
-	l3gd20_write_reg(ADDR_CTRL_REG4, write_range);
-	/* return 0 if register value is now written value, 1 if unchanged */
-	return !(l3gd20_read_reg(ADDR_CTRL_REG4) == write_range);
-}
-
-static int
-set_rate(uint8_t rate)
-{
-	/* mask out illegal bit positions */
-	uint8_t write_rate = rate & REG1_RATE_LP_MASK;
-	/* immediately return if user supplied invalid value */
-	if (write_rate != rate) return EINVAL;
-	/* set remaining bits to a sane value */
-	write_rate |= REG1_POWER_NORMAL | REG1_Z_ENABLE | REG1_Y_ENABLE | REG1_X_ENABLE;
-	/* write to device */
-	l3gd20_write_reg(ADDR_CTRL_REG1, write_rate);
-	/* return 0 if register value is now written value, 1 if unchanged */
-	return !(l3gd20_read_reg(ADDR_CTRL_REG1) == write_rate);
-}
-
-static int
-read_fifo(int16_t *data)
-{
-
-	struct {					/* status register and data as read back from the device */
-		uint8_t		cmd;
-		uint8_t		temp;
-		uint8_t		status;
-		int16_t		x;
-		int16_t		y;
-		int16_t		z;
-	} __attribute__((packed))	report = {.status = 11};
-
-	report.cmd = 0x26 | DIR_READ | ADDR_INCREMENT;
-
-	SPI_LOCK(l3gd20_dev.spi, true);
-	SPI_SELECT(l3gd20_dev.spi, PX4_SPIDEV_GYRO, true);
-	SPI_SETFREQUENCY(l3gd20_dev.spi, 25000000);
-
-	SPI_EXCHANGE(l3gd20_dev.spi, &report, &report, sizeof(report));
-
-	/* XXX if the status value is unchanged, attempt a second exchange */
-	if (report.status == 11) SPI_EXCHANGE(l3gd20_dev.spi, &report, &report, sizeof(report));
-	/* XXX set magic error value if this still didn't succeed */
-	if (report.status == 11) report.status = 12;
-
-	SPI_SETFREQUENCY(l3gd20_dev.spi, 10000000);
-	SPI_SELECT(l3gd20_dev.spi, PX4_SPIDEV_GYRO, false);
-	SPI_LOCK(l3gd20_dev.spi, false);
-
-	data[0] = report.x;
-	data[1] = report.y;
-	data[2] = report.z;
-
-	/* if all axes are valid, return buflen (6), else return negative status */
-	int ret = -((int)report.status);
-	if (STATUS_ZYXDA == (report.status & STATUS_ZYXDA) || STATUS_ZYXOR == (report.status & STATUS_ZYXOR))
-	{
-		ret = 6;
-	}
-
-	return ret;
-}
-
-static ssize_t
-l3gd20_read(struct file *filp, char *buffer, size_t buflen)
-{
-	/* if the buffer is large enough, and data are available, return success */
-	if (buflen >= 6) {
-		/* return buflen or a negative value */
-		int ret = read_fifo((int16_t *)buffer);
-		if (ret != 6) *get_errno_ptr() = EAGAIN;
-		return ret;
-	}
-
-	/* buffer too small */
-	*get_errno_ptr() = ENOSPC;
-	return ERROR;
-}
-
-static int
-l3gd20_ioctl(struct file *filp, int cmd, unsigned long arg)
-{
-	int	result = ERROR;
-
-	switch (cmd) {
-        case L3GD20_SETRATE:
-            if ((arg & REG1_RATE_LP_MASK) == arg) {
-            	SPI_LOCK(l3gd20_dev.spi, true);
-                set_rate(arg);
-                SPI_LOCK(l3gd20_dev.spi, false);
-                result = 0;
-                l3gd20_dev.rate = arg;
-            }
-            break;
-
-        case L3GD20_SETRANGE:
-            if ((arg & REG4_RANGE_MASK) == arg) {
-            	SPI_LOCK(l3gd20_dev.spi, true);
-                set_range(arg);
-                SPI_LOCK(l3gd20_dev.spi, false);
-                result = 0;
-            }
-            break;
-
-        case L3GD20_SETBUFFER:
-            l3gd20_dev.buffer = (struct l3gd20_buffer *)arg;
-            result = 0;
-            break;
-	}
-
-	if (result)
-		errno = EINVAL;
-	return result;
-}
-
-int
-l3gd20_attach(struct spi_dev_s *spi, int spi_id)
-{
-	int	result = ERROR;
-
-	l3gd20_dev.spi = spi;
-	l3gd20_dev.spi_id = spi_id;
-
-	SPI_LOCK(l3gd20_dev.spi, true);
-	/* read dummy value to void to clear SPI statemachine on sensor */
-	(void)l3gd20_read_reg(ADDR_WHO_AM_I);
-
-	/* verify that the device is attached and functioning */
-	if (l3gd20_read_reg(ADDR_WHO_AM_I) == WHO_I_AM) {
-
-		/* reset device memory */
-		//l3gd20_write_reg(ADDR_CTRL_REG5, REG5_REBOOT_MEMORY);
-		//up_udelay(1000);
-
-		/* set default configuration */
- 	 	l3gd20_write_reg(ADDR_CTRL_REG1, REG1_POWER_NORMAL | REG1_Z_ENABLE | REG1_Y_ENABLE | REG1_X_ENABLE);
-		l3gd20_write_reg(ADDR_CTRL_REG2, 0);		/* disable high-pass filters */
-		l3gd20_write_reg(ADDR_CTRL_REG3, 0);		/* no interrupts - we don't use them */
-		l3gd20_write_reg(ADDR_CTRL_REG4, 0x10);
-		l3gd20_write_reg(ADDR_CTRL_REG5, 0);
-
-		l3gd20_write_reg(ADDR_CTRL_REG5, REG5_FIFO_ENABLE);	  /* disable wake-on-interrupt */
-		l3gd20_write_reg(ADDR_FIFO_CTRL_REG, FIFO_CTRL_STREAM_MODE); /* Enable FIFO, old data is overwritten */
-
-		if ((set_range(L3GD20_RANGE_500DPS) != 0) ||
-				(set_rate(L3GD20_RATE_760HZ_LP_100HZ) != 0))	/* takes device out of low-power mode */
-		{
-			errno = EIO;
-		} else {
-			/* Read out the first few funky values */
-			struct {					/* status register and data as read back from the device */
-				uint8_t		cmd;
-				uint8_t		temp;
-				uint8_t		status;
-				int16_t		x;
-				int16_t		y;
-				int16_t		z;
-			} __attribute__((packed))	report;
-
-			report.cmd = 0x26 | DIR_READ | ADDR_INCREMENT;
-
-			SPI_SELECT(spi, PX4_SPIDEV_GYRO, true);
-			SPI_EXCHANGE(spi, &report, &report, sizeof(report));
-			SPI_SELECT(spi, PX4_SPIDEV_GYRO, false);
-			up_udelay(500);
-			/* And read another set */
-			SPI_SELECT(spi, PX4_SPIDEV_GYRO, true);
-			SPI_EXCHANGE(spi, &report, &report, sizeof(report));
-			SPI_SELECT(spi, PX4_SPIDEV_GYRO, false);
-
-
-			/* make ourselves available */
-			register_driver("/dev/l3gd20", &l3gd20_fops, 0666, NULL);
-
-			result = 0;
-		}
-
-	} else {
-
-		errno = EIO;
-	}
-
-	SPI_LOCK(l3gd20_dev.spi, false);
-
-	return result;
-}
diff --git a/nuttx/configs/px4fmu/src/drv_lis331.c b/nuttx/configs/px4fmu/src/drv_lis331.c
deleted file mode 100644
index fd477b46fb..0000000000
--- a/nuttx/configs/px4fmu/src/drv_lis331.c
+++ /dev/null
@@ -1,272 +0,0 @@
-/****************************************************************************
- *
- *   Copyright (C) 2012 PX4 Development Team. All rights reserved.
- *
- * 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 PX4 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.
- *
- ****************************************************************************/
-
-/*
- * Driver for the ST LIS331 MEMS accelerometer
- */
-
-#include <nuttx/config.h>
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <debug.h>
-#include <errno.h>
-
-#include <nuttx/spi.h>
-#include <arch/board/board.h>
-
-#include "up_arch.h"
-#include "chip.h"
-#include "stm32_internal.h"
-#include "px4fmu-internal.h"
-
-#include <arch/board/drv_lis331.h>
-
-/*
- * LIS331 registers
- */
-
-#define DIR_READ		(1<<7)
-#define DIR_WRITE		(0<<7)
-#define ADDR_INCREMENT		(1<<6)
-
-#define ADDR_WHO_AM_I		0x0f
-#define WHO_I_AM		0x32
-
-#define ADDR_CTRL_REG1		0x20		/* sample rate constants are in the public header */
-#define REG1_POWER_NORMAL		(1<<5)
-#define REG1_RATE_MASK			(3<<3)
-#define REG1_Z_ENABLE			(1<<2)
-#define REG1_Y_ENABLE			(1<<1)
-#define REG1_X_ENABLE			(1<<0)
-
-#define ADDR_CTRL_REG2		0x21
-
-#define ADDR_CTRL_REG3		0x22
-
-#define ADDR_CTRL_REG4		0x23
-#define REG4_BDU			(1<<7)
-#define REG4_BIG_ENDIAN			(1<<6)
-#define REG4_RANGE_MASK			(3<<4)
-#define REG4_SPI_3WIRE			(1<<0)
-
-#define ADDR_CTRL_REG5		0x24
-
-#define ADDR_HP_FILTER_RESET	0x25
-#define ADDR_REFERENCE		0x26
-#define ADDR_STATUS_REG		0x27
-#define STATUS_ZYXOR			(1<<7)
-#define STATUS_ZOR				(1<<6)
-#define STATUS_YOR				(1<<5)
-#define STATUS_XOR				(1<<4)
-#define STATUS_ZYXDA			(1<<3)
-#define STATUS_ZDA				(1<<2)
-#define STATUS_YDA				(1<<1)
-#define STATUS_XDA				(1<<0)
-
-#define ADDR_OUT_X		0x28	/* 16 bits */
-#define ADDR_OUT_Y		0x2A	/* 16 bits */
-#define ADDR_OUT_Z		0x2C	/* 16 bits */
-
-
-static ssize_t	lis331_read(struct file *filp, FAR char *buffer, size_t buflen);
-static int	lis331_ioctl(struct file *filp, int cmd, unsigned long arg);
-
-static const struct file_operations lis331_fops = {
-	.read  = lis331_read,
-	.ioctl = lis331_ioctl,
-};
-
-struct lis331_dev_s
-{
-	struct spi_dev_s	*spi;
-	int			spi_id;
-
-	uint8_t			rate;
-	struct lis331_buffer	*buffer;
-};
-
-static struct lis331_dev_s	lis331_dev;
-
-static void	write_reg(uint8_t address, uint8_t data);
-static uint8_t	read_reg(uint8_t address);
-static bool	read_fifo(uint16_t *data);
-static void	set_range(uint8_t range);
-static void	set_rate(uint8_t rate);
-
-static void
-write_reg(uint8_t address, uint8_t data)
-{
-	uint8_t cmd[2] = { address | DIR_WRITE, data };
-
-	SPI_SELECT(lis331_dev.spi, lis331_dev.spi_id, true);
-      	SPI_SNDBLOCK(lis331_dev.spi, &cmd, sizeof(cmd));
-	SPI_SELECT(lis331_dev.spi, lis331_dev.spi_id, false);
-}
-
-static uint8_t
-read_reg(uint8_t address)
-{
-	uint8_t	cmd[2] = {address | DIR_READ, 0};
-	uint8_t data[2];
-
-	SPI_SELECT(lis331_dev.spi, lis331_dev.spi_id, true);
-	SPI_EXCHANGE(lis331_dev.spi, cmd, data, sizeof(cmd));
-	SPI_SELECT(lis331_dev.spi, lis331_dev.spi_id, false);
-
-	return data[1];	
-}
-
-static bool
-read_fifo(uint16_t *data)
-{
-	struct {					/* status register and data as read back from the device */
-		uint8_t		cmd;
-		uint8_t		status;
-		int16_t		x;
-		int16_t		y;
-		int16_t		z;
-	} __attribute__((packed))	report;
-
-	report.cmd = ADDR_STATUS_REG | DIR_READ | ADDR_INCREMENT;
-
-	/* exchange the report structure with the device */
-	SPI_LOCK(lis331_dev.spi, true);
-	SPI_SELECT(lis331_dev.spi, lis331_dev.spi_id, true);
-	SPI_EXCHANGE(lis331_dev.spi, &report, &report, sizeof(report));
-	SPI_SELECT(lis331_dev.spi, lis331_dev.spi_id, false);
-	SPI_LOCK(lis331_dev.spi, false);
-
-	data[0] = report.x;
-	data[1] = report.y;
-	data[2] = report.z;
-
-	return report.status & STATUS_ZYXDA;
-}
-
-static void
-set_range(uint8_t range)
-{
-	range &= REG4_RANGE_MASK;
-	write_reg(ADDR_CTRL_REG4, range | REG4_BDU);
-}
-
-static void
-set_rate(uint8_t rate)
-{
-	rate &= REG1_RATE_MASK;
-	write_reg(ADDR_CTRL_REG1, rate | REG1_POWER_NORMAL | REG1_Z_ENABLE | REG1_Y_ENABLE | REG1_X_ENABLE);
-}
-
-static ssize_t
-lis331_read(struct file *filp, char *buffer, size_t buflen)
-{
-	/* if the buffer is large enough, and data are available, return success */
-	if (buflen >= 12) {
-		if (read_fifo((uint16_t *)buffer))
-			return 12;
-
-		/* no data */
-		return 0;
-	}
-
-	/* buffer too small */
-	errno = ENOSPC;
-	return ERROR;
-}
-
-static int
-lis331_ioctl(struct file *filp, int cmd, unsigned long arg)
-{
-	int	result = ERROR;
-
-	switch (cmd) {
-	case LIS331_SETRATE:
-		if ((arg & REG1_RATE_MASK) == arg) {
-			set_rate(arg);
-			result = 0;
-			lis331_dev.rate = arg;
-		}
-		break;
-
-	case LIS331_SETRANGE:
-		if ((arg & REG4_RANGE_MASK) == arg) {
-			set_range(arg);
-			result = 0;
-		}
-		break;
-
-	case LIS331_SETBUFFER:
-		lis331_dev.buffer = (struct lis331_buffer *)arg;
-		result = 0;
-		break;
-	}
-
-	if (result)
-		errno = EINVAL;
-	return result;
-}
-
-int
-lis331_attach(struct spi_dev_s *spi, int spi_id)
-{
-	int	result = ERROR;
-	
-	lis331_dev.spi = spi;
-
-	SPI_LOCK(lis331_dev.spi, true);
-
-	/* verify that the device is attached and functioning */
-	if (read_reg(ADDR_WHO_AM_I) == WHO_I_AM) {
-
-		/* set default configuration */
-		write_reg(ADDR_CTRL_REG2, 0);	/* disable interrupt-generating high-pass filters */
-		write_reg(ADDR_CTRL_REG3, 0);	/* no interrupts - we don't use them */
-		write_reg(ADDR_CTRL_REG5, 0);	/* disable wake-on-interrupt */
-
-		set_range(LIS331_RANGE_4G);
-		set_rate(LIS331_RATE_400Hz);	/* takes device out of low-power mode */
-
-		/* make ourselves available */
-		register_driver("/dev/lis331", &lis331_fops, 0666, NULL);
-
-		result = 0;
-	} else {
-		errno = EIO;
-	}
-
-	SPI_LOCK(lis331_dev.spi, false);
-
-	return result;
-}
-
diff --git a/nuttx/configs/px4fmu/src/drv_ms5611.c b/nuttx/configs/px4fmu/src/drv_ms5611.c
deleted file mode 100644
index c7e91c5ead..0000000000
--- a/nuttx/configs/px4fmu/src/drv_ms5611.c
+++ /dev/null
@@ -1,504 +0,0 @@
-/*
- *   Copyright (C) 2012 Lorenz Meier. All rights reserved.
- *
- * 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 of the author or the names of 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.
- */
-
-/*
- * Driver for the Measurement Specialties MS5611 barometric pressure sensor
- */
-
-#include <nuttx/config.h>
-#include <nuttx/i2c.h>
-#include <nuttx/arch.h>
-#include <arch/board/board.h>
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <debug.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <math.h>
-
-#include "chip.h"
-#include "px4fmu-internal.h"
-
-#include <arch/board/up_hrt.h>
-#include <arch/board/drv_ms5611.h>
-
-/* internal conversion time: 9.17 ms, so should not be read at rates higher than 100 Hz */
-#define MS5611_MIN_INTER_MEASUREMENT_INTERVAL 9200
-
-#define MS5611_ADDRESS_1		0x76    /* address select pins pulled high (PX4FMU series v1.6+) */
-#define MS5611_ADDRESS_2		0x77    /* address select pins pulled low (PX4FMU prototypes) */
-
-#define ADDR_RESET_CMD			0x1E /* read from this address to reset chip (0b0011110 on bus) */
-#define ADDR_CMD_CONVERT_D1		0x48 /* 4096 samples to this address to start conversion (0b01001000 on bus) */
-#define ADDR_CMD_CONVERT_D2		0x58 /* 4096 samples */
-#define ADDR_DATA				0x00 /* address of 3 bytes / 32bit pressure data */
-#define ADDR_PROM_SETUP			0xA0 /* address of 8x 2 bytes factory and calibration data */
-#define ADDR_PROM_C1			0xA2 /* address of 6x 2 bytes calibration data */
-
-static FAR struct ms5611_dev_s	ms5611_dev;
-
-static ssize_t ms5611_read(struct file *filp, FAR char *buffer, size_t buflen);
-static int ms5611_ioctl(struct file *filp, int cmd, unsigned long arg);
-
-static const struct file_operations ms5611_fops = {
-	.read  = ms5611_read,
-	.ioctl = ms5611_ioctl,
-};
-
-struct ms5611_prom_s
-{
-	uint16_t factory_setup;
-	uint16_t c1_pressure_sens;
-	uint16_t c2_pressure_offset;
-	uint16_t c3_temp_coeff_pres_sens;
-	uint16_t c4_temp_coeff_pres_offset;
-	uint16_t c5_reference_temp;
-	uint16_t c6_temp_coeff_temp;
-	uint16_t serial_and_crc;
-} __attribute__((packed));
-
-union ms5611_prom_u
-{
-	uint16_t c[8];
-	struct ms5611_prom_s s;
-} __attribute__((packed));
-
-struct ms5611_dev_s
-{
-	union ms5611_prom_u 	prom;
-	struct i2c_dev_s		*i2c;
-	struct ms5611_buffer	*buffer;
-} __attribute__((packed));
-
-static FAR uint8_t MS5611_ADDRESS;
-
-static FAR struct {
-		/* status register and data as read back from the device */
-		float		pressure;
-		float		altitude;
-		float		temperature;
-		uint32_t	d1_raw;
-		uint32_t	d2_raw;
-		uint32_t	measurements_count;
-		uint8_t		last_state;
-		uint64_t    last_read;
-	} ms5611_report = {
-			.pressure = 0.0f,
-			.altitude = 0.0f,
-			.temperature = 0.0f,
-			.last_state = 0,
-			/* make sure the first readout can be performed */
-			.last_read = 0,
-};
-
-static int ms5611_read_prom(void);
-
-int ms5611_reset()
-{
-	int ret;
-	printf("[ms5611 drv] Resettet I2C2 BUS\n");
-	up_i2cuninitialize(ms5611_dev.i2c);
-	ms5611_dev.i2c = up_i2cinitialize(2);
-	I2C_SETFREQUENCY(ms5611_dev.i2c, 400000);
-	return ret;
-}
-
-static bool
-read_values(float *data)
-{
-	int ret;
-	uint8_t cmd_data[3];
-
-	/* check validity of pointer */
-	if (data == NULL)
-	{
-		*get_errno_ptr() = EINVAL;
-		return -EINVAL;
-	}
-
-	/* only start reading when data is available */
-	if (ms5611_report.measurements_count > 0)
-	{
-		/* do not read more often than at minimum 9.17 ms intervals */
-		if ((hrt_absolute_time() - ms5611_report.last_read) < MS5611_MIN_INTER_MEASUREMENT_INTERVAL)
-		{
-			/* set errno to 'come back later' */
-			ret = -EAGAIN;
-			goto handle_return;
-		}
-		else
-		{
-			/* set new value */
-			ms5611_report.last_read = hrt_absolute_time();
-		}
-
-		/* Read out last measurement */
-		cmd_data[0] = 0x00;
-
-		struct i2c_msg_s msgv[2] = {
-				{
-						.addr   = MS5611_ADDRESS,
-						.flags  = 0,
-						.buffer = cmd_data,
-						.length = 1
-				},
-				{
-						.addr   = MS5611_ADDRESS,
-						.flags  = I2C_M_READ,
-						.buffer = cmd_data,
-						.length = 3
-				}
-		};
-		ret = I2C_TRANSFER(ms5611_dev.i2c, msgv, 2);
-		if (ret != OK) goto handle_return;
-
-
-		/* at value 1 the last reading was temperature */
-		if (ms5611_report.last_state == 1)
-		{
-			/* put temperature into the raw set */
-			ms5611_report.d2_raw = (((uint32_t)cmd_data[0]) << 16) | (((uint32_t)cmd_data[1]) << 8) | ((uint32_t)cmd_data[2]);
-		}
-		else
-		{
-			/* put altitude into the raw set */
-			ms5611_report.d1_raw = (((uint32_t)cmd_data[0]) << 16) | (((uint32_t)cmd_data[1]) << 8) | ((uint32_t)cmd_data[2]);
-		}
-	}
-	ms5611_report.measurements_count++;
-
-	/*
-	 * this block reads four pressure values and one temp value,
-	 * resulting in 80 Hz pressure update and 20 Hz temperature updates
-	 * at 100 Hz continuous operation.
-	 */
-	if (ms5611_report.last_state == 0)
-	{
-		/* request first a temperature reading */
-		cmd_data[0] = ADDR_CMD_CONVERT_D2;
-	}
-	else
-	{
-		/* request pressure reading */
-		cmd_data[0] = ADDR_CMD_CONVERT_D1;
-	}
-
-	if (ms5611_report.last_state == 3)
-	{
-		ms5611_report.last_state = 0;
-	}
-	else
-	{
-		ms5611_report.last_state++;
-	}
-
-
-	/* write measurement command */
-	struct i2c_msg_s conv_cmd[1] = {
-			{
-					.addr   = MS5611_ADDRESS,
-					.flags  = 0,
-					.buffer = cmd_data,
-					.length = 1
-			},
-	};
-
-	ret = I2C_TRANSFER(ms5611_dev.i2c, conv_cmd, 1);
-	if (ret != OK) goto handle_return;
-
-	/* only write back values after first complete set */
-	if (ms5611_report.measurements_count > 2)
-	{
-		/* Calculate results */
-
-		/* temperature calculation */
-		int32_t dT = ms5611_report.d2_raw - (((int32_t)ms5611_dev.prom.s.c5_reference_temp)*256);
-		int64_t temp_int64 = 2000 + (((int64_t)dT)*ms5611_dev.prom.s.c6_temp_coeff_temp)/8388608;
-
-		/* pressure calculation */
-		int64_t offset = (int64_t)ms5611_dev.prom.s.c2_pressure_offset * 65536 + ((int64_t)dT*ms5611_dev.prom.s.c4_temp_coeff_pres_offset)/128;
-		int64_t sens = (int64_t)ms5611_dev.prom.s.c1_pressure_sens * 32768 + ((int64_t)dT*ms5611_dev.prom.s.c3_temp_coeff_pres_sens)/256;
-
-		/* it's pretty cold, second order temperature compensation needed */
-		if (temp_int64 < 2000)
-		{
-			/* second order temperature compensation */
-			int64_t temp2 = (((int64_t)dT)*dT) >> 31;
-			int64_t tmp_64 = (temp_int64-2000)*(temp_int64-2000);
-			int64_t offset2 = (5*tmp_64)>>1;
-			int64_t sens2 = (5*tmp_64)>>2;
-			temp_int64 = temp_int64 - temp2;
-			offset = offset - offset2;
-			sens = sens - sens2;
-		}
-
-		int64_t press_int64 = (((ms5611_report.d1_raw*sens)/2097152-offset)/32768);
-
-		ms5611_report.temperature = temp_int64 / 100.0f;
-		ms5611_report.pressure = press_int64 / 100.0f;
-		/* convert as double for max. precision, store as float (more than enough precision) */
-		ms5611_report.altitude = (44330.0 * (1.0 - pow((press_int64 / 101325.0), 0.190295)));
-
-		/* Write back float values */
-		data[0] = ms5611_report.pressure;
-		data[1] = ms5611_report.altitude;
-		data[2] = ms5611_report.temperature;
-	}
-	else
-	{
-		/* not ready, try again */
-		ret = -EINPROGRESS;
-	}
-
-	/* return 1 if new data is available, 0 else */
-	handle_return:
-	if (ret == OK)
-	{
-		return (sizeof(ms5611_report.d1_raw) + sizeof(ms5611_report.altitude) + sizeof(ms5611_report.d2_raw));
-	}
-	else
-	{
-		errno = -ret;
-		if (errno == ETIMEDOUT || ret == ETIMEDOUT) ms5611_reset();
-		return ret;
-	}
-}
-
-static ssize_t
-ms5611_read(struct file *filp, char *buffer, size_t buflen)
-{
-	/* if the buffer is large enough, and data are available, return success */
-	if (buflen >= 12) {
-		return read_values((float *)buffer);
-	}
-
-	/* buffer too small */
-	errno = ENOSPC;
-	return -ENOSPC;
-}
-
-static int
-ms5611_ioctl(struct file *filp, int cmd, unsigned long arg)
-{
-	return -ENOSYS;
-
-//	switch (cmd) {
-//        case MS5611_SETRATE:
-//            if ((arg & REG1_RATE_LP_MASK) == arg) {
-//                set_rate(arg);
-//                result = 0;
-//                dev.rate = arg;
-//            }
-//            break;
-//
-//        case MS5611_SETBUFFER:
-//            dev.buffer = (struct ms5611_buffer *)arg;
-//            result = 0;
-//            break;
-//	}
-//
-//	if (result)
-//		errno = EINVAL;
-//	return result;
-}
-
-
-
-int ms5611_crc4(uint16_t n_prom[])
-{
-	/* routine ported from MS5611 application note */
-	int16_t cnt;
-	uint16_t n_rem;
-	uint16_t crc_read;
-	uint8_t n_bit;
-	n_rem = 0x00;
-	/* save the read crc */
-	crc_read = n_prom[7];
-	/* remove CRC byte */
-	n_prom[7] = (0xFF00 & (n_prom[7]));
-	for (cnt = 0; cnt < 16; cnt++)
-	{
-		/* uneven bytes */
-		if (cnt & 1)
-			{
-			n_rem ^= (uint8_t) ((n_prom[cnt>>1]) & 0x00FF);
-			}
-		else
-		{
-			n_rem ^= (uint8_t) (n_prom[cnt>>1] >> 8);
-		}
-		for (n_bit = 8; n_bit > 0; n_bit--)
-		{
-			if (n_rem & 0x8000)
-			{
-				n_rem = (n_rem << 1) ^ 0x3000;
-
-			}
-			else
-			{
-				n_rem = (n_rem << 1);
-			}
-		}
-	}
-	/* final 4 bit remainder is CRC value */
-	n_rem = (0x000F & (n_rem >> 12));
-	n_prom[7] = crc_read;
-
-	/* return 0 == OK if CRCs match, 1 else */
-	return !((0x000F & crc_read) == (n_rem ^ 0x00));
-}
-
-
-int ms5611_read_prom()
-{
-	/* read PROM data */
-	uint8_t prom_buf[2] = {255,255};
-
-	int retval = 0;
-
-	for (int i = 0; i < 8; i++)
-	{
-		uint8_t cmd = {ADDR_PROM_SETUP + (i*2)};
-
-		I2C_SETADDRESS(ms5611_dev.i2c, MS5611_ADDRESS, 7);
-		retval = I2C_WRITEREAD(ms5611_dev.i2c, &cmd, 1, prom_buf, 2);
-
-		/* assemble 16 bit value and convert from big endian (sensor) to little endian (MCU) */
-		ms5611_dev.prom.c[i] = (((uint16_t)prom_buf[0])<<8) | ((uint16_t)prom_buf[1]);
-
-		if (retval != OK)
-		{
-			break;
-		}
-	}
-
-	/* calculate CRC and return error if mismatch */
-	return ms5611_crc4(ms5611_dev.prom.c);
-}
-
-int
-ms5611_attach(struct i2c_dev_s *i2c)
-{
-	int	result = ERROR;
-
-	ms5611_dev.i2c = i2c;
-
-	MS5611_ADDRESS = MS5611_ADDRESS_1;
-
-	/* write reset command */
-	uint8_t cmd_data = ADDR_RESET_CMD;
-
-	struct i2c_msg_s reset_cmd[1] = {
-			{
-					.addr   = MS5611_ADDRESS,
-					.flags  = 0,
-					.buffer = &cmd_data,
-					.length = 1
-			},
-	};
-
-	int ret = I2C_TRANSFER(ms5611_dev.i2c, reset_cmd, 1);
-
-	if (ret == OK)
-	{
-		/* wait for PROM contents to be in the device (2.8 ms) */
-		up_udelay(3000);
-
-		/* read PROM */
-		ret = ms5611_read_prom();
-	}
-
-	/* check if the address was wrong */
-	if (ret != OK)
-	{
-		/* try second address */
-		MS5611_ADDRESS = MS5611_ADDRESS_2;
-
-		/* write reset command */
-		cmd_data = ADDR_RESET_CMD;
-
-		struct i2c_msg_s reset_cmd_2[1] = {
-				{
-						.addr   = MS5611_ADDRESS,
-						.flags  = 0,
-						.buffer = &cmd_data,
-						.length = 1
-				},
-		};
-
-		ret = I2C_TRANSFER(ms5611_dev.i2c, reset_cmd_2, 1);
-
-		/* wait for PROM contents to be in the device (2.8 ms) */
-		up_udelay(3000);
-
-		/* read PROM */
-		ret = ms5611_read_prom();
-	}
-
-	if (ret < 0) return -EIO;
-
-
-	/* verify that the device is attached and functioning */
-	if (ret == OK) {
-
-		if (MS5611_ADDRESS == MS5611_ADDRESS_1)
-		{
-			printf("[ms5611 driver] Attached MS5611 at addr #1 (0x76)\n");
-		}
-		else
-		{
-			printf("[ms5611 driver] Attached MS5611 at addr #2 (0x77)\n");
-		}
-
-		/* trigger temperature read */
-		(void)read_values(NULL);
-		/* wait for conversion to complete */
-		up_udelay(9200);
-
-		/* trigger pressure read */
-		(void)read_values(NULL);
-		/* wait for conversion to complete */
-		up_udelay(9200);
-		/* now a read_values call would obtain valid results */
-
-		/* make ourselves available */
-		register_driver("/dev/ms5611", &ms5611_fops, 0666, NULL);
-
-		result = OK;
-
-	} else {
-		errno = EIO;
-	}
-
-	return result;
-}

From 4f20d9a24ba15cab4b8610b460b7aa54ef2ac839 Mon Sep 17 00:00:00 2001
From: px4dev <px4@purgatory.org>
Date: Fri, 19 Oct 2012 18:59:44 -0700
Subject: [PATCH 39/43] Retire old test cases for drivers that have been
 removed.

---
 apps/px4/tests/test_sensors.c     | 330 ------------------------------
 nuttx/configs/px4fmu/src/up_nsh.c |  31 +--
 2 files changed, 1 insertion(+), 360 deletions(-)

diff --git a/apps/px4/tests/test_sensors.c b/apps/px4/tests/test_sensors.c
index 87ea7f0580..c801869ab6 100644
--- a/apps/px4/tests/test_sensors.c
+++ b/apps/px4/tests/test_sensors.c
@@ -56,10 +56,6 @@
 
 #include "tests.h"
 
-#include <arch/board/drv_lis331.h>
-#include <arch/board/drv_bma180.h>
-#include <arch/board/drv_l3gd20.h>
-#include <arch/board/drv_hmc5883l.h>
 #include <drivers/drv_accel.h>
 
 /****************************************************************************
@@ -75,10 +71,6 @@
  ****************************************************************************/
 
 //static int	lis331(int argc, char *argv[]);
-static int l3gd20(int argc, char *argv[]);
-static int bma180(int argc, char *argv[]);
-static int hmc5883l(int argc, char *argv[]);
-static int ms5611(int argc, char *argv[]);
 static int mpu6000(int argc, char *argv[]);
 
 /****************************************************************************
@@ -90,12 +82,7 @@ struct {
 	const char	*path;
 	int	(* test)(int argc, char *argv[]);
 } sensors[] = {
-	{"bma180",	"/dev/bma180",	bma180},
 	{"mpu6000",	"/dev/accel",	mpu6000},
-	{"l3gd20",	"/dev/l3gd20",	l3gd20},
-	{"hmc5883l",	"/dev/hmc5883l",	hmc5883l},
-	{"ms5611",	"/dev/ms5611",	ms5611},
-//    {"lis331",	"/dev/lis331",	lis331},
 	{NULL, NULL, NULL}
 };
 
@@ -107,226 +94,6 @@ struct {
  * Private Functions
  ****************************************************************************/
 
-//static int
-//lis331(int argc, char *argv[])
-//{
-//	int		fd;
-//	int16_t	buf[3];
-//	int		ret;
-//
-//	fd = open("/dev/lis331", O_RDONLY);
-//	if (fd < 0) {
-//		printf("\tlis331: not present on PX4FMU v1.5 and later\n");
-//		return ERROR;
-//	}
-//
-//	if (ioctl(fd, LIS331_SETRATE, LIS331_RATE_50Hz) ||
-//	    ioctl(fd, LIS331_SETRANGE, LIS331_RANGE_4G)) {
-//
-//		printf("LIS331: ioctl fail\n");
-//		return ERROR;
-//	}
-//
-//	/* wait at least 100ms, sensor should have data after no more than 20ms */
-//	usleep(100000);
-//
-//	/* read data - expect samples */
-//	ret = read(fd, buf, sizeof(buf));
-//	if (ret != sizeof(buf)) {
-//		printf("LIS331: read1 fail (%d)\n", ret);
-//		return ERROR;
-//	}
-//
-//	/* read data - expect no samples (should not be ready again yet) */
-//	ret = read(fd, buf, sizeof(buf));
-//	if (ret != 0) {
-//		printf("LIS331: read2 fail (%d)\n", ret);
-//		return ERROR;
-//	}
-//
-//	/* XXX more tests here */
-//
-//	return 0;
-//}
-
-static int
-l3gd20(int argc, char *argv[])
-{
-	printf("\tL3GD20: test start\n");
-	fflush(stdout);
-
-	int		fd;
-	int16_t	buf[3] = {0, 0, 0};
-	int		ret;
-
-	fd = open("/dev/l3gd20", O_RDONLY | O_NONBLOCK);
-
-	if (fd < 0) {
-		printf("L3GD20: open fail\n");
-		return ERROR;
-	}
-
-//	if (ioctl(fd, L3GD20_SETRATE, L3GD20_RATE_760HZ_LP_50HZ) ||
-//	    ioctl(fd, L3GD20_SETRANGE, L3GD20_RANGE_500DPS)) {
-//
-//		printf("L3GD20: ioctl fail\n");
-//		return ERROR;
-//	} else {
-//		printf("\tconfigured..\n");
-//	}
-//
-//	/* wait at least 100ms, sensor should have data after no more than 2ms */
-//	usleep(100000);
-
-
-
-	/* read data - expect samples */
-	ret = read(fd, buf, sizeof(buf));
-
-	if (ret != sizeof(buf)) {
-		printf("\tL3GD20: read1 fail (%d should have been %d)\n", ret, sizeof(buf));
-		//return ERROR;
-
-	} else {
-		printf("\tL3GD20 values #1: x:%d\ty:%d\tz:%d\n", buf[0], buf[1], buf[2]);
-	}
-
-	/* wait at least 2 ms, sensor should have data after no more than 1.5ms */
-	usleep(2000);
-
-	/* read data - expect no samples (should not be ready again yet) */
-	ret = read(fd, buf, sizeof(buf));
-
-	if (ret != sizeof(buf)) {
-		printf("\tL3GD20: read2 fail (%d)\n", ret);
-		close(fd);
-		return ERROR;
-
-	} else {
-		printf("\tL3GD20 values #2: x:%d\ty:%d\tz:%d\n", buf[0], buf[1], buf[2]);
-	}
-
-	/* empty sensor buffer */
-	ret = 0;
-
-	while (ret != sizeof(buf)) {
-		// Keep reading until successful
-		ret = read(fd, buf, sizeof(buf));
-	}
-
-	/* test if FIFO is operational */
-	usleep(14800); // Expecting 10 measurements
-
-	ret = 0;
-	int count = 0;
-	bool dataready = true;
-
-	while (dataready) {
-		// Keep reading until successful
-		ret = read(fd, buf, sizeof(buf));
-
-		if (ret != sizeof(buf)) {
-			dataready = false;
-
-		} else {
-			count++;
-		}
-	}
-
-	printf("\tL3GD20: Drained FIFO with %d values (expected 8-12)\n", count);
-
-	/* read data - expect no samples (should not be ready again yet) */
-	ret = read(fd, buf, sizeof(buf));
-
-	if (ret != 0) {
-		printf("\tL3GD20: Note: read3 got data - there should not have been data ready\n", ret);
-//		return ERROR;
-	}
-
-	close(fd);
-
-	/* Let user know everything is ok */
-	printf("\tOK: L3GD20 passed all tests successfully\n");
-	return OK;
-}
-
-static int
-bma180(int argc, char *argv[])
-{
-	// XXX THIS SENSOR IS OBSOLETE
-	// TEST REMAINS, BUT ALWAYS RETURNS OK
-
-	printf("\tBMA180: test start\n");
-	fflush(stdout);
-
-	int		fd;
-	int16_t	buf[3] = {0, 0, 0};
-	int		ret;
-
-	fd = open("/dev/bma180", O_RDONLY);
-
-	if (fd < 0) {
-		printf("\tBMA180: open fail\n");
-		return OK;
-	}
-
-//	if (ioctl(fd, LIS331_SETRATE, LIS331_RATE_50Hz) ||
-//	    ioctl(fd, LIS331_SETRANGE, LIS331_RANGE_4G)) {
-//
-//		printf("BMA180: ioctl fail\n");
-//		return ERROR;
-//	}
-//
-	/* wait at least 100ms, sensor should have data after no more than 20ms */
-	usleep(100000);
-
-	/* read data - expect samples */
-	ret = read(fd, buf, sizeof(buf));
-
-	if (ret != sizeof(buf)) {
-		printf("\tBMA180: read1 fail (%d)\n", ret);
-		close(fd);
-		return OK;
-
-	} else {
-		printf("\tBMA180 values: x:%d\ty:%d\tz:%d\n", buf[0], buf[1], buf[2]);
-	}
-
-	/* wait at least 10ms, sensor should have data after no more than 2ms */
-	usleep(100000);
-
-	ret = read(fd, buf, sizeof(buf));
-
-	if (ret != sizeof(buf)) {
-		printf("\tBMA180: read2 fail (%d)\n", ret);
-		close(fd);
-		return OK;
-
-	} else {
-		printf("\tBMA180: x:%d\ty:%d\tz:%d\n", buf[0], buf[1], buf[2]);
-	}
-
-	/* empty sensor buffer */
-	ret = 0;
-
-	while (ret != sizeof(buf)) {
-		// Keep reading until successful
-		ret = read(fd, buf, sizeof(buf));
-	}
-
-	ret = read(fd, buf, sizeof(buf));
-
-	if (ret != 0) {
-		printf("\tBMA180: Note: read3 got data - there should not have been data ready\n", ret);
-	}
-
-	/* Let user know everything is ok */
-	printf("\tOK: BMA180 passed all tests successfully\n");
-	close(fd);
-
-	return OK;
-}
-
 static int
 mpu6000(int argc, char *argv[])
 {
@@ -379,103 +146,6 @@ mpu6000(int argc, char *argv[])
 	return OK;
 }
 
-static int
-ms5611(int argc, char *argv[])
-{
-	printf("\tMS5611: test start\n");
-	fflush(stdout);
-
-	int		fd;
-	float	buf[3] = {0.0f, 0.0f, 0.0f};
-	int		ret;
-
-	fd = open("/dev/ms5611", O_RDONLY);
-
-	if (fd < 0) {
-		printf("\tMS5611: open fail\n");
-		return ERROR;
-	}
-
-	for (int i = 0; i < 5; i++) {
-		/* read data - expect samples */
-		ret = read(fd, buf, sizeof(buf));
-
-		if (ret != sizeof(buf)) {
-
-			if ((int8_t)ret == -EAGAIN || (int8_t)ret == -EINPROGRESS) {
-				/* waiting for device to become ready, this is not an error */
-			} else {
-				printf("\tMS5611: read fail (%d)\n", ret);
-				close(fd);
-				return ERROR;
-			}
-
-		} else {
-
-			/* hack for float printing */
-			int32_t pressure_int = buf[0];
-			int32_t altitude_int = buf[1];
-			int32_t temperature_int = buf[2];
-
-			printf("\tMS5611: pressure:%d.%03d mbar - altitude: %d.%02d meters - temp:%d.%02d deg celcius\n", pressure_int, (int)(buf[0] * 1000 - pressure_int * 1000), altitude_int, (int)(buf[1] * 100 - altitude_int * 100), temperature_int, (int)(buf[2] * 100 - temperature_int * 100));
-		}
-
-		/* wait at least 10ms, sensor should have data after no more than 6.5ms */
-		usleep(10000);
-	}
-
-	close(fd);
-
-	/* Let user know everything is ok */
-	printf("\tOK: MS5611 passed all tests successfully\n");
-
-	return OK;
-}
-
-static int
-hmc5883l(int argc, char *argv[])
-{
-	printf("\tHMC5883L: test start\n");
-	fflush(stdout);
-
-	int		fd;
-	int16_t	buf[7] = {0, 0, 0};
-	int		ret;
-
-	fd = open("/dev/hmc5883l", O_RDONLY);
-
-	if (fd < 0) {
-		printf("\tHMC5883L: open fail\n");
-		return ERROR;
-	}
-
-	int i;
-
-	for (i = 0; i < 5; i++) {
-		/* wait at least 7ms, sensor should have data after no more than 6.5ms */
-		usleep(7000);
-
-		/* read data - expect samples */
-		ret = read(fd, buf, sizeof(buf));
-
-		if (ret != sizeof(buf)) {
-			printf("\tHMC5883L: read1 fail (%d) values: x:%d\ty:%d\tz:%d\n", ret, buf[0], buf[1], buf[2]);
-			close(fd);
-			return ERROR;
-
-		} else {
-			printf("\tHMC5883L: x:%d\ty:%d\tz:%d\n", buf[0], buf[1], buf[2]);
-		}
-	}
-
-	close(fd);
-
-	/* Let user know everything is ok */
-	printf("\tOK: HMC5883L passed all tests successfully\n");
-
-	return OK;
-}
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/nuttx/configs/px4fmu/src/up_nsh.c b/nuttx/configs/px4fmu/src/up_nsh.c
index 25f3c2795e..af8253181a 100644
--- a/nuttx/configs/px4fmu/src/up_nsh.c
+++ b/nuttx/configs/px4fmu/src/up_nsh.c
@@ -61,8 +61,6 @@
 #include <arch/board/drv_tone_alarm.h>
 #include <arch/board/up_adc.h>
 #include <arch/board/board.h>
-#include <arch/board/drv_bma180.h>
-#include <arch/board/drv_l3gd20.h>
 #include <arch/board/drv_led.h>
 #include <arch/board/drv_eeprom.h>
 
@@ -181,7 +179,7 @@ int nsh_archinitialize(void)
 	  return -ENODEV;
   }
 
-  // Setup 10 MHz clock (maximum rate the BMA180 can sustain)
+  // Default SPI1 to 1MHz and de-assert the known chip selects.
   SPI_SETFREQUENCY(spi1, 10000000);
   SPI_SETBITS(spi1, 8);
   SPI_SETMODE(spi1, SPIDEV_MODE3);
@@ -192,33 +190,6 @@ int nsh_archinitialize(void)
 
   message("[boot] Successfully initialized SPI port 1\r\n");
 
-  /* initialize SPI peripherals redundantly */
-  int gyro_attempts = 0;
-  int gyro_fail = 0;
-
-  while (gyro_attempts < 5)
-  {
-	  gyro_fail = l3gd20_attach(spi1, PX4_SPIDEV_GYRO);
-	  gyro_attempts++;
-	  if (gyro_fail == 0) break;
-	  up_udelay(1000);
-  }
-
-  if (!gyro_fail) message("[boot] Found L3GD20 gyro\n");
-
-  int acc_attempts = 0;
-  int acc_fail = 0;
-
-  while (acc_attempts < 5)
-  {
-	  acc_fail = bma180_attach(spi1, PX4_SPIDEV_ACCEL);
-	  acc_attempts++;
-	  if (acc_fail == 0) break;
-	  up_udelay(1000);
-  }
-
-  if (!acc_fail) message("[boot] Found BMA180 accelerometer\n");
-
   /* initialize I2C2 bus */
 
   i2c2 = up_i2cinitialize(2);

From f12b9d070684d6d8bffe44a88a598e6a64d90fd1 Mon Sep 17 00:00:00 2001
From: px4dev <px4@purgatory.org>
Date: Fri, 19 Oct 2012 22:09:56 -0700
Subject: [PATCH 40/43] Fix an error message

---
 apps/px4/px4io/driver/uploader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/px4/px4io/driver/uploader.cpp b/apps/px4/px4io/driver/uploader.cpp
index 7d6a9e1714..0fbbac839d 100644
--- a/apps/px4/px4io/driver/uploader.cpp
+++ b/apps/px4/px4io/driver/uploader.cpp
@@ -318,7 +318,7 @@ PX4IO_Uploader::verify()
 
 			ret = recv(c);
 			if (ret != OK) {
-				log("%d: got %d waiting for bytes", ret);
+				log("%d: got %d waiting for bytes", base + i, ret);
 				return ret;
 			}
 

From d2ef2afb0b53ec0e889e11f483d45b4272bba704 Mon Sep 17 00:00:00 2001
From: px4dev <px4@purgatory.org>
Date: Fri, 19 Oct 2012 22:10:12 -0700
Subject: [PATCH 41/43] Major rework of the PX4IO driver; pull it closer up to
 date

---
 apps/px4/px4io/driver/px4io.cpp | 484 ++++++++++++++++----------------
 1 file changed, 241 insertions(+), 243 deletions(-)

diff --git a/apps/px4/px4io/driver/px4io.cpp b/apps/px4/px4io/driver/px4io.cpp
index c3371c138b..954b1e8915 100644
--- a/apps/px4/px4io/driver/px4io.cpp
+++ b/apps/px4/px4io/driver/px4io.cpp
@@ -37,8 +37,7 @@
  *
  * PX4IO is connected via serial (or possibly some other interface at a later
  * point).
- *
- * XXX current design is racy as all hell; need a locking strategy.
+
  */
 
 #include <nuttx/config.h>
@@ -53,6 +52,7 @@
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 
@@ -61,129 +61,21 @@
 #include <drivers/device/device.h>
 #include <drivers/drv_rc_input.h>
 #include <drivers/drv_pwm_output.h>
+#include <systemlib/mixer/mixer.h>
+#include <drivers/drv_mixer.h>
 
 #include <systemlib/perf_counter.h>
 #include <systemlib/hx_stream.h>
+#include <systemlib/err.h>
+#include <systemlib/systemlib.h>
+
+#include <uORB/topics/actuator_controls.h>
+#include <uORB/topics/actuator_outputs.h>
+#include <uORB/topics/rc_channels.h>
 
 #include "px4io/protocol.h"
 #include "uploader.h"
 
-class PX4IO;
-
-
-namespace 
-{
-
-/* oddly, ERROR is not defined for c++ */
-#ifdef ERROR
-# undef ERROR
-#endif
-const int ERROR = -1;
-
-PX4IO	*g_dev;
-
-}
-
-
-class PX4IO_RC : public device::CDev
-{
-public:
-	PX4IO_RC();
-	~PX4IO_RC();
-
-	virtual int		init();
-	virtual ssize_t		read(struct file *filp, char *buffer, size_t buflen);
-
-	friend class PX4IO;
-protected:
-	void			set_channels(unsigned count, const servo_position_t *data);
-
-private:
-	orb_advert_t		_publication;
-	struct rc_input_values	_input;
-};
-
-/* XXX this may conflict with the onboard PPM input */
-PX4IO_RC::PX4IO_RC() :
-	CDev("px4io_rc", RC_INPUT_DEVICE_PATH),
-	_publication(-1)
-{
-	for (unsigned i = 0; i < RC_INPUT_MAX_CHANNELS; i++) {
-		_input.values[i] = 0;
-	}
-	_input.channel_count = 0;
-}
-
-PX4IO_RC::~PX4IO_RC()
-{
-	if (_publication != -1)
-		::close(_publication);
-}
-
-int
-PX4IO_RC::init()
-{
-	int ret;
-
-	ret = CDev::init();
-
-	/* advertise ourselves as the RC input controller */
-	if (ret == OK) {
-		_publication = orb_advertise(ORB_ID(input_rc), &_input);
-		if (_publication < 0)
-			ret = -errno;
-	}
-
-	return ret;
-}
-
-ssize_t
-PX4IO_RC::read(struct file *filp, char *buffer, size_t buflen)
-{
-	unsigned channels = buflen / sizeof(rc_input_t);
-	rc_input_t *pdata = (rc_input_t *)buffer;
-	unsigned i;
-
-	if (channels > PX4IO_INPUT_CHANNELS)
-		return -EIO;
-
-	lock();
-	for (i = 0; i < channels; i++)
-		pdata[i] = _input.values[i];
-	unlock();
-
-	return i * sizeof(servo_position_t);
-}
-
-void
-PX4IO_RC::set_channels(unsigned count, const servo_position_t *data)
-{
-
-	ASSERT(count <= PX4IO_INPUT_CHANNELS);
-
-	/* convert incoming servo position values into 0-100 range */
-	lock();
-	for (unsigned i = 0; i < count; i++) {
-		rc_input_t chn;
-
-		if (data[i] < 1000) {
-			chn = 0;
-		} else if (data[i] > 2000) {
-			chn = 100;
-		} else {
-			chn = (data[i] - 1000) / 10;
-		}
-
-		_input.values[i] = chn;
-	}
-	_input.channel_count = count;
-	unlock();
-
-	/* publish to anyone that might be listening */
-	if (_publication != -1)
-		orb_publish(ORB_ID(input_rc), _publication, &_input);
-
-}
 
 class PX4IO : public device::CDev
 {
@@ -193,53 +85,82 @@ public:
 
 	virtual int		init();
 
-	virtual ssize_t		write(struct file *filp, const char *buffer, size_t buflen);
 	virtual int		ioctl(struct file *filp, int cmd, unsigned long arg);
 
 private:
-	int			_fd;
-	int			_task;
-	PX4IO_RC		*_rc;
+	static const unsigned	_max_actuators = 8;
 
-	/** command to be sent to IO */
-	struct px4io_command	_next_command;
+	int			_serial_fd;	///< serial interface to PX4IO
+	hx_stream_t		_io_stream;	///< HX protocol stream
 
-	/** RC channel input from IO */
-	servo_position_t	_rc_channel[PX4IO_INPUT_CHANNELS];
-	int			_rc_channel_count;
-
-	volatile bool		_armed;
+	int			_task;		///< worker task
 	volatile bool		_task_should_exit;
 
+	int			_t_actuators;	///< ORB subscription for actuator outputs
+	int			_t_armed;
+	orb_advert_t		_t_outputs;
+
+	MixerGroup		*_mixers;
+	actuator_controls_s	_controls;
+	actuator_armed_s	_armed;
+	actuator_outputs_s	_outputs;
+
+	orb_advert_t		_t_input;
+	rc_input_values		_input;
+
+	volatile bool		_switch_armed;	///< PX4IO switch armed state
+						// XXX how should this work?
+
 	bool			_send_needed;
 
-	hx_stream_t		_io_stream;
-
+	/**
+	 * Trampoline to the worker task
+	 */
 	static void		task_main_trampoline(int argc, char *argv[]);
+
+	/**
+	 * worker task
+	 */
 	void			task_main();
+
 	void			io_recv();
 
+	/**
+	 * HX protocol callback.
+	 */
 	static void		rx_callback_trampoline(void *arg, const void *buffer, size_t bytes_received);
 	void			rx_callback(const uint8_t *buffer, size_t bytes_received);
 
 	void			io_send();
+	static int		control_callback(uintptr_t handle,
+						 uint8_t control_group,
+						 uint8_t control_index,
+						 float &input);
 };
 
+
+namespace 
+{
+
+PX4IO	*g_dev;
+
+}
+
 PX4IO::PX4IO() :
 	CDev("px4io", "/dev/px4io"),
-	_fd(-1),
+	_serial_fd(-1),
+	_io_stream(nullptr),
 	_task(-1),
-	_rc(new PX4IO_RC),
-	_rc_channel_count(0),
-	_armed(false),
 	_task_should_exit(false),
-	_send_needed(false),
-	_io_stream(nullptr)
+	_t_actuators(-1),
+	_t_armed(-1),
+	_t_outputs(-1),
+	_mixers(nullptr),
+	_t_input(-1),
+	_switch_armed(false),
+	_send_needed(false)
 {
-	/* set up the command we will use */
-	_next_command.f2i_magic = F2I_MAGIC;
-
-	/* we need this potentially before it could be set in px4io_main */
+	/* we need this potentially before it could be set in task_main */
 	g_dev = this;
 
 	_debug_enabled = true;
@@ -247,8 +168,6 @@ PX4IO::PX4IO() :
 
 PX4IO::~PX4IO()
 {
-	if (_rc != nullptr)
-		delete _rc;
 	if (_task != -1) {
 		/* task should wake up every 100ms or so at least */
 		_task_should_exit = true;
@@ -266,6 +185,8 @@ PX4IO::~PX4IO()
 
 		} while (_task != -1);
 	}
+	if (_io_stream != nullptr)
+		hx_stream_free(_io_stream);
 
 	g_dev = nullptr;
 }
@@ -277,10 +198,6 @@ PX4IO::init()
 
 	ASSERT(_task == -1);
 
-	/* XXX send a who-are-you request */
-
-	/* XXX verify firmware/protocol version */
-
 	/* do regular cdev init */
 	ret = CDev::init();
 	if (ret != OK)
@@ -305,30 +222,51 @@ PX4IO::task_main_trampoline(int argc, char *argv[])
 void
 PX4IO::task_main()
 {
-	ASSERT(_fd == -1);
-
-	log("ready");
+	log("starting");
 
 	/* open the serial port */
-	_fd = ::open("/dev/ttyS2", O_RDWR | O_NONBLOCK);
-	if (_fd < 0) {
+	_serial_fd = ::open("/dev/ttyS2", O_RDWR | O_NONBLOCK);
+	if (_serial_fd < 0) {
 		debug("failed to open serial port for IO: %d", errno);
 		_task = -1;
 		_exit(errno);
 	}
 
 	/* protocol stream */
-	_io_stream = hx_stream_init(_fd, &PX4IO::rx_callback_trampoline, this);
+	_io_stream = hx_stream_init(_serial_fd, &PX4IO::rx_callback_trampoline, this);
 
-	perf_counter_t pc_tx_bytes = perf_alloc(PC_COUNT, "PX4IO frames transmitted");
-	perf_counter_t pc_rx_bytes = perf_alloc(PC_COUNT, "PX4IO frames received");
+	perf_counter_t pc_tx_frames = perf_alloc(PC_COUNT, "PX4IO frames transmitted");
+	perf_counter_t pc_rx_frames = perf_alloc(PC_COUNT, "PX4IO frames received");
 	perf_counter_t pc_rx_errors = perf_alloc(PC_COUNT, "PX4IO receive errors");
-	hx_stream_set_counters(_io_stream, pc_tx_bytes, pc_rx_bytes, pc_rx_errors);
+	hx_stream_set_counters(_io_stream, pc_tx_frames, pc_rx_frames, pc_rx_errors);
+
+	/* XXX send a who-are-you request */
+
+	/* XXX verify firmware/protocol version */
+
+	/* subscribe to objects that we are interested in watching */
+	_t_actuators = orb_subscribe(ORB_ID_VEHICLE_ATTITUDE_CONTROLS);
+	/* convert the update rate in hz to milliseconds, rounding down if necessary */
+	//int update_rate_in_ms = int(1000 / _update_rate);
+	orb_set_interval(_t_actuators, 20);	/* XXX 50Hz hardcoded for now */
+
+	_t_armed = orb_subscribe(ORB_ID(actuator_armed));
+	orb_set_interval(_t_armed, 200);		/* 5Hz update rate */
+
+	/* advertise the mixed control outputs */
+	_t_outputs = orb_advertise(ORB_ID_VEHICLE_CONTROLS, &_outputs);
+
+	/* advertise the PX4IO R/C input */
+	_t_input = orb_advertise(ORB_ID(input_rc), &_input);
 
 	/* poll descriptor(s) */
-	struct pollfd fds[1];
-	fds[0].fd = _fd;
+	struct pollfd fds[3];
+	fds[0].fd = _serial_fd;
 	fds[0].events = POLLIN;
+	fds[1].fd = _t_actuators;
+	fds[1].events = POLLIN;
+	fds[2].fd = _t_armed;
+	fds[2].events = POLLIN;
 
 	/* loop handling received serial bytes */
 	while (!_task_should_exit) {
@@ -347,9 +285,35 @@ PX4IO::task_main()
 		if (ret == 0)
 			_send_needed = true;
 
-		/* if we have new data from IO, go handle it */
-		if ((ret > 0) && (fds[0].revents & POLLIN))
-			io_recv();
+		if (ret > 0) {
+			/* if we have new data from IO, go handle it */
+			if (fds[0].revents & POLLIN)
+				io_recv();
+
+			/* if we have new data from the ORB, go handle it */
+			if (fds[1].revents & POLLIN) {
+
+				/* get controls */
+				orb_copy(ORB_ID_VEHICLE_ATTITUDE_CONTROLS, _t_actuators, &_controls);
+
+				/* mix */
+				if (_mixers != nullptr) {
+					/* XXX is this the right count? */
+					_mixers->mix(&_outputs.output[0], _max_actuators);
+
+					/* convert to PWM values */
+					for (unsigned i = 0; i < _max_actuators; i++)
+						_outputs.output[i] = 1500 + (600 * _outputs.output[i]);
+
+					/* and flag for update */
+					_send_needed = true;
+				}
+			}
+			if (fds[2].revents & POLLIN) {
+				orb_copy(ORB_ID(actuator_armed), _t_armed, &_controls);
+				_send_needed = true;
+			}
+		}
 
 		/* send an update to IO if required */
 		if (_send_needed) {
@@ -357,22 +321,31 @@ PX4IO::task_main()
 			io_send();
 		}
 	}
-	if (_io_stream != nullptr)
-		hx_stream_free(_io_stream);
-	::close(_fd);
 
 	/* tell the dtor that we are exiting */
 	_task = -1;
 	_exit(0);
 }
 
+int
+PX4IO::control_callback(uintptr_t handle,
+			 uint8_t control_group,
+			 uint8_t control_index,
+			 float &input)
+{
+	const actuator_controls_s *controls = (actuator_controls_s *)handle;
+
+	input = controls->control[control_index];
+	return 0;
+}
+
 void
 PX4IO::io_recv()
 {
 	uint8_t c;
 
 	/* handle bytes from IO */
-	while (::read(_fd, &c, 1) == 1)
+	while (::read(_serial_fd, &c, 1) == 1)
 		hx_stream_rx(_io_stream, c);
 }
 
@@ -391,15 +364,10 @@ PX4IO::rx_callback(const uint8_t *buffer, size_t bytes_received)
 	if (bytes_received != sizeof(struct px4io_report))
 		return;
 
-	lock();
+	/* XXX handle R/C inputs here ... needs code sharing/library */
 
-	/* pass RC input data to the driver */
-	if (_rc != nullptr)
-		_rc->set_channels(rep->channel_count, &rep->rc_channel[0]);
-	_armed = rep->armed;
-
-	/* send an update frame */
-	_send_needed = true;
+	/* remember the latched arming switch state */
+	_switch_armed = rep->armed;
 
 	unlock();
 
@@ -408,75 +376,115 @@ PX4IO::rx_callback(const uint8_t *buffer, size_t bytes_received)
 void
 PX4IO::io_send()
 {
-	lock();
+	px4io_command	cmd;
 
-	/* send packet to IO while we're guaranteed it won't change */
-	hx_stream_send(_io_stream, &_next_command, sizeof(_next_command));
+	cmd.f2i_magic = F2I_MAGIC;
 
-	unlock();
-}
+	/* set outputs */
+	for (unsigned i = 0; i < _max_actuators; i++)
+		cmd.servo_command[i] = _outputs.output[i];
 
-ssize_t
-PX4IO::write(struct file *filp, const char *buffer, size_t len)
-{
-	unsigned channels = len / sizeof(servo_position_t);
-	servo_position_t *pdata = (servo_position_t *)buffer;
-	unsigned i;
+	/* publish as we send */
+	orb_publish(ORB_ID_VEHICLE_CONTROLS, _t_outputs, &_outputs);
 
-	if (channels > PX4IO_OUTPUT_CHANNELS)
-		return -EIO;
+	// XXX relays
 
-	lock();
-	for (i = 0; i < channels; i++)
-		_next_command.servo_command[i] = pdata[i];
-	unlock();
+	cmd.arm_ok = _armed.armed;
 
-	return i * sizeof(servo_position_t);
+	hx_stream_send(_io_stream, &cmd, sizeof(cmd));
 }
 
 int
 PX4IO::ioctl(struct file *filep, int cmd, unsigned long arg)
 {
-	int ret = -ENOTTY;
+	int ret = OK;
 
 	lock();
 
 	/* regular ioctl? */
 	switch (cmd) {
 	case PWM_SERVO_ARM:
-		_next_command.arm_ok = true;
-		ret = 0;
+		/* fake an armed transition */
+		_armed.armed = true;
+		_send_needed = true;
 		break;
 
 	case PWM_SERVO_DISARM:
-		_next_command.arm_ok = false;
-		ret = 0;
+		/* fake a disarmed transition */
+		_armed.armed = true;
+		_send_needed = true;
+		break;
+
+	case PWM_SERVO_SET(0) ... PWM_SERVO_SET(_max_actuators - 1):
+		if ((arg >= 900) && (arg <= 2100)) {
+			_outputs.output[cmd - PWM_SERVO_SET(0)] = arg;
+			_send_needed = true;
+		} else {
+			ret = -EINVAL;
+		}
+		break;
+
+	case PWM_SERVO_GET(0) ... PWM_SERVO_GET(_max_actuators - 1):
+		*(servo_position_t *)arg = _outputs.output[cmd - PWM_SERVO_GET(0)];
+		break;
+
+	case MIXERIOCGETOUTPUTCOUNT:
+		*(unsigned *)arg = _max_actuators;
+		break;
+
+	case MIXERIOCRESET:
+		if (_mixers != nullptr) {
+			delete _mixers;
+			_mixers = nullptr;
+		}
+		break;
+
+	case MIXERIOCADDSIMPLE: {
+			mixer_simple_s *mixinfo = (mixer_simple_s *)arg;
+
+			SimpleMixer *mixer = new SimpleMixer(control_callback,
+							     (uintptr_t)&_controls, mixinfo);
+
+			if (mixer->check()) {
+				delete mixer;
+				ret = -EINVAL;
+
+			} else {
+				if (_mixers == nullptr)
+					_mixers = new MixerGroup(control_callback,
+								 (uintptr_t)&_controls);
+
+				_mixers->add_mixer(mixer);
+			}
+
+		}
+		break;
+
+	case MIXERIOCADDMULTIROTOR:
+		/* XXX not yet supported */
+		ret = -ENOTTY;
+		break;
+
+	case MIXERIOCLOADFILE: {
+			const char *path = (const char *)arg;
+
+			if (_mixers != nullptr) {
+				delete _mixers;
+				_mixers = nullptr;
+			}
+
+			_mixers = new MixerGroup(control_callback, (uintptr_t)&_controls);
+
+			if (_mixers->load_from_file(path) != 0) {
+				delete _mixers;
+				_mixers = nullptr;
+				ret = -EINVAL;
+			}
+
+		}
 		break;
 
 	default:
-		/* channel set? */
-		if ((cmd >= PWM_SERVO_SET(0)) && (cmd < PWM_SERVO_SET(PX4IO_OUTPUT_CHANNELS))) {
-			/* XXX sanity-check value? */
-			_next_command.servo_command[cmd - PWM_SERVO_SET(0)] = arg;
-			ret = 0;
-			break;
-		}
-
-		/* channel get? */
-		if ((cmd >= PWM_SERVO_GET(0)) && (cmd < PWM_SERVO_GET(PX4IO_INPUT_CHANNELS))) {
-			int channel = cmd - PWM_SERVO_GET(0);
-
-			/* currently no data for this channel */
-			if (channel >= _rc_channel_count) {
-				ret = -ERANGE;
-				break;
-			}
-
-			*(servo_position_t *)arg = _rc_channel[channel];
-			ret = 0;
-			break;
-		}
-
 		/* not a recognised value */
 		ret = -ENOTTY;
 	}
@@ -492,28 +500,25 @@ px4io_main(int argc, char *argv[])
 {
 	if (!strcmp(argv[1], "start")) {
 
-		if (g_dev != nullptr) {
-			fprintf(stderr, "PX4IO: already loaded\n");
-			return -EBUSY;
-		}
+		if (g_dev != nullptr)
+			errx(1, "already loaded");
 
 		/* create the driver - it will set g_dev */
 		(void)new PX4IO;
 
-		if (g_dev == nullptr) {
-			fprintf(stderr, "PX4IO: driver alloc failed\n");
-			return -ENOMEM;
-		}
+		if (g_dev == nullptr)
+			errx(1, "driver alloc failed");
 
 		if (OK != g_dev->init()) {
-			fprintf(stderr, "PX4IO: driver init failed\n");
 			delete g_dev;
-			return -EIO;
+			errx(1, "driver init failed");
 		}
 
-		return OK;
+		exit(0);
 	}
 
+	/* note, stop not currently implemented */
+
 	if (!strcmp(argv[1], "update")) {
 		PX4IO_Uploader *up;
 		const char *fn[3];
@@ -536,26 +541,19 @@ px4io_main(int argc, char *argv[])
 		case OK:
 			break;
 		case -ENOENT:
-			fprintf(stderr, "PX4IO firmware file not found\n");
-			break;
+			errx(1, "PX4IO firmware file not found");
 		case -EEXIST:
 		case -EIO:
-			fprintf(stderr, "error updating PX4IO - check that bootloader mode is enabled\n");
-			break;
+			errx(1, "error updating PX4IO - check that bootloader mode is enabled");
 		case -EINVAL:
-			fprintf(stderr, "verify failed - retry the update\n");
-			break;
+			errx(1, "verify failed - retry the update");
 		case -ETIMEDOUT:
-			fprintf(stderr, "timed out waiting for bootloader - power-cycle and try again\n");
+			errx(1, "timed out waiting for bootloader - power-cycle and try again");
 		default:
-			fprintf(stderr, "unexpected error %d\n", ret);
-			break;
+			errx(1, "unexpected error %d", ret);
 		}
 		return ret;
 	}
 
-
-
-	printf("need a verb, only support 'start' and 'update'\n");
-	return ERROR;
+	errx(1, "need a verb, only support 'start' and 'update'");
 }

From bfbd17a2fa5ef685d2d2f71ab0cedbffec6d62d7 Mon Sep 17 00:00:00 2001
From: px4dev <px4@purgatory.org>
Date: Sat, 20 Oct 2012 16:53:52 -0700
Subject: [PATCH 42/43] Make it possible to run fmu and px4io simultaneously
 with full control over both sets of possible PWM outputs.  First started
 wins.

---
 apps/drivers/device/cdev.cpp    |   4 +-
 apps/drivers/device/device.h    |   6 ++
 apps/px4/fmu/fmu.cpp            |  51 +++++++++-----
 apps/px4/px4io/driver/px4io.cpp | 119 +++++++++++++++++++++-----------
 apps/px4io/protocol.h           |   2 +
 5 files changed, 123 insertions(+), 59 deletions(-)

diff --git a/apps/drivers/device/cdev.cpp b/apps/drivers/device/cdev.cpp
index 6b8bf0c2d4..d07d26e824 100644
--- a/apps/drivers/device/cdev.cpp
+++ b/apps/drivers/device/cdev.cpp
@@ -74,7 +74,7 @@ static int	cdev_poll(struct file *filp, struct pollfd *fds, bool setup);
  * Note that we use the GNU extension syntax here because we don't get designated
  * initialisers in gcc 4.6.
  */
-static const struct file_operations cdev_fops = {
+const struct file_operations CDev::fops = {
 open	: cdev_open,
 close	: cdev_close,
 read	: cdev_read,
@@ -118,7 +118,7 @@ CDev::init()
 		goto out;
 
 	// now register the driver
-	ret = register_driver(_devname, &cdev_fops, 0666, (void *)this);
+	ret = register_driver(_devname, &fops, 0666, (void *)this);
 
 	if (ret != OK)
 		goto out;
diff --git a/apps/drivers/device/device.h b/apps/drivers/device/device.h
index 98dbf8bfb9..9af6784650 100644
--- a/apps/drivers/device/device.h
+++ b/apps/drivers/device/device.h
@@ -286,6 +286,12 @@ public:
        bool            is_open() { return _open_count > 0; }
 
 protected:
+	/**
+	 * Pointer to the default cdev file operations table; useful for
+	 * registering clone devices etc.
+	 */
+	static const struct file_operations	fops;
+
 	/**
 	 * Check the current state of the device for poll events from the
 	 * perspective of the file.
diff --git a/apps/px4/fmu/fmu.cpp b/apps/px4/fmu/fmu.cpp
index 18f27d49ea..6d990c46bc 100644
--- a/apps/px4/fmu/fmu.cpp
+++ b/apps/px4/fmu/fmu.cpp
@@ -79,7 +79,7 @@ public:
 	FMUServo(Mode mode, int update_rate);
 	~FMUServo();
 
-	virtual int	ioctl(struct file *filp, int cmd, unsigned long arg);
+	virtual int	ioctl(file *filp, int cmd, unsigned long arg);
 
 	virtual int	init();
 
@@ -93,6 +93,7 @@ private:
 	int		_t_armed;
 	orb_advert_t	_t_outputs;
 	unsigned	_num_outputs;
+	bool		_primary_pwm_device;
 
 	volatile bool	_task_should_exit;
 	bool		_armed;
@@ -118,7 +119,7 @@ FMUServo	*g_servo;
 } // namespace
 
 FMUServo::FMUServo(Mode mode, int update_rate) :
-	CDev("fmuservo", PWM_OUTPUT_DEVICE_PATH),
+	CDev("fmuservo", "/dev/px4fmu"),
 	_mode(mode),
 	_update_rate(update_rate),
 	_task(-1),
@@ -126,6 +127,7 @@ FMUServo::FMUServo(Mode mode, int update_rate) :
 	_t_armed(-1),
 	_t_outputs(0),
 	_num_outputs(0),
+	_primary_pwm_device(false),
 	_task_should_exit(false),
 	_armed(false),
 	_mixers(nullptr)
@@ -135,18 +137,16 @@ FMUServo::FMUServo(Mode mode, int update_rate) :
 FMUServo::~FMUServo()
 {
 	if (_task != -1) {
-
-		/* task should wake up every 100ms or so at least */
+		/* tell the task we want it to go away */
 		_task_should_exit = true;
 
-		unsigned i = 0;
-
+		unsigned i = 10;
 		do {
-			/* wait 20ms */
-			usleep(20000);
+			/* wait 50ms - it should wake every 100ms or so worst-case */
+			usleep(50000);
 
 			/* if we have given up, kill it */
-			if (++i > 10) {
+			if (--i == 0) {
 				task_delete(_task);
 				break;
 			}
@@ -154,6 +154,10 @@ FMUServo::~FMUServo()
 		} while (_task != -1);
 	}
 
+	/* clean up the alternate device node */
+	if (_primary_pwm_device)
+		unregister_driver(PWM_OUTPUT_DEVICE_PATH);
+
 	g_servo = nullptr;
 }
 
@@ -170,6 +174,13 @@ FMUServo::init()
 	if (ret != OK)
 		return ret;
 
+	/* try to claim the generic PWM output device node as well - it's OK if we fail at this */
+	ret = register_driver(PWM_OUTPUT_DEVICE_PATH, &fops, 0666, (void *)this);
+	if (ret == OK) {
+		log("default PWM output device");
+		_primary_pwm_device = true;
+	}
+
 	/* start the IO interface task */
 	_task = task_spawn("fmuservo",
 			   SCHED_DEFAULT,
@@ -216,8 +227,12 @@ FMUServo::task_main()
 		break;
 	}
 
-	/* subscribe to objects that we are interested in watching */
-	_t_actuators = orb_subscribe(ORB_ID_VEHICLE_ATTITUDE_CONTROLS);
+	/*
+	 * Subscribe to the appropriate PWM output topic based on whether we are the
+	 * primary PWM output or not.
+	 */
+	_t_actuators = orb_subscribe(_primary_pwm_device ? ORB_ID_VEHICLE_ATTITUDE_CONTROLS :
+				     ORB_ID(actuator_controls_1));
 	/* convert the update rate in hz to milliseconds, rounding down if necessary */
 	int update_rate_in_ms = int(1000 / _update_rate);
 	orb_set_interval(_t_actuators, update_rate_in_ms);
@@ -226,11 +241,13 @@ FMUServo::task_main()
 	orb_set_interval(_t_armed, 200);		/* 5Hz update rate */
 
 	/* advertise the mixed control outputs */
-	struct actuator_outputs_s outputs;
+	actuator_outputs_s outputs;
 	memset(&outputs, 0, sizeof(outputs));
-	_t_outputs = orb_advertise(ORB_ID_VEHICLE_CONTROLS, &outputs);
+	/* advertise the mixed control outputs */
+	_t_outputs = orb_advertise(_primary_pwm_device ? ORB_ID_VEHICLE_CONTROLS : ORB_ID(actuator_outputs_1),
+				   &outputs);
 
-	struct pollfd fds[2];
+	pollfd fds[2];
 	fds[0].fd = _t_actuators;
 	fds[0].events = POLLIN;
 	fds[1].fd = _t_armed;
@@ -282,7 +299,7 @@ FMUServo::task_main()
 
 		/* how about an arming update? */
 		if (fds[1].revents & POLLIN) {
-			struct actuator_armed_s aa;
+			actuator_armed_s aa;
 
 			/* get new value */
 			orb_copy(ORB_ID(actuator_armed), _t_armed, &aa);
@@ -320,7 +337,7 @@ FMUServo::control_callback(uintptr_t handle,
 }
 
 int
-FMUServo::ioctl(struct file *filp, int cmd, unsigned long arg)
+FMUServo::ioctl(file *filp, int cmd, unsigned long arg)
 {
 	int ret = OK;
 	int channel;
@@ -569,7 +586,7 @@ fake(int argc, char *argv[])
 		exit(1);
 	}
 
-	struct actuator_controls_s ac;
+	actuator_controls_s ac;
 
 	ac.control[0] = strtol(argv[1], 0, 0) / 100.0f;
 
diff --git a/apps/px4/px4io/driver/px4io.cpp b/apps/px4/px4io/driver/px4io.cpp
index 954b1e8915..e38307eb86 100644
--- a/apps/px4/px4io/driver/px4io.cpp
+++ b/apps/px4/px4io/driver/px4io.cpp
@@ -85,10 +85,10 @@ public:
 
 	virtual int		init();
 
-	virtual int		ioctl(struct file *filp, int cmd, unsigned long arg);
+	virtual int		ioctl(file *filp, int cmd, unsigned long arg);
 
 private:
-	static const unsigned	_max_actuators = 8;
+	static const unsigned	_max_actuators = PX4IO_OUTPUT_CHANNELS;
 
 	int			_serial_fd;	///< serial interface to PX4IO
 	hx_stream_t		_io_stream;	///< HX protocol stream
@@ -96,22 +96,23 @@ private:
 	int			_task;		///< worker task
 	volatile bool		_task_should_exit;
 
-	int			_t_actuators;	///< ORB subscription for actuator outputs
-	int			_t_armed;
-	orb_advert_t		_t_outputs;
+	int			_t_actuators;	///< actuator output topic
+	actuator_controls_s	_controls;	///< actuator outputs
 
-	MixerGroup		*_mixers;
-	actuator_controls_s	_controls;
-	actuator_armed_s	_armed;
-	actuator_outputs_s	_outputs;
+	int			_t_armed;	///< system armed control topic
+	actuator_armed_s	_armed;		///< system armed state
 
-	orb_advert_t		_t_input;
-	rc_input_values		_input;
+	orb_advert_t		_t_outputs;	///< mixed outputs topic
+	actuator_outputs_s	_outputs;	///< mixed outputs
+
+	MixerGroup		*_mixers;	///< loaded mixers
+
+	bool			_primary_pwm_device;	///< true if we are the default PWM output
 
 	volatile bool		_switch_armed;	///< PX4IO switch armed state
 						// XXX how should this work?
 
-	bool			_send_needed;
+	bool			_send_needed;	///< If true, we need to send a packet to IO
 
 	/**
 	 * Trampoline to the worker task
@@ -123,15 +124,30 @@ private:
 	 */
 	void			task_main();
 
+	/**
+	 * Handle receiving bytes from PX4IO
+	 */
 	void			io_recv();
 
 	/**
-	 * HX protocol callback.
+	 * HX protocol callback trampoline.
 	 */
 	static void		rx_callback_trampoline(void *arg, const void *buffer, size_t bytes_received);
+
+	/**
+	 * Callback invoked when we receive a whole packet from PX4IO
+	 */
 	void			rx_callback(const uint8_t *buffer, size_t bytes_received);
 
+	/**
+	 * Send an update packet to PX4IO
+	 */
 	void			io_send();
+
+	/**
+	 * Mixer control callback; invoked to fetch a control from a specific
+	 * group/index during mixing.
+	 */
 	static int		control_callback(uintptr_t handle,
 						 uint8_t control_group,
 						 uint8_t control_index,
@@ -156,7 +172,7 @@ PX4IO::PX4IO() :
 	_t_armed(-1),
 	_t_outputs(-1),
 	_mixers(nullptr),
-	_t_input(-1),
+	_primary_pwm_device(false),
 	_switch_armed(false),
 	_send_needed(false)
 {
@@ -169,22 +185,29 @@ PX4IO::PX4IO() :
 PX4IO::~PX4IO()
 {
 	if (_task != -1) {
-		/* task should wake up every 100ms or so at least */
+		/* tell the task we want it to go away */
 		_task_should_exit = true;
 
-		unsigned i = 0;
+		/* spin waiting for the thread to stop */
+		unsigned i = 10;
 		do {
-			/* wait 20ms */
-			usleep(20000);
+			/* wait 50ms - it should wake every 100ms or so worst-case */
+			usleep(50000);
 
 			/* if we have given up, kill it */
-			if (++i > 10) {
+			if (--i == 0) {
 				task_delete(_task);
 				break;
 			}
 
 		} while (_task != -1);
 	}
+
+	/* clean up the alternate device node */
+	if (_primary_pwm_device)
+		unregister_driver(PWM_OUTPUT_DEVICE_PATH);
+
+	/* kill the HX stream */
 	if (_io_stream != nullptr)
 		hx_stream_free(_io_stream);
 
@@ -203,6 +226,13 @@ PX4IO::init()
 	if (ret != OK)
 		return ret;
 
+	/* try to claim the generic PWM output device node as well - it's OK if we fail at this */
+	ret = register_driver(PWM_OUTPUT_DEVICE_PATH, &fops, 0666, (void *)this);
+	if (ret == OK) {
+		log("default PWM output device");
+		_primary_pwm_device = true;
+	}
+
 	/* start the IO interface task */
 	_task = task_create("px4io", SCHED_PRIORITY_DEFAULT, 1024, (main_t)&PX4IO::task_main_trampoline, nullptr);
 	if (_task < 0) {
@@ -244,8 +274,12 @@ PX4IO::task_main()
 
 	/* XXX verify firmware/protocol version */
 
-	/* subscribe to objects that we are interested in watching */
-	_t_actuators = orb_subscribe(ORB_ID_VEHICLE_ATTITUDE_CONTROLS);
+	/*
+	 * Subscribe to the appropriate PWM output topic based on whether we are the
+	 * primary PWM output or not.
+	 */
+	_t_actuators = orb_subscribe(_primary_pwm_device ? ORB_ID_VEHICLE_ATTITUDE_CONTROLS :
+				     ORB_ID(actuator_controls_1));
 	/* convert the update rate in hz to milliseconds, rounding down if necessary */
 	//int update_rate_in_ms = int(1000 / _update_rate);
 	orb_set_interval(_t_actuators, 20);	/* XXX 50Hz hardcoded for now */
@@ -254,13 +288,11 @@ PX4IO::task_main()
 	orb_set_interval(_t_armed, 200);		/* 5Hz update rate */
 
 	/* advertise the mixed control outputs */
-	_t_outputs = orb_advertise(ORB_ID_VEHICLE_CONTROLS, &_outputs);
+	_t_outputs = orb_advertise(_primary_pwm_device ? ORB_ID_VEHICLE_CONTROLS : ORB_ID(actuator_outputs_1),
+				   &_outputs);
 
-	/* advertise the PX4IO R/C input */
-	_t_input = orb_advertise(ORB_ID(input_rc), &_input);
-
-	/* poll descriptor(s) */
-	struct pollfd fds[3];
+	/* poll descriptor */
+	pollfd fds[3];
 	fds[0].fd = _serial_fd;
 	fds[0].events = POLLIN;
 	fds[1].fd = _t_actuators;
@@ -358,10 +390,10 @@ PX4IO::rx_callback_trampoline(void *arg, const void *buffer, size_t bytes_receiv
 void
 PX4IO::rx_callback(const uint8_t *buffer, size_t bytes_received)
 {
-	const struct px4io_report *rep = (const struct px4io_report *)buffer;
+	const px4io_report *rep = (const px4io_report *)buffer;
 
 	/* sanity-check the received frame size */
-	if (bytes_received != sizeof(struct px4io_report))
+	if (bytes_received != sizeof(px4io_report))
 		return;
 
 	/* XXX handle R/C inputs here ... needs code sharing/library */
@@ -395,7 +427,7 @@ PX4IO::io_send()
 }
 
 int
-PX4IO::ioctl(struct file *filep, int cmd, unsigned long arg)
+PX4IO::ioctl(file *filep, int cmd, unsigned long arg)
 {
 	int ret = OK;
 
@@ -416,6 +448,7 @@ PX4IO::ioctl(struct file *filep, int cmd, unsigned long arg)
 		break;
 
 	case PWM_SERVO_SET(0) ... PWM_SERVO_SET(_max_actuators - 1):
+		/* fake an update to the selected servo channel */
 		if ((arg >= 900) && (arg <= 2100)) {
 			_outputs.output[cmd - PWM_SERVO_SET(0)] = arg;
 			_send_needed = true;
@@ -425,6 +458,7 @@ PX4IO::ioctl(struct file *filep, int cmd, unsigned long arg)
 		break;
 
 	case PWM_SERVO_GET(0) ... PWM_SERVO_GET(_max_actuators - 1):
+		/* copy the current output value from the channel */
 		*(servo_position_t *)arg = _outputs.output[cmd - PWM_SERVO_GET(0)];
 		break;
 
@@ -442,18 +476,22 @@ PX4IO::ioctl(struct file *filep, int cmd, unsigned long arg)
 	case MIXERIOCADDSIMPLE: {
 			mixer_simple_s *mixinfo = (mixer_simple_s *)arg;
 
+			/* build the new mixer from the supplied argument */
 			SimpleMixer *mixer = new SimpleMixer(control_callback,
 							     (uintptr_t)&_controls, mixinfo);
 
+			/* validate the new mixer */
 			if (mixer->check()) {
 				delete mixer;
 				ret = -EINVAL;
 
 			} else {
+				/* if we don't have a group yet, allocate one */
 				if (_mixers == nullptr)
 					_mixers = new MixerGroup(control_callback,
 								 (uintptr_t)&_controls);
 
+				/* add the new mixer to the group */
 				_mixers->add_mixer(mixer);
 			}
 
@@ -466,21 +504,22 @@ PX4IO::ioctl(struct file *filep, int cmd, unsigned long arg)
 		break;
 
 	case MIXERIOCLOADFILE: {
+			MixerGroup *newmixers;
 			const char *path = (const char *)arg;
 
-			if (_mixers != nullptr) {
-				delete _mixers;
-				_mixers = nullptr;
-			}
-
-			_mixers = new MixerGroup(control_callback, (uintptr_t)&_controls);
-
-			if (_mixers->load_from_file(path) != 0) {
-				delete _mixers;
-				_mixers = nullptr;
+			/* allocate a new mixer group and load it from the file */
+			newmixers = new MixerGroup(control_callback, (uintptr_t)&_controls);
+			if (newmixers->load_from_file(path) != 0) {
+				delete newmixers;
 				ret = -EINVAL;
 			}
 
+			/* swap the new mixers in for the old */
+			if (_mixers != nullptr) {
+				delete _mixers;
+			}
+			_mixers = newmixers;
+
 		}
 		break;
 
diff --git a/apps/px4io/protocol.h b/apps/px4io/protocol.h
index 96e0ca3500..edc2c4bd2d 100644
--- a/apps/px4io/protocol.h
+++ b/apps/px4io/protocol.h
@@ -39,6 +39,8 @@
  * messages and the corresponding complexity involved.
  */
 
+#pragma once
+
 /*
  * XXX MUST BE KEPT IN SYNC WITH THE VERSION IN PX4FMU UNTIL
  * TREES ARE MERGED.

From 73521cbc66fa4fbc350c15cef277fabfce89c150 Mon Sep 17 00:00:00 2001
From: px4dev <px4@purgatory.org>
Date: Sat, 20 Oct 2012 23:11:04 -0700
Subject: [PATCH 43/43] Fix stack allocation (now probably too large) for PX4IO
 debugging.  Disable nonblocking serial comms to avoid losing tx data.

---
 apps/px4/px4io/driver/px4io.cpp | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/apps/px4/px4io/driver/px4io.cpp b/apps/px4/px4io/driver/px4io.cpp
index e38307eb86..66db1c360c 100644
--- a/apps/px4/px4io/driver/px4io.cpp
+++ b/apps/px4/px4io/driver/px4io.cpp
@@ -234,7 +234,7 @@ PX4IO::init()
 	}
 
 	/* start the IO interface task */
-	_task = task_create("px4io", SCHED_PRIORITY_DEFAULT, 1024, (main_t)&PX4IO::task_main_trampoline, nullptr);
+	_task = task_create("px4io", SCHED_PRIORITY_DEFAULT, 4096, (main_t)&PX4IO::task_main_trampoline, nullptr);
 	if (_task < 0) {
 		debug("task start failed: %d", errno);
 		return -errno;
@@ -255,7 +255,7 @@ PX4IO::task_main()
 	log("starting");
 
 	/* open the serial port */
-	_serial_fd = ::open("/dev/ttyS2", O_RDWR | O_NONBLOCK);
+	_serial_fd = ::open("/dev/ttyS2", O_RDWR);
 	if (_serial_fd < 0) {
 		debug("failed to open serial port for IO: %d", errno);
 		_task = -1;
@@ -300,11 +300,13 @@ PX4IO::task_main()
 	fds[2].fd = _t_armed;
 	fds[2].events = POLLIN;
 
+	log("ready");
+
 	/* loop handling received serial bytes */
 	while (!_task_should_exit) {
 
 		/* sleep waiting for data, but no more than 100ms */
-		int ret = ::poll(&fds[0], 1, 100);
+		int ret = ::poll(&fds[0], sizeof(fds) / sizeof(fds[0]), 1000);
 
 		/* this would be bad... */
 		if (ret < 0) {
@@ -342,6 +344,7 @@ PX4IO::task_main()
 				}
 			}
 			if (fds[2].revents & POLLIN) {
+
 				orb_copy(ORB_ID(actuator_armed), _t_armed, &_controls);
 				_send_needed = true;
 			}
@@ -374,11 +377,19 @@ PX4IO::control_callback(uintptr_t handle,
 void
 PX4IO::io_recv()
 {
-	uint8_t c;
+	uint8_t buf[32];
+	int count;
 
-	/* handle bytes from IO */
-	while (::read(_serial_fd, &c, 1) == 1)
-		hx_stream_rx(_io_stream, c);
+	/*
+	 * We are here because poll says there is some data, so this
+	 * won't block even on a blocking device.  If more bytes are
+	 * available, we'll go back to poll() again...
+	 */
+	count = ::read(_serial_fd, buf, sizeof(buf));
+
+	/* pass received bytes to the packet decoder */
+	for (int i = 0; i < count; i++)
+		hx_stream_rx(_io_stream, buf[i]);
 }
 
 void
@@ -402,7 +413,6 @@ PX4IO::rx_callback(const uint8_t *buffer, size_t bytes_received)
 	_switch_armed = rep->armed;
 
 	unlock();
-
 }
 
 void