Updated Nucleo-F401RE configuration

9 files changed, 524 insertions, 433 deletions

diff --git a/nuttx/configs/nucleo-f401re/README.txt b/nuttx/configs/nucleo-f401re/README.txt
index bf9423dce..4749a5417 100644
--- a/nuttx/configs/nucleo-f401re/README.txt
+++ b/nuttx/configs/nucleo-f401re/README.txt
@@ -27,14 +27,14 @@ Contents
   - GNU Toolchain Options
   - IDEs
   - NuttX EABI "buildroot" Toolchain
-  - NuttX OABI "buildroot" Toolchain
   - NXFLAT Toolchain
   - Hardware
     - Button
     - LED
-    - USARTS and Serial Consoles
+    - USARTs and Serial Consoles
   - LQFP64
-  - DFU and JTAG
+  - mbed
+  - Shields
   - Configurations
 
 Development Environment
@@ -232,27 +232,7 @@ NuttX EABI "buildroot" 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
-================================
-
-  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
+  use the GCC 4.6.3 EABI toolchain; instead use the GCC 4.3.3 EABI toolchain.
 
 NXFLAT Toolchain
 ================
@@ -287,60 +267,22 @@ NXFLAT Toolchain
   8. Edit setenv.h, if necessary, so that the PATH variable includes
      the path to the newly builtNXFLAT binaries.
 
-DFU and JTAG
-============
-
-  Enabling Support for the DFU Bootloader
-  --------------------------------------
-  The linker files in these projects can be configured to indicate that you
-  will be loading code using STMicro built-in USB Device Firmware Upgrade (DFU)
-  loader or via some JTAG emulator.  You can specify the DFU bootloader by
-  adding the following line:
-
-    CONFIG_STM32_DFU=y
-
-  to your .config file. Most of the configurations in this directory are set
-  up to use the DFU loader.
-
-  If CONFIG_STM32_DFU is defined, the code will not be positioned at the beginning
-  of FLASH (0x08000000) but will be offset to 0x08005000.  This offset is needed
-  to make space for the DFU loader and 0x08005000 is where the DFU loader expects
-  to find new applications at boot time.  If you need to change that origin for some
-  other bootloader, you will need to edit the file(s) ld.script.dfu for the
-  configuration.
-
-  For Linux or Mac:
-  ----------------
-
-  While on Linux or Mac,
-
-  $ lsusb
-  Bus 003 Device 061: ID 0483:374b STMicroelectronics
-
-  $ st-flash write nuttx.bin 0x08000000
-
-  Enabling JTAG
-  -------------
-  If you are not using the DFU, then you will probably also need to enable
-  JTAG support.  By default, all JTAG support is disabled but there NuttX
-  configuration options to enable JTAG in various different ways.
-
-  These configurations effect the setting of the SWJ_CFG[2:0] bits in the AFIO
-  MAPR register.  These bits are used to configure the SWJ and trace alternate function I/Os.
-  The SWJ (SerialWire JTAG) supports JTAG or SWD access to the Cortex debug port.
-  The default state in this port is for all JTAG support to be disable.
+mbed
+====
 
-  CONFIG_STM32_JTAG_FULL_ENABLE - sets SWJ_CFG[2:0] to 000 which enables full
-    SWJ (JTAG-DP + SW-DP)
+  The Nucleo-F401RE includes boot loader from mbed:
 
-  CONFIG_STM32_JTAG_NOJNTRST_ENABLE - sets SWJ_CFG[2:0] to 001 which enable
-    full SWJ (JTAG-DP + SW-DP) but without JNTRST.
+    https://mbed.org/platforms/ST-Nucleo-F401RE/
+    https://mbed.org/handbook/Homepage
 
-  CONFIG_STM32_JTAG_SW_ENABLE - sets SWJ_CFG[2:0] to 010 which would set JTAG-DP
-    disabled and SW-DP enabled
+  Using the mbed loader:
 
-  The default setting (none of the above defined) is SWJ_CFG[2:0] set to 100
-  which disable JTAG-DP and SW-DP.
+  1. Connect the Nucleo-F401RE to the host PC using the USB connector.
+  2. A new file system will appear called NUCLEO; open it with Windows
+     Explorer (assuming that you are using Windows).
+  3. Drag and drop nuttx.bin into the MBED window.  This will load the
+     nuttx.bin binary into the Nucleo-F401RE.  The NUCLEO window will
+     close then re-open and the Nucleo-F401RE will be running the new code.
 
 Hardware
 ========
@@ -399,16 +341,44 @@ Hardware
 Serial Consoles
 ===============
 
+  USART1
+  ------
+    RXD: PA11  CN10 pin 14
+         PB7   CN7 pin 21
+    TXD: PA10  CN9 pin 3, CN10 pin 33
+         PB6   CN5 pin 3, CN10 pin 17
+
   USART2
   -----
-  If you have a 3.3 V TTL to RS-232 convertor then this is the most convenient
+    RXD: PA3   CN9 pin 1 (See SB13, 14, 62, 63). CN10 pin 37
+         PD6
+    TXD: PA2   CN9 pin 2(See SB13, 14, 62, 63). CN10 pin 35
+         PD5
+
+  If you have a 3.3 V TTL to RS-232 converter then this is the most convenient
   serial console to use.  UART2 is the default in all of these
   configurations.
 
-    USART2 RX  PA3   JP1 pin 4
-    USART2 TX  PA2   JP1 pin 3
-    GND              JP1 pin 2
-    V3.3             JP2 pin 1
+       Nucleo CN9  STM32F401RE
+       ----------- ------------
+       Pin 1  PA3  USART2_RX
+       Pin 2  PA2  USART2_TX
+
+  Solder Bridges.  This configuration requires:
+
+  - SB62 and SB63 Closed: PA2 and PA3 on STM32 MCU are connected to D1 and D0
+    (pin 7 and pin 8) on Arduino connector CN9 and ST Morpho connector CN10
+    as USART signals.  Thus SB13 and SB14 should be OFF.
+
+  - SB13 and SB14 Open:  PA2 and PA3 on STM32F103C8T6 (ST-LINK MCU) are
+    disconnected to PA3 and PA2 on STM32 MCU.
+
+  USART6
+  ------
+   RXD: PC7    CN5 pin2, CN10 pin 19
+        PA12   CN10, pin 12
+   TXD: PC6    CN10, pin 4
+        PA11   CN10, pin 14
 
   Virtual COM Port
   ----------------
@@ -416,6 +386,49 @@ Serial Consoles
   option may be more convenient for long term development, but was
   painful to use during board bring-up.
 
+  Solder Bridges.  This configuration requires:
+
+  - SB62 and SB63 Open: PA2 and PA3 on STM32 MCU are disconnected to D1
+    and D0 (pin 7 and pin 8) on Arduino connector CN9 and ST Morpho
+    connector CN10.
+
+  - SB13 and SB14 Closed:  PA2 and PA3 on STM32F103C8T6 (ST-LINK MCU) are
+    connected to PA3 and PA2 on STM32 MCU to have USART communication
+    between them. Thus SB61,SB62 and SB63 should be OFF.
+
+  Default
+  -------
+  As shipped, SB62 and SB63 are open and SB13 and SB14 closed, so the
+  virtual COM port is enabled.
+
+Shields
+=======
+
+  1. RS-232 from Cutedigi.com.  Supports a single RS-232 connected via
+
+       Nucleo CN9  STM32F401RE  Cutedigi
+       ----------- ------------ --------
+       Pin 1  PA3  USART2_RX    RXD
+       Pin 2  PA2  USART2_TX    TXD
+
+     Support for this shield is enabled by selecting:
+
+       CONFIG_STM32_USART2=y
+       CONFIG_USART2_ISUART=y
+       CONFIG_USART2_SERIAL_CONSOLE=y
+       CONFIG_USART2_RXBUFSIZE=256
+       CONFIG_USART2_TXBUFSIZE=256
+       CONFIG_USART2_BAUD=115200
+       CONFIG_USART2_BITS=8
+       CONFIG_USART2_PARITY=0
+       CONFIG_USART2_2STOP=0
+
+  2. CC3000 Wireless shield
+
+     Support this shield is enabled by configuring the CC3000 networking:
+
+       CONFIG_WL_CC3000
+
 Configurations
 ==============
 
