diff --git a/configs/stm3210e-eval/README.txt b/configs/stm3210e-eval/README.txt
index 2c591c57f9fdd328ca0b760a2c34ed40c50841e2..0224f65a2904bcb81ba75a66e2050d88d76801b3 100755
--- a/configs/stm3210e-eval/README.txt
+++ b/configs/stm3210e-eval/README.txt
@@ -455,8 +455,8 @@ Where <subdir> is one of the following:
     =========== ======================= ================================
                 nsh                     nsh2
     =========== ======================= ================================
-    Toolchain:  NuttX buildroot for     NuttX buildroot for)
-                Linux or Cygwin (1,2)   Linux or Cygwin (1,2)
+    Toolchain:  NuttX buildroot for     Codesourcery for Windows (1)
+                Linux or Cygwin (1,2)
     ----------- ----------------------- --------------------------------
     Loader:     DfuSe                   DfuSe
     ----------- ----------------------- --------------------------------
diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig
index f4f1fb40bbc0dbc83b5ff6ea501789734bef1aa4..d4966988687c6180164ceeec7231644b46763c7f 100644
--- a/configs/stm3210e-eval/nsh2/defconfig
+++ b/configs/stm3210e-eval/nsh2/defconfig
@@ -92,11 +92,11 @@ CONFIG_ARCH_DMA=y
 #
 # Identify toolchain and linker options
 #
-CONFIG_STM32_CODESOURCERYW=n
+CONFIG_STM32_CODESOURCERYW=y
 CONFIG_STM32_CODESOURCERYL=n
 CONFIG_STM32_DEVKITARM=n
 CONFIG_STM32_RAISONANCE=n
-CONFIG_STM32_BUILDROOT=y
+CONFIG_STM32_BUILDROOT=n
 CONFIG_STM32_DFU=y
 
 #