diff --git a/nuttx/configs/nucleo-f401re/include/board.h b/nuttx/configs/nucleo-f401re/include/board.h
index c14f3d38a..b30076466 100644
--- a/nuttx/configs/nucleo-f401re/include/board.h
+++ b/nuttx/configs/nucleo-f401re/include/board.h
@@ -194,7 +194,8 @@
 
 #define DMAMAP_SDIO DMAMAP_SDIO_1
 
-// need to VERIFY fwb
+/* Need to VERIFY fwb */
+
 #define DMACHAN_SPI1_RX DMAMAP_SPI1_RX_1
 #define DMACHAN_SPI1_TX DMAMAP_SPI1_TX_1
 #define DMACHAN_SPI2_RX DMAMAP_SPI2_RX
@@ -202,29 +203,37 @@
 
 /* Alternate function pin selections ************************************************/
 
-/* UARTs */
+/* USART1:
+ *   RXD: PA11  CN10 pin 14
+ *        PB7   CN7 pin 21
+ *   TXD: PA10  CN9 pin 3, CN10 pin 33
+ *        PB6   CN5 pin 3, CN10 pin 17
+ */
 
-#define GPIO_USART1_RX   GPIO_USART1_RX_1    /* PA_10 */
-#define GPIO_USART1_TX   GPIO_USART1_TX_2    /* PB_6  */
+#define GPIO_USART1_RX   GPIO_USART1_RX_1    /* PA10 */
+#define GPIO_USART1_TX   GPIO_USART1_TX_2    /* PA9  */
 
-#define GPIO_USART2_RX   GPIO_USART2_RX_1    /* PA_3 */
-#define GPIO_USART2_TX   GPIO_USART2_TX_1    /* PA_2 */
-#define GPIO_USART2_RTS  GPIO_USART2_RTS_2
-#define GPIO_USART2_CTS  GPIO_USART2_CTS_2
+/* USART2:
+ *   RXD: PA3   CN9 pin 1 (See SB13, 14, 62, 63). CN10 pin 37
+ *        PD6
+ *   TXD: PA2   CN9 pin 2(See SB13, 14, 62, 63). CN10 pin 35
+ *        PD5
+ */
 
-#define GPIO_USART3_RX   GPIO_USART3_RX_3
-#define GPIO_USART3_TX   GPIO_USART3_TX_3
+#define GPIO_USART2_RX   GPIO_USART2_RX_1    /* PA3 */
+#define GPIO_USART2_TX   GPIO_USART2_TX_1    /* PA2 */
 #define GPIO_USART2_RTS  GPIO_USART2_RTS_2
 #define GPIO_USART2_CTS  GPIO_USART2_CTS_2
 
-#define GPIO_UART4_RX    GPIO_UART4_RX_1
-#define GPIO_UART4_TX    GPIO_UART4_TX_1
-
-#define GPIO_USART6_RX   GPIO_USART6_RX_1
-#define GPIO_USART6_TX   GPIO_USART6_TX_1
+/* USART6:
+ *  RXD: PC7    CN5 pin2, CN10 pin 19
+ *       PA12   CN10, pin 12
+ *  TXD: PC6    CN10, pin 4
+ *       PA11   CN10, pin 14
+ */
 
-#define GPIO_UART7_RX    GPIO_UART7_RX_1
-#define GPIO_UART7_TX    GPIO_UART7_TX_1
+#define GPIO_USART6_RX   GPIO_USART6_RX_1    /* PC7 */
+#define GPIO_USART6_TX   GPIO_USART6_TX_1    /* PC6 */
 
 /* UART8 has no alternate pin config */
 
diff --git a/nuttx/configs/nucleo-f401re/nsh/defconfig b/nuttx/configs/nucleo-f401re/nsh/defconfig
index 2e92b88fd..e3f43a820 100644
--- a/nuttx/configs/nucleo-f401re/nsh/defconfig
+++ b/nuttx/configs/nucleo-f401re/nsh/defconfig
@@ -12,6 +12,10 @@ CONFIG_HOST_LINUX=y
 # CONFIG_HOST_OSX is not set
 # CONFIG_HOST_WINDOWS is not set
 # CONFIG_HOST_OTHER is not set
+# CONFIG_WINDOWS_NATIVE is not set
+# CONFIG_WINDOWS_CYGWIN is not set
+# CONFIG_WINDOWS_MSYS is not set
+# CONFIG_WINDOWS_OTHER is not set
 
 #
 # Build Configuration
@@ -23,7 +27,7 @@ CONFIG_HOST_LINUX=y
 # Binary Output Formats
 #
 # CONFIG_RRLOAD_BINARY is not set
-# CONFIG_INTELHEX_BINARY is not set
+CONFIG_INTELHEX_BINARY=y
 # CONFIG_MOTOROLA_SREC is not set
 CONFIG_RAW_BINARY=y
 # CONFIG_UBOOT_UIMAGE is not set
@@ -43,11 +47,11 @@ CONFIG_RAW_BINARY=y
 # CONFIG_DEBUG is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 CONFIG_ARCH_HAVE_HEAPCHECK=y
-CONFIG_DEBUG_SYMBOLS=y
+# CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
-CONFIG_DEBUG_NOOPT=y
+# CONFIG_DEBUG_NOOPT is not set
 # CONFIG_DEBUG_CUSTOMOPT is not set
-# CONFIG_DEBUG_FULLOPT is not set
+CONFIG_DEBUG_FULLOPT=y
 
 #
 # System Type
@@ -109,15 +113,17 @@ CONFIG_ARCH_HAVE_MPU=y
 #
 # ARMV7M Configuration Options
 #
+# CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
+# CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
 CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y
+# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW is not set
+# CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM is not set
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
+# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW is not set
+# CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set
 # CONFIG_SERIAL_TERMIOS is not set
-CONFIG_SDIO_DMA=y
-CONFIG_SDIO_DMAPRIO=0x00010000
-# CONFIG_SDIO_WIDTH_D1_ONLY is not set
-# CONFIG_NET_MULTICAST is not set
 
 #
 # STM32 Configuration Options
@@ -227,14 +233,14 @@ CONFIG_STM32_HAVE_OTGFS=y
 # CONFIG_STM32_ADC1 is not set
 # CONFIG_STM32_ADC2 is not set
 # CONFIG_STM32_ADC3 is not set
-CONFIG_STM32_BKPSRAM=y
+# CONFIG_STM32_BKPSRAM is not set
 # CONFIG_STM32_CAN1 is not set
 # CONFIG_STM32_CAN2 is not set
-CONFIG_STM32_CCMDATARAM=y
+# CONFIG_STM32_CCMDATARAM is not set
 # CONFIG_STM32_CRC is not set
 # CONFIG_STM32_CRYP is not set
-CONFIG_STM32_DMA1=y
-CONFIG_STM32_DMA2=y
+# CONFIG_STM32_DMA1 is not set
+# CONFIG_STM32_DMA2 is not set
 # CONFIG_STM32_DAC1 is not set
 # CONFIG_STM32_DAC2 is not set
 # CONFIG_STM32_DCMI is not set
@@ -243,16 +249,16 @@ CONFIG_STM32_DMA2=y
 # CONFIG_STM32_I2C1 is not set
 # CONFIG_STM32_I2C2 is not set
 # CONFIG_STM32_I2C3 is not set
-# CONFIG_STM32_OTGFS is not set
+CONFIG_STM32_OTGFS=y
 # CONFIG_STM32_OTGHS is not set
 CONFIG_STM32_PWR=y
 # CONFIG_STM32_RNG is not set
-CONFIG_STM32_SDIO=y
-CONFIG_STM32_SPI1=y
-CONFIG_STM32_SPI2=y
+# CONFIG_STM32_SDIO is not set
+# CONFIG_STM32_SPI1 is not set
+# CONFIG_STM32_SPI2 is not set
 # CONFIG_STM32_SPI3 is not set
 CONFIG_STM32_SYSCFG=y
-CONFIG_STM32_TIM1=y
+# CONFIG_STM32_TIM1 is not set
 # CONFIG_STM32_TIM2 is not set
 # CONFIG_STM32_TIM3 is not set
 # CONFIG_STM32_TIM4 is not set
@@ -274,43 +280,28 @@ CONFIG_STM32_USART2=y
 # CONFIG_STM32_USART6 is not set
 # CONFIG_STM32_IWDG is not set
 # CONFIG_STM32_WWDG is not set
-CONFIG_STM32_SPI=y
 
 #
 # Alternate Pin Mapping
 #
 # CONFIG_STM32_FLASH_PREFETCH is not set
 # CONFIG_STM32_JTAG_DISABLE is not set
-CONFIG_STM32_JTAG_FULL_ENABLE=y
+# CONFIG_STM32_JTAG_FULL_ENABLE is not set
 # CONFIG_STM32_JTAG_NOJNTRST_ENABLE is not set
-# CONFIG_STM32_JTAG_SW_ENABLE is not set
-CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
+CONFIG_STM32_JTAG_SW_ENABLE=y
+# CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG is not set
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
-# CONFIG_STM32_CCMEXCLUDE is not set
-CONFIG_STM32_DMACAPABLE=y
-# CONFIG_STM32_TIM1_PWM is not set
 CONFIG_STM32_USART=y
 
 #
 # U[S]ART Configuration
 #
 # CONFIG_USART2_RS485 is not set
-# CONFIG_USART2_RXDMA is not set
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_USART_SINGLEWIRE is not set
 
 #
-# SPI Configuration
-#
-# CONFIG_STM32_SPI_INTERRUPTS is not set
-CONFIG_STM32_SPI_DMA=y
-
-#
-# SDIO Configuration
-#
-
-#
 # USB Host Configuration
 #
 
@@ -323,7 +314,7 @@ CONFIG_STM32_SPI_DMA=y
 #
 # CONFIG_ARCH_NOINTC is not set
 # CONFIG_ARCH_VECNOTIRQ is not set
-CONFIG_ARCH_DMA=y
+# CONFIG_ARCH_DMA is not set
 CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_CUSTOM_STACK is not set
 # CONFIG_ADDRENV is not set
@@ -331,8 +322,8 @@ CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
-CONFIG_ARCH_IRQPRIO=y
-# CONFIG_ARCH_STACKDUMP is not set
+# CONFIG_ARCH_IRQPRIO is not set
+CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
 # CONFIG_ARCH_IDLE_CUSTOM is not set
 # CONFIG_ARCH_HAVE_RAMFUNCS is not set
@@ -349,7 +340,7 @@ CONFIG_BOARD_LOOPSPERMSEC=16717
 # Interrupt options
 #
 CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
-CONFIG_ARCH_INTERRUPTSTACK=4096
+CONFIG_ARCH_INTERRUPTSTACK=2048
 CONFIG_ARCH_HAVE_HIPRI_INTERRUPT=y
 # CONFIG_ARCH_HIPRI_INTERRUPT is not set
 
@@ -382,10 +373,10 @@ CONFIG_ARCH_BOARD="nucleo-f401re"
 CONFIG_ARCH_HAVE_LEDS=y
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_HAVE_BUTTONS=y
-# CONFIG_ARCH_BUTTONS is not set
+CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_HAVE_IRQBUTTONS=y
+# CONFIG_ARCH_IRQBUTTONS is not set
 CONFIG_NSH_MMCSDMINOR=0
-CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Board-Specific Options
@@ -394,30 +385,36 @@ CONFIG_NSH_MMCSDSLOTNO=0
 #
 # RTOS Features
 #
-# CONFIG_DISABLE_OS_API is not set
+CONFIG_DISABLE_OS_API=y
+# CONFIG_DISABLE_CLOCK is not set
+# CONFIG_DISABLE_POSIX_TIMERS is not set
+# CONFIG_DISABLE_PTHREAD is not set
+# CONFIG_DISABLE_SIGNALS is not set
+# CONFIG_DISABLE_MQUEUE is not set
+# CONFIG_DISABLE_ENVIRON is not set
 
 #
 # Clocks and Timers
 #
-CONFIG_MSEC_PER_TICK=1
+CONFIG_MSEC_PER_TICK=10
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
-CONFIG_START_YEAR=1970
-CONFIG_START_MONTH=1
-CONFIG_START_DAY=1
+CONFIG_START_YEAR=2014
+CONFIG_START_MONTH=5
+CONFIG_START_DAY=5
 CONFIG_MAX_WDOGPARMS=2
-CONFIG_PREALLOC_WDOGS=50
-CONFIG_PREALLOC_TIMERS=50
+CONFIG_PREALLOC_WDOGS=8
+CONFIG_PREALLOC_TIMERS=4
 
 #
 # Tasks and Scheduling
 #
 CONFIG_USER_ENTRYPOINT="nsh_main"
-CONFIG_RR_INTERVAL=0
-CONFIG_TASK_NAME_SIZE=24
-CONFIG_MAX_TASK_ARGS=10
-CONFIG_MAX_TASKS=32
+CONFIG_RR_INTERVAL=200
+CONFIG_TASK_NAME_SIZE=0
+CONFIG_MAX_TASK_ARGS=4
+CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
 CONFIG_SCHED_WAITPID=y
 
@@ -438,22 +435,19 @@ CONFIG_NPTHREAD_KEYS=4
 #
 CONFIG_DEV_CONSOLE=y
 # CONFIG_FDCLONE_DISABLE is not set
-CONFIG_FDCLONE_STDIO=y
+# CONFIG_FDCLONE_STDIO is not set
 CONFIG_SDCLONE_DISABLE=y
-CONFIG_NFILE_DESCRIPTORS=32
+CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NFILE_STREAMS=8
 CONFIG_NAME_MAX=32
-CONFIG_PRIORITY_INHERITANCE=y
-CONFIG_SEM_PREALLOCHOLDERS=0
-CONFIG_SEM_NNESTPRIO=8
+# CONFIG_PRIORITY_INHERITANCE is not set
 
 #
 # RTOS hooks
 #
-CONFIG_BOARD_INITIALIZE=y
+# CONFIG_BOARD_INITIALIZE is not set
 # CONFIG_SCHED_STARTHOOK is not set
-CONFIG_SCHED_ATEXIT=y
-CONFIG_SCHED_ATEXIT_MAX=1
+# CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
 
 #
@@ -463,7 +457,6 @@ CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGCONDTIMEDOUT=16
-CONFIG_SIG_SIGWORK=4
 
 #
 # POSIX Message Queue Options
@@ -474,9 +467,9 @@ CONFIG_MQ_MAXMSGSIZE=32
 #
 # Stack and heap information
 #
-CONFIG_IDLETHREAD_STACKSIZE=6000
-CONFIG_USERMAIN_STACKSIZE=4096
-CONFIG_PTHREAD_STACK_MIN=512
+CONFIG_IDLETHREAD_STACKSIZE=1024
+CONFIG_USERMAIN_STACKSIZE=2048
+CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=2048
 
 #
@@ -499,8 +492,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_I2S is not set
 # CONFIG_RTC is not set
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_DEVPATH="/dev/watchdog0"
+# CONFIG_WATCHDOG is not set
 # CONFIG_TIMER is not set
 # CONFIG_ANALOG is not set
 # CONFIG_AUDIO_DEVICES is not set
@@ -508,46 +500,8 @@ CONFIG_WATCHDOG_DEVPATH="/dev/watchdog0"
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_LCD is not set
-CONFIG_MMCSD=y
-CONFIG_MMCSD_NSLOTS=1
-# CONFIG_MMCSD_READONLY is not set
-CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
-# CONFIG_MMCSD_MMCSUPPORT is not set
-# CONFIG_MMCSD_HAVECARDDETECT is not set
-# CONFIG_MMCSD_SPI is not set
-CONFIG_ARCH_HAVE_SDIO=y
-CONFIG_MMCSD_SDIO=y
-CONFIG_SDIO_PREFLIGHT=y
-# CONFIG_SDIO_MUXBUS is not set
-# CONFIG_SDIO_BLOCKSETUP is not set
-CONFIG_MTD=y
-
-#
-# MTD Configuration
-#
-CONFIG_MTD_PARTITION=y
-# CONFIG_MTD_SECT512 is not set
-CONFIG_MTD_BYTE_WRITE=y
-# CONFIG_MTD_CONFIG is not set
-# CONFIG_MTD_CONFIG_RAM_CONSOLIDATE is not set
-
-#
-# MTD Device Drivers
-#
-# CONFIG_MTD_NAND is not set
-# CONFIG_RAMMTD is not set
-# CONFIG_MTD_AT24XX is not set
-# CONFIG_MTD_AT25 is not set
-# CONFIG_MTD_AT45DB is not set
-# CONFIG_MTD_M25P is not set
-# CONFIG_MTD_SMART is not set
-CONFIG_MTD_RAMTRON=y
-# CONFIG_MTD_SST25 is not set
-# CONFIG_MTD_SST25XX is not set
-# CONFIG_MTD_SST39FV is not set
-# CONFIG_MTD_W25 is not set
-# CONFIG_NETDEVICES is not set
-# CONFIG_NET_SLIP is not set
+# CONFIG_MMCSD is not set
+# CONFIG_MTD is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -602,19 +556,7 @@ CONFIG_USART2_2STOP=0
 # CONFIG_SERIAL_OFLOWCONTROL is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
-CONFIG_WIRELESS=y
-# CONFIG_WL_CC1101 is not set
-CONFIG_WL_CC3000=y
-# CONFIG_CC3000_MULTIPLE is not set
-CONFIG_CC3000_SPIDEV=2
-CONFIG_CC3000_DEVMINOR=0
-CONFIG_CC3000_SPI_MODE=0
-CONFIG_CC3000_SPI_FREQUENCY=16000000
-CONFIG_CC3000_WORKER_STACKSIZE=240
-CONFIG_CC3000_SELECT_STACKSIZE=368
-CONFIG_CC3000_UNSOLICED_STACKSIZE=264
-# CONFIG_CC3000_PROBES is not set
-# CONFIG_WL_NRF24L01 is not set
+# CONFIG_WIRELESS is not set
 
 #
 # System Logging Device Options
@@ -628,39 +570,9 @@ CONFIG_CC3000_UNSOLICED_STACKSIZE=264
 #
 # Networking Support
 #
-CONFIG_ARCH_HAVE_NET=y
+# CONFIG_ARCH_HAVE_NET is not set
 # CONFIG_ARCH_HAVE_PHY is not set
-CONFIG_NET=y
-CONFIG_NET_NOINTS=y
-# CONFIG_NET_MULTIBUFFER is not set
-# CONFIG_NET_PROMISCUOUS is not set
-CONFIG_NSOCKET_DESCRIPTORS=8
-CONFIG_NET_NACTIVESOCKETS=16
-CONFIG_NET_SOCKOPTS=y
-# CONFIG_NET_SOLINGER is not set
-CONFIG_NET_BUFSIZE=590
-# CONFIG_NET_TCPURGDATA is not set
-
-#
-# TCP/IP Networking
-#
-# CONFIG_NET_TCP is not set
-
-#
-# UDP Networking
-#
-CONFIG_NET_UDP=y
-# CONFIG_NET_UDP_CHECKSUMS is not set
-CONFIG_NET_UDP_CONNS=8
-# CONFIG_NET_BROADCAST is not set
-# CONFIG_NET_RXAVAIL is not set
-# CONFIG_NET_ICMP is not set
-# CONFIG_NET_IGMP is not set
-# CONFIG_NET_STATISTICS is not set
-CONFIG_NET_RECEIVE_WINDOW=536
-CONFIG_NET_ARPTAB_SIZE=16
-# CONFIG_NET_ARP_IPIN is not set
-# CONFIG_NET_ROUTE is not set
+# CONFIG_NET is not set
 
 #
 # File Systems
@@ -671,26 +583,14 @@ CONFIG_NET_ARPTAB_SIZE=16
 #
 # CONFIG_DISABLE_MOUNTPOINT is not set
 # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
-CONFIG_FS_READABLE=y
-CONFIG_FS_WRITABLE=y
+# CONFIG_FS_READABLE is not set
+# CONFIG_FS_WRITABLE is not set
 # CONFIG_FS_RAMMAP is not set
-CONFIG_FS_FAT=y
-CONFIG_FAT_LCNAMES=y
-CONFIG_FAT_LFN=y
-CONFIG_FAT_MAXFNAME=32
-CONFIG_FS_FATTIME=y
-# CONFIG_FAT_DMAMEMORY is not set
-# CONFIG_NFS is not set
-CONFIG_FS_NXFFS=y
-# CONFIG_NXFFS_SCAN_VOLUME is not set
-CONFIG_NXFFS_PREALLOCATED=y
-CONFIG_NXFFS_ERASEDSTATE=0xff
-CONFIG_NXFFS_PACKTHRESHOLD=32
-CONFIG_NXFFS_MAXNAMLEN=32
-CONFIG_NXFFS_TAILTHRESHOLD=2048
-CONFIG_FS_ROMFS=y
+# CONFIG_FS_FAT is not set
+# CONFIG_FS_NXFFS is not set
+# CONFIG_FS_ROMFS is not set
 # CONFIG_FS_SMARTFS is not set
-CONFIG_FS_BINFS=y
+# CONFIG_FS_BINFS is not set
 # CONFIG_FS_PROCFS is not set
 
 #
@@ -711,9 +611,7 @@ CONFIG_FS_BINFS=y
 # CONFIG_MM_SMALL is not set
 CONFIG_MM_REGIONS=1
 # CONFIG_ARCH_HAVE_HEAP2 is not set
-CONFIG_GRAN=y
-# CONFIG_GRAN_SINGLE is not set
-# CONFIG_GRAN_INTR is not set
+# CONFIG_GRAN is not set
 
 #
 # Audio Support
@@ -738,13 +636,13 @@ CONFIG_BUILTIN=y
 #
 # Standard C Library Options
 #
-CONFIG_STDIO_BUFFER_SIZE=32
+CONFIG_STDIO_BUFFER_SIZE=64
 CONFIG_STDIO_LINEBUFFER=y
 CONFIG_NUNGET_CHARS=2
 CONFIG_LIB_HOMEDIR="/"
-CONFIG_LIBM=y
+# CONFIG_LIBM is not set
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
-CONFIG_LIBC_FLOATINGPOINT=y
+# CONFIG_LIBC_FLOATINGPOINT is not set
 CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
@@ -753,46 +651,32 @@ CONFIG_EOL_IS_EITHER_CRLF=y
 # CONFIG_LIBC_EXECFUNCS is not set
 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
-CONFIG_LIBC_STRERROR=y
-# CONFIG_LIBC_STRERROR_SHORT is not set
+# CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
-CONFIG_ARCH_OPTIMIZED_FUNCTIONS=y
-CONFIG_ARCH_MEMCPY=y
-# CONFIG_ARCH_MEMCMP is not set
-# CONFIG_ARCH_MEMMOVE is not set
-# CONFIG_ARCH_MEMSET is not set
-# CONFIG_MEMSET_OPTSPEED is not set
-# CONFIG_ARCH_STRCHR is not set
-# CONFIG_ARCH_STRCMP is not set
-# CONFIG_ARCH_STRCPY is not set
-# CONFIG_ARCH_STRNCPY is not set
-# CONFIG_ARCH_STRLEN is not set
-# CONFIG_ARCH_STRNLEN is not set
-# CONFIG_ARCH_BZERO is not set
+# CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
 
 #
 # Non-standard Library Support
 #
-CONFIG_SCHED_WORKQUEUE=y
-CONFIG_SCHED_HPWORK=y
-CONFIG_SCHED_WORKPRIORITY=192
-CONFIG_SCHED_WORKPERIOD=5000
-CONFIG_SCHED_WORKSTACKSIZE=4000
-CONFIG_SCHED_LPWORK=y
-CONFIG_SCHED_LPWORKPRIORITY=50
-CONFIG_SCHED_LPWORKPERIOD=50000
-CONFIG_SCHED_LPWORKSTACKSIZE=4000
+# CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
 #
 # Basic CXX Support
 #
-CONFIG_C99_BOOL8=y
-# CONFIG_HAVE_CXX is not set
+# CONFIG_C99_BOOL8 is not set
+CONFIG_HAVE_CXX=y
+CONFIG_HAVE_CXXINITIALIZE=y
+# CONFIG_CXX_NEWLONG is not set
+
+#
+# uClibc++ Standard C++ Library
+#
+# CONFIG_UCLIBCXX is not set
 
 #
 # Application Configuration
@@ -808,11 +692,9 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 #
 # CONFIG_EXAMPLES_BUTTONS is not set
 # CONFIG_EXAMPLES_CAN is not set
-CONFIG_EXAMPLES_CC3000BASIC=y
-# CONFIG_EXAMPLES_CC3000_MEM_CHECK is not set
-# CONFIG_EXAMPLES_CC3000_STACK_CHECK is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
+# CONFIG_EXAMPLES_CXXTEST is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
 # CONFIG_EXAMPLES_FTPC is not set
@@ -825,14 +707,10 @@ CONFIG_EXAMPLES_CC3000BASIC=y
 # CONFIG_EXAMPLES_IGMP is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
-CONFIG_EXAMPLES_MOUNT=y
-# CONFIG_EXAMPLES_MOUNT_BLOCKDEVICE is not set
-CONFIG_EXAMPLES_MOUNT_NSECTORS=2048
-CONFIG_EXAMPLES_MOUNT_SECTORSIZE=512
-CONFIG_EXAMPLES_MOUNT_RAMDEVNO=0
-# CONFIG_EXAMPLES_MTDPART is not set
+# CONFIG_EXAMPLES_MOUNT is not set
 # CONFIG_EXAMPLES_NRF24L01TERM is not set
 CONFIG_EXAMPLES_NSH=y
+CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
 # CONFIG_EXAMPLES_NXCONSOLE is not set
@@ -862,7 +740,6 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
 # CONFIG_EXAMPLES_UDP is not set
-# CONFIG_EXAMPLES_DISCOVER is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
@@ -891,15 +768,11 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_DNSCLIENT is not set
 # CONFIG_NETUTILS_SMTP is not set
-CONFIG_NETUTILS_TFTPC=y
+# CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
-CONFIG_NETUTILS_WEBCLIENT=y
-CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
-# CONFIG_NETUTILS_NTPCLIENT is not set
-# CONFIG_NETUTILS_DISCOVER is not set
+# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
 # FreeModBus
@@ -938,7 +811,6 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
-# CONFIG_NSH_DISABLE_MKFATFS is not set
 # CONFIG_NSH_DISABLE_MKFIFO is not set
 # CONFIG_NSH_DISABLE_MKRD is not set
 # CONFIG_NSH_DISABLE_MH is not set
@@ -956,40 +828,33 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_DISABLE_UMOUNT is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
-CONFIG_NSH_DISABLE_WGET=y
+# CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
 
 #
 # Configure Command Options
 #
-CONFIG_NSH_CMDOPT_DF_H=y
+# CONFIG_NSH_CMDOPT_DF_H is not set
 CONFIG_NSH_CODECS_BUFSIZE=128
 # CONFIG_NSH_CMDOPT_HEXDUMP is not set
 CONFIG_NSH_FILEIOSIZE=512
-CONFIG_NSH_STRERROR=y
-CONFIG_NSH_LINELEN=128
+CONFIG_NSH_LINELEN=64
 # CONFIG_NSH_DISABLE_SEMICOLON is not set
 # CONFIG_NSH_CMDPARMS is not set
-CONFIG_NSH_MAXARGUMENTS=12
+CONFIG_NSH_MAXARGUMENTS=6
 # CONFIG_NSH_ARGCAT is not set
-CONFIG_NSH_NESTDEPTH=8
+CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLESCRIPT is not set
 # CONFIG_NSH_DISABLE_ITEF is not set
 # CONFIG_NSH_DISABLE_LOOPS is not set
 # CONFIG_NSH_DISABLEBG is not set
-# CONFIG_NSH_ROMFSETC is not set
 CONFIG_NSH_CONSOLE=y
 
 #
 # USB Trace Support
 #
 # CONFIG_NSH_ALTCONDEV is not set
-CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_IPADDR=0x0a000002
-CONFIG_NSH_DRIPADDR=0x0a000001
-CONFIG_NSH_NETMASK=0xffffff00
-CONFIG_NSH_NOMAC=y
-CONFIG_NSH_MAX_ROUNDTRIP=20
+# CONFIG_NSH_ARCHINIT is not set
 
 #
 # NxWidgets/NxWM
@@ -1022,7 +887,6 @@ CONFIG_NSH_MAX_ROUNDTRIP=20
 #
 # FLASH Erase-all Command
 #
-# CONFIG_SYSTEM_FLASH_ERASEALL is not set
 
 #
 # I2C tool
@@ -1062,13 +926,12 @@ CONFIG_READLINE_ECHO=y
 #
 # SD Card
 #
-CONFIG_SYSTEM_SDCARD=y
+# CONFIG_SYSTEM_SDCARD is not set
 
 #
 # Sysinfo
 #
-CONFIG_SYSTEM_SYSINFO=y
-CONFIG_SYSTEM_SYSINFO_STACKSIZE=1024
+# CONFIG_SYSTEM_SYSINFO is not set
 
 #
 # VI Work-Alike Editor
diff --git a/nuttx/configs/nucleo-f401re/nsh/setenv.sh b/nuttx/configs/nucleo-f401re/nsh/setenv.sh
index 3c1e8b9d6..cd725c71e 100644
--- a/nuttx/configs/nucleo-f401re/nsh/setenv.sh
+++ b/nuttx/configs/nucleo-f401re/nsh/setenv.sh
@@ -58,6 +58,6 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_Code
 #export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
 # Add the path to the toolchain to the PATH varialble
-export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
+#export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/nucleo-f401re/src/Makefile b/nuttx/configs/nucleo-f401re/src/Makefile
index dcda3c89f..66c0a83bf 100644
--- a/nuttx/configs/nucleo-f401re/src/Makefile
+++ b/nuttx/configs/nucleo-f401re/src/Makefile
@@ -42,6 +42,10 @@ AOBJS = $(ASRCS:.S=$(OBJEXT))
 
 CSRCS = stm32_boot.c stm32_spi.c
 
+ifeq ($(CONFIG_HAVE_CXX),y)
+CSRCS += stm32_cxxinitialize.c
+endif
+
 ifeq ($(CONFIG_ARCH_LEDS),y)
 CSRCS += stm32_autoleds.c
 else
@@ -54,16 +58,15 @@ endif
 
 ifeq ($(CONFIG_WL_CC3000),y)
 CSRCS += stm32_wireless.c
+ifeq ($(CONFIG_CC3000_PROBES),)
+CSRCS += stm32_io.c
+endif
 endif
 
 ifeq ($(CONFIG_NSH_LIBRARY),y)
 CSRCS += stm32_nsh.c
 endif
 
-ifeq ($(CONFIG_CC3000_PROBES),)
-CSRCS += stm32_io.c
-endif
-
 COBJS = $(CSRCS:.c=$(OBJEXT))
 
 SRCS = $(ASRCS) $(CSRCS)
diff --git a/nuttx/configs/nucleo-f401re/src/nucleo-f401re.h b/nuttx/configs/nucleo-f401re/src/nucleo-f401re.h
index 02f08a910..32a14dff9 100644
--- a/nuttx/configs/nucleo-f401re/src/nucleo-f401re.h
+++ b/nuttx/configs/nucleo-f401re/src/nucleo-f401re.h
@@ -1,6 +1,37 @@
 /************************************************************************************
  * configs/nucleo-f401re/src/nucleo-f401re.h
  *
+ *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ *   Authors: Frank Bennett
+ *            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.
+ *
  ************************************************************************************/
 
 #ifndef __CONFIGS_NUCLEO_F401RE_SRC_NUCLEO_F401RE_H
@@ -14,6 +45,16 @@
 #include <nuttx/compiler.h>
 #include <stdint.h>
 
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+/* Configuration ********************************************************************/
+
+#define HAVE_MMCSD 1
+#if !defined(CONFIG_STM32_SDIO) || !defined(CONFIG_MMCSD) || !defined(CONFIG_MMCSD_SDIO)
+#  undef HAVE_MMCSD
+#endif
+
 /* LED.  User LD2: the green LED is a user LED connected to Arduino signal D13
  * corresponding to MCU I/O PA5 (pin 21) or PB13 (pin 34) depending on the STM32
  * target.
@@ -22,7 +63,9 @@
  * - When the I/O is LOW, the LED is off.
  */
 
-#define GPIO_LD2      (GPIO_PORTA | GPIO_PIN5 | GPIO_OUTPUT_CLEAR | GPIO_OUTPUT | GPIO_PULLUP | GPIO_SPEED_50MHz)
+#define GPIO_LD2 \
+  (GPIO_PORTA | GPIO_PIN5 | GPIO_OUTPUT_CLEAR | GPIO_OUTPUT | GPIO_PULLUP | \
+   GPIO_SPEED_50MHz)
 
 /* Buttons
  *
@@ -34,7 +77,8 @@
 #define MAX_IRQBUTTON   BUTTON_USER
 #define NUM_IRQBUTTONS  1
 
-#define GPIO_BTN_USER   (GPIO_INPUT |GPIO_FLOAT |GPIO_EXTI | GPIO_PORTC | GPIO_PIN13)
+#define GPIO_BTN_USER \
+  (GPIO_INPUT |GPIO_FLOAT |GPIO_EXTI | GPIO_PORTC | GPIO_PIN13)
 
 /* The shield uses the following pins:
  *
@@ -57,10 +101,10 @@
  *
  */
 
-#define GPIO_WIFI_INT (GPIO_PORTB | GPIO_PIN3  | GPIO_INPUT        | GPIO_PULLUP | GPIO_EXTI)
-#define GPIO_WIFI_EN  (GPIO_PORTB | GPIO_PIN4  | GPIO_OUTPUT_CLEAR | GPIO_OUTPUT | GPIO_PULLUP | GPIO_SPEED_50MHz)
-#define GPIO_WIFI_CS  (GPIO_PORTB | GPIO_PIN6  | GPIO_OUTPUT_SET   | GPIO_OUTPUT | GPIO_PULLUP | GPIO_SPEED_50MHz)
-
+#ifdef CONFIG_WL_CC3000
+#  define GPIO_WIFI_INT (GPIO_PORTB | GPIO_PIN3  | GPIO_INPUT        | GPIO_PULLUP | GPIO_EXTI)
+#  define GPIO_WIFI_EN  (GPIO_PORTB | GPIO_PIN4  | GPIO_OUTPUT_CLEAR | GPIO_OUTPUT | GPIO_PULLUP | GPIO_SPEED_50MHz)
+#  define GPIO_WIFI_CS  (GPIO_PORTB | GPIO_PIN6  | GPIO_OUTPUT_SET   | GPIO_OUTPUT | GPIO_PULLUP | GPIO_SPEED_50MHz)
 #  define GPIO_D14    (GPIO_PORTB | GPIO_PIN9  | GPIO_OUTPUT_CLEAR | GPIO_OUTPUT | GPIO_PULLUP | GPIO_SPEED_50MHz)
 #  define GPIO_D15    (GPIO_PORTB | GPIO_PIN8  | GPIO_OUTPUT_CLEAR | GPIO_OUTPUT | GPIO_PULLUP | GPIO_SPEED_50MHz)
 #  define GPIO_D0     (GPIO_PORTA | GPIO_PIN3  | GPIO_INPUT        | GPIO_PULLUP )
@@ -71,6 +115,7 @@
 #  define GPIO_A1     (GPIO_PORTA | GPIO_PIN1  | GPIO_OUTPUT_SET   | GPIO_OUTPUT | GPIO_PULLUP | GPIO_SPEED_50MHz)
 #  define GPIO_A2     (GPIO_PORTA | GPIO_PIN4  | GPIO_INPUT        | GPIO_PULLUP )
 #  define GPIO_A3     (GPIO_PORTB | GPIO_PIN0  | GPIO_INPUT        | GPIO_PULLUP )
+#endif
 
 /* SPI1 off */
 
@@ -80,17 +125,27 @@
 
 /* SPI1 chip selects off */
 
-#define GPIO_SPI_CS_WIFI_OFF \
-  (GPIO_INPUT|GPIO_PULLDOWN|GPIO_SPEED_2MHz|GPIO_PORTB|GPIO_PIN6)
-#define GPIO_SPI_CS_SD_CARD_OFF \
-  (GPIO_INPUT|GPIO_PULLDOWN|GPIO_SPEED_2MHz|GPIO_PORTB|GPIO_PIN5)
+#ifdef CONFIG_WL_CC3000
+#  define GPIO_SPI_CS_WIFI_OFF \
+    (GPIO_INPUT|GPIO_PULLDOWN|GPIO_SPEED_2MHz|GPIO_PORTB|GPIO_PIN6)
+#endif
+
+#ifdef HAVE_MMCSD
+#  define GPIO_SPI_CS_SD_CARD_OFF \
+    (GPIO_INPUT|GPIO_PULLDOWN|GPIO_SPEED_2MHz|GPIO_PORTB|GPIO_PIN5)
+#endif
 
 /* SPI chip selects */
 
-#define GPIO_SPI_CS_WIFI \
-  (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTB|GPIO_PIN6)
-#define GPIO_SPI_CS_SD_CARD \
-  (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTB|GPIO_PIN5)
+#ifdef CONFIG_WL_CC3000
+#  define GPIO_SPI_CS_WIFI \
+    (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTB|GPIO_PIN6)
+#endif
+
+#ifdef HAVE_MMCSD
+#  define GPIO_SPI_CS_SD_CARD \
+    (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTB|GPIO_PIN5)
+#endif
 
 /* Devices on the onboard bus.
  *
@@ -105,12 +160,32 @@
  * GPIO0-1 are for probing WIFI status
  */
 
-#define GPIO_GPIO0_INPUT        (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTB|GPIO_PIN8)
-#define GPIO_GPIO1_INPUT        (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTB|GPIO_PIN9)
-#define GPIO_GPIO0_OUTPUT \
-  (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN8)
-#define GPIO_GPIO1_OUTPUT \
-  (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN9)
+#ifdef CONFIG_WL_CC3000
+#  define GPIO_GPIO0_INPUT \
+    (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTB|GPIO_PIN8)
+#  define GPIO_GPIO1_INPUT \
+    (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTB|GPIO_PIN9)
+#  define GPIO_GPIO0_OUTPUT \
+    (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN8)
+#  define GPIO_GPIO1_OUTPUT \
+    (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN9)
+#endif
+
+/************************************************************************************
+ * Public Data
+ ************************************************************************************/
+
+/* Global driver instances */
+
+#ifdef CONFIG_STM32_SPI1
+extern struct spi_dev_s *g_spi1;
+#endif
+#ifdef CONFIG_STM32_SPI2
+extern struct spi_dev_s *g_spi2;
+#endif
+#ifdef HAVE_MMCSD
+extern struct sdio_dev_s *g_sdio;
+#endif
 
 /************************************************************************************
  * Public Functions
diff --git a/nuttx/configs/nucleo-f401re/src/stm32_cxxinitialize.c b/nuttx/configs/nucleo-f401re/src/stm32_cxxinitialize.c
new file mode 100644
index 000000000..ed1a4d968
--- /dev/null
+++ b/nuttx/configs/nucleo-f401re/src/stm32_cxxinitialize.c
@@ -0,0 +1,154 @@
+/************************************************************************************
+ * configs/nucleo-f401re/src/stm32_cxxinitialize.c
+ *
+ *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ************************************************************************************/
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <debug.h>
+
+#include <nuttx/arch.h>
+
+#include <arch/stm32/chip.h>
+#include "chip.h"
+
+#if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE)
+
+/************************************************************************************
+ * Definitions
+ ************************************************************************************/
+/* Debug ****************************************************************************/
+/* Non-standard debug that may be enabled just for testing the static constructors */
+
+#ifndef CONFIG_DEBUG
+#  undef CONFIG_DEBUG_CXX
+#endif
+
+#ifdef CONFIG_DEBUG_CXX
+#  define cxxdbg              dbg
+#  define cxxlldbg            lldbg
+#  ifdef CONFIG_DEBUG_VERBOSE
+#    define cxxvdbg           vdbg
+#    define cxxllvdbg         llvdbg
+#  else
+#    define cxxvdbg(x...)
+#    define cxxllvdbg(x...)
+#  endif
+#else
+#  define cxxdbg(x...)
+#  define cxxlldbg(x...)
+#  define cxxvdbg(x...)
+#  define cxxllvdbg(x...)
+#endif
+
+/************************************************************************************
+ * Private Types
+ ************************************************************************************/
+/* This type defines one entry in initialization array */
+
+typedef void (*initializer_t)(void);
+
+/************************************************************************************
+ * External references
+ ************************************************************************************/
+/* _sinit and _einit are symbols exported by the linker script that mark the
+ * beginning and the end of the C++ initialization section.
+ */
+
+extern initializer_t _sinit;
+extern initializer_t _einit;
+
+/* _stext and _etext are symbols exported by the linker script that mark the
+ * beginning and the end of text.
+ */
+
+extern uint32_t _stext;
+extern uint32_t _etext;
+
+/************************************************************************************
+ * Private Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/****************************************************************************
+ * Name: up_cxxinitialize
+ *
+ * Description:
+ *   If C++ and C++ static constructors are supported, then this function
+ *   must be provided by board-specific logic in order to perform
+ *   initialization of the static C++ class instances.
+ *
+ *   This function should then be called in the application-specific
+ *   user_start logic in order to perform the C++ initialization.  NOTE
+ *   that no component of the core NuttX RTOS logic is involved; This
+ *   function defintion only provides the 'contract' between application
+ *   specific C++ code and platform-specific toolchain support
+ *
+ ***************************************************************************/
+
+void up_cxxinitialize(void)
+{
+  initializer_t *initp;
+
+  cxxdbg("_sinit: %p _einit: %p _stext: %p _etext: %p\n",
+         &_sinit, &_einit, &_stext, &_etext);
+
+  /* Visit each entry in the initialzation table */
+
+  for (initp = &_sinit; initp != &_einit; initp++)
+    {
+      initializer_t initializer = *initp;
+      cxxdbg("initp: %p initializer: %p\n", initp, initializer);
+
+      /* Make sure that the address is non-NULL and lies in the text region
+       * defined by the linker script.  Some toolchains may put NULL values
+       * or counts in the initialization table
+       */
+
+      if ((void*)initializer > (void*)&_stext && (void*)initializer < (void*)&_etext)
+        {
+          cxxdbg("Calling %p\n", initializer);
+          initializer();
+        }
+    }
+}
+
+#endif /* CONFIG_HAVE_CXX && CONFIG_HAVE_CXXINITIALIZE */
+
diff --git a/nuttx/configs/nucleo-f401re/src/stm32_nsh.c b/nuttx/configs/nucleo-f401re/src/stm32_nsh.c
index bd4714974..3074d57c1 100644
--- a/nuttx/configs/nucleo-f401re/src/stm32_nsh.c
+++ b/nuttx/configs/nucleo-f401re/src/stm32_nsh.c
@@ -39,35 +39,26 @@
 
 #include <nuttx/config.h>
 
-#include <stdbool.h>
 #include <stdio.h>
-#include <math.h>
 #include <debug.h>
 #include <errno.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/spi/spi.h>
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
-#include <nuttx/gran.h>
 
 #include <stm32.h>
 #include <stm32_uart.h>
 
 #include <arch/board/board.h>
 
+#include "nucleo-f401re.h"
+
 /****************************************************************************
  * Pre-Processor Definitions
  ****************************************************************************/
-
 /* Configuration ************************************************************/
 
-#ifdef CONFIG_FAT_DMAMEMORY
-#  if !defined(CONFIG_GRAN) || !defined(CONFIG_FAT_DMAMEMORY)
-#    error microSD DMA support requires CONFIG_GRAN
-#  endif
-#endif
-
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_CPP_HAVE_VARARGS
@@ -88,47 +79,10 @@
  * Private Data
  ****************************************************************************/
 
-#ifdef CONFIG_FAT_DMAMEMORY
-static GRAN_HANDLE dma_allocator;
-
-/* The DMA heap size constrains the total number of things that can be
- * ready to do DMA at a time.
- *
- * For example, FAT DMA depends on one sector-sized buffer per file system plus
- * one sector-sized buffer per file.
- *
- * We use a fundamental alignment / granule size of 64B; this is sufficient
- * to guarantee alignment for the largest STM32 DMA burst (16 beats x 32bits).
- */
-
-static uint8_t g_dma_heap[8192] __attribute__((aligned(64)));
-#endif
-
-static struct spi_dev_s *spi1;
-static struct sdio_dev_s *sdio;
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_FAT_DMAMEMORY
-static void dma_alloc_init(void)
-{
-  dma_allocator =
-    gran_initialize(g_dma_heap,
-                    sizeof(g_dma_heap),
-                    7,  /* 128B granule - must be > alignment (XXX bug?) */
-                    6); /* 64B alignment */
-
-  if (dma_allocator == NULL)
-    {
-      message("[boot] DMA allocator setup FAILED");
-    }
-}
-#else
-# define dma_alloc_init()
-#endif
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -141,9 +95,11 @@ static void dma_alloc_init(void)
  *
  ****************************************************************************/
 
+#ifdef CONFIG_WL_CC3000
 void up_netinitialize(void)
 {
 }
+#endif
 
 /****************************************************************************
  * Name: nsh_archinitialize
@@ -155,7 +111,7 @@ void up_netinitialize(void)
 
 int nsh_archinitialize(void)
 {
-#ifdef CONFIG_MMCSD
+#ifdef HAVE_MMCSD
   int ret;
 #endif
 
@@ -165,20 +121,11 @@ int nsh_archinitialize(void)
   cpuload_initialize_once();
 #endif
 
-  /* Configure SPI-based devices */
-
-  spi1 = up_spiinitialize(1);
-  if (!spi1)
-    {
-      message("[boot] FAILED to initialize SPI port 1\n");
-      return -ENODEV;
-    }
-
-#ifdef CONFIG_MMCSD
+#ifdef HAVE_MMCSD
   /* First, get an instance of the SDIO interface */
 
-  sdio = sdio_initialize(CONFIG_NSH_MMCSDSLOTNO);
-  if (!sdio)
+  g_sdio = sdio_initialize(CONFIG_NSH_MMCSDSLOTNO);
+  if (!g_sdio)
     {
       message("[boot] Failed to initialize SDIO slot %d\n",
               CONFIG_NSH_MMCSDSLOTNO);
@@ -187,7 +134,7 @@ int nsh_archinitialize(void)
 
   /* Now bind the SDIO interface to the MMC/SD driver */
 
-  ret = mmcsd_slotinitialize(CONFIG_NSH_MMCSDMINOR, sdio);
+  ret = mmcsd_slotinitialize(CONFIG_NSH_MMCSDMINOR, g_sdio);
   if (ret != OK)
     {
       message("ERROR: Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
@@ -198,7 +145,7 @@ int nsh_archinitialize(void)
    * card detect GPIO.
    */
 
-  sdio_mediachange(sdio, true);
+  sdio_mediachange(g_sdio, true);
 
   message("[boot] Initialized SDIO\n");
 #endif
diff --git a/nuttx/configs/nucleo-f401re/src/stm32_spi.c b/nuttx/configs/nucleo-f401re/src/stm32_spi.c
index e290f17d9..f1249b355 100644
--- a/nuttx/configs/nucleo-f401re/src/stm32_spi.c
+++ b/nuttx/configs/nucleo-f401re/src/stm32_spi.c
@@ -78,6 +78,18 @@
 #endif
 
 /************************************************************************************
+ * Public Data
+ ************************************************************************************/
+/* Global driver instances */
+
+#ifdef CONFIG_STM32_SPI1
+struct spi_dev_s *g_spi1;
+#endif
+#ifdef CONFIG_STM32_SPI2
+struct spi_dev_s *g_spi2;
+#endif
+
+/************************************************************************************
  * Public Functions
  ************************************************************************************/
 
@@ -92,11 +104,29 @@
 void weak_function stm32_spiinitialize(void)
 {
 #ifdef CONFIG_STM32_SPI1
+  /* Configure SPI-based devices */
+
+  g_spi1 = up_spiinitialize(1);
+  if (!g_spi1)
+    {
+      message("[boot] FAILED to initialize SPI port 1\n");
+      return -ENODEV;
+    }
+
+#ifdef CONFIG_WL_CC3000
   stm32_configgpio(GPIO_SPI_CS_WIFI);
+#endif
+
+#ifdef HAVE_MMCSD
   stm32_configgpio(GPIO_SPI_CS_SD_CARD);
 #endif
+#endif
 
 #ifdef CONFIG_STM32_SPI2
+  /* Configure SPI-based devices */
+
+  g_spi2 = up_spiinitialize(2);
+
   /* Setup CS, EN & IRQ line IOs */
 
 #ifdef CONFIG_WL_CC3000
@@ -137,22 +167,19 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sele
 {
   spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
-  switch (devid)
+#ifdef CONFIG_WL_CC3000
+  if (devid == SPIDEV_WIRELESS)
     {
-    case SPIDEV_WIRELESS:
-      /* Making sure the other peripherals are not selected */
-
       stm32_gpiowrite(GPIO_SPI_CS_WIFI, !selected);
-      stm32_gpiowrite(GPIO_SPI_CS_SD_CARD, true);
-      break;
-
-    case SPIDEV_MMCSD:
-      /* Making sure the other peripherals are not selected */
-
-      stm32_gpiowrite(GPIO_SPI_CS_WIFI, true);
+    }
+  else
+#endif
+#ifdef HAVE_MMCSD
+  if (devid == SPIDEV_MMCSD)
+    {
       stm32_gpiowrite(GPIO_SPI_CS_SD_CARD, !selected);
-      break;
     }
+#endif
 }
 
 uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -166,7 +193,7 @@ void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sele
 {
   spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
-#if defined(CONFIG_WL_CC3000)
+#ifdef CONFIG_WL_CC3000
   if (devid == SPIDEV_WIRELESS)
     {
       stm32_gpiowrite(GPIO_WIFI_CS, !selected);