diff --git a/arch/arm/src/arm/Kconfig b/arch/arm/src/arm/Kconfig
index ee5bcc7d26c..39547f4d8d4 100644
--- a/arch/arm/src/arm/Kconfig
+++ b/arch/arm/src/arm/Kconfig
@@ -7,23 +7,14 @@ comment "ARM Configuration Options"
 
 choice
 	prompt "Toolchain Selection"
-	default ARM_TOOLCHAIN_GNU_EABIW if TOOLCHAIN_WINDOWS
-	default ARM_TOOLCHAIN_GNU_EABIL if !TOOLCHAIN_WINDOWS
+	default ARM_TOOLCHAIN_GNU_EABI
 
 config ARM_TOOLCHAIN_BUILDROOT
 	bool "Buildroot (Cygwin or Linux)"
 	depends on !WINDOWS_NATIVE
 
-config ARM_TOOLCHAIN_GNU_EABIL
-	bool "Generic GNU EABI toolchain under Linux (or other POSIX environment)"
-	---help---
-		This option should work for any modern GNU toolchain (GCC 4.5 or newer)
-		configured for arm-none-eabi-.
-
-config ARM_TOOLCHAIN_GNU_EABIW
-	bool "Generic GNU EABI toolchain under Windows"
-	depends on TOOLCHAIN_WINDOWS
-	select CYGWIN_WINTOOL if WINDOWS_CYGWIN
+config ARM_TOOLCHAIN_GNU_EABI
+	bool "Generic GNU EABI toolchain"
 	---help---
 		This option should work for any modern GNU toolchain (GCC 4.5 or newer)
 		configured for arm-none-eabi-.
diff --git a/arch/arm/src/arm/Toolchain.defs b/arch/arm/src/arm/Toolchain.defs
index 2af7790b243..84cb9313192 100644
--- a/arch/arm/src/arm/Toolchain.defs
+++ b/arch/arm/src/arm/Toolchain.defs
@@ -34,13 +34,7 @@ ifeq ($(filter y, \
 endif
 
 ifeq ($(filter y, \
-      $(CONFIG_ARM_TOOLCHAIN_GNU_EABIL) \
-    ),y)
-  CONFIG_ARM_TOOLCHAIN ?= GNU_EABI
-endif
-
-ifeq ($(filter y, \
-      $(CONFIG_ARM_TOOLCHAIN_GNU_EABIW) \
+      $(CONFIG_ARM_TOOLCHAIN_GNU_EABI) \
     ),y)
   CONFIG_ARM_TOOLCHAIN ?= GNU_EABI
 endif
diff --git a/arch/arm/src/armv6-m/Kconfig b/arch/arm/src/armv6-m/Kconfig
index bd44674dfe0..9d5c0f815aa 100644
--- a/arch/arm/src/armv6-m/Kconfig
+++ b/arch/arm/src/armv6-m/Kconfig
@@ -7,27 +7,17 @@ comment "ARMv6-M Configuration Options"
 
 choice
 	prompt "Toolchain Selection"
-	default ARMV6M_TOOLCHAIN_GNU_EABIW if TOOLCHAIN_WINDOWS
-	default ARMV6M_TOOLCHAIN_GNU_EABIL if !TOOLCHAIN_WINDOWS
+	default ARMV6M_TOOLCHAIN_GNU_EABI
 
 config ARMV6M_TOOLCHAIN_BUILDROOT
 	bool "Buildroot (Cygwin or Linux)"
-	depends on !WINDOWS_NATIVE
 	select ARCH_TOOLCHAIN_GNU
 
-config ARMV6M_TOOLCHAIN_GNU_EABIL
-	bool "Generic GNU EABI toolchain under Linux (or other POSIX environment)"
+config ARMV6M_TOOLCHAIN_GNU_EABI
+	bool "Generic GNU EABI toolchain"
 	select ARCH_TOOLCHAIN_GNU
 	---help---
 		This option should work for any modern GNU toolchain (GCC 4.5 or newer)
 		configured for arm-none-eabi.
 
-config ARMV6M_TOOLCHAIN_GNU_EABIW
-	bool "Generic GNU EABI toolchain under Windows"
-	depends on TOOLCHAIN_WINDOWS
-	select CYGWIN_WINTOOL if WINDOWS_CYGWIN
-	---help---
-		This option should work for any modern GNU toolchain (GCC 4.5 or newer)
-		configured for arm-none-eabi.
-
 endchoice
diff --git a/arch/arm/src/armv6-m/Toolchain.defs b/arch/arm/src/armv6-m/Toolchain.defs
index 4270fd0899b..d52026b2138 100644
--- a/arch/arm/src/armv6-m/Toolchain.defs
+++ b/arch/arm/src/armv6-m/Toolchain.defs
@@ -31,11 +31,7 @@ ifeq ($(filter y, $(CONFIG_ARMV6M_TOOLCHAIN_BUILDROOT)),y)
   CONFIG_ARMV6M_TOOLCHAIN ?= BUILDROOT
 endif
 
-ifeq ($(filter y, $(CONFIG_ARMV6M_TOOLCHAIN_GNU_EABIL)),y)
-  CONFIG_ARMV6M_TOOLCHAIN ?= GNU_EABI
-endif
-
-ifeq ($(filter y, $(CONFIG_ARMV6M_TOOLCHAIN_GNU_EABIW)),y)
+ifeq ($(filter y, $(CONFIG_ARMV6M_TOOLCHAIN_GNU_EABI)),y)
   CONFIG_ARMV6M_TOOLCHAIN ?= GNU_EABI
 endif
 
diff --git a/boards/arm/dm320/ntosd-dm320/README.txt b/boards/arm/dm320/ntosd-dm320/README.txt
index 3c85c86942a..f6ce8284a3b 100644
--- a/boards/arm/dm320/ntosd-dm320/README.txt
+++ b/boards/arm/dm320/ntosd-dm320/README.txt
@@ -59,7 +59,7 @@ GNU Toolchain Options
   a different toolchain, you simply need to modify the configuration.  As an
   example:
 
-    CONFIG_ARM_TOOLCHAIN_GNU_EABIL : Generic arm-none-eabi toolchain
+    CONFIG_ARM_TOOLCHAIN_GNU_EABI : Generic arm-none-eabi toolchain
 
   Generic arm-none-eabi GNU Toolchain
   -----------------------------------
diff --git a/boards/arm/lpc214x/zp214xpa/README.txt b/boards/arm/lpc214x/zp214xpa/README.txt
index 22b8c3a390b..dc5e445296b 100644
--- a/boards/arm/lpc214x/zp214xpa/README.txt
+++ b/boards/arm/lpc214x/zp214xpa/README.txt
@@ -308,7 +308,7 @@ Configurations:
     2. Default platform/toolchain:
 
        CONFIG_HOST_LINUX=y              : Linux (Cygwin under Windows okay too).
-       CONFIG_ARM_TOOLCHAIN_GNU_EABIL=y : Buildroot (arm-nuttx-elf-gcc)
+       CONFIG_ARM_TOOLCHAIN_GNU_EABI=y  : Buildroot (arm-nuttx-elf-gcc)
        CONFIG_RAW_BINARY=y              : Output formats: ELF and raw binary
 
   nxlines:
@@ -332,7 +332,7 @@ Configurations:
     2. Default platform/toolchain:
 
        CONFIG_HOST_LINUX=y              : Linux (Cygwin under Windows okay too).
-       CONFIG_ARM_TOOLCHAIN_GNU_EABIL=y : Buildroot (arm-nuttx-elf-gcc)
+       CONFIG_ARM_TOOLCHAIN_GNU_EABI=y  : Buildroot (arm-nuttx-elf-gcc)
        CONFIG_RAW_BINARY=y              : Output formats: ELF and raw binary
 
     STATUS:
diff --git a/boards/arm/lpc31xx/ea3131/README.txt b/boards/arm/lpc31xx/ea3131/README.txt
index 6611d0595c6..5b3b158dbeb 100644
--- a/boards/arm/lpc31xx/ea3131/README.txt
+++ b/boards/arm/lpc31xx/ea3131/README.txt
@@ -39,7 +39,7 @@ GNU Toolchain Options
   a different toolchain, you simply need to modify the configuration.  As an
   example:
 
-    CONFIG_ARM_TOOLCHAIN_GNU_EABIL : Generic arm-none-eabi toolchain
+    CONFIG_ARM_TOOLCHAIN_GNU_EABI : Generic arm-none-eabi toolchain
 
   Generic arm-none-eabi GNU Toolchain
   -----------------------------------
@@ -560,7 +560,7 @@ Common Configuration Notes
 
         CONFIG_HOST_WINDOWS=y
         CONFIG_WINDOWS_CYGWIN=y
-        CONFIG_ARM_TOOLCHAIN_GNU_EABIW=y
+        CONFIG_ARM_TOOLCHAIN_GNU_EABI=y
 
 Configuration Sub-Directories
 -----------------------------
diff --git a/boards/arm/lpc31xx/ea3152/README.txt b/boards/arm/lpc31xx/ea3152/README.txt
index fc23d8f38fe..cca794694c4 100644
--- a/boards/arm/lpc31xx/ea3152/README.txt
+++ b/boards/arm/lpc31xx/ea3152/README.txt
@@ -38,7 +38,7 @@ GNU Toolchain Options
   a different toolchain, you simply need to modify the configuration.  As an
   example:
 
-    CONFIG_ARM_TOOLCHAIN_GNU_EABIL : Generic arm-none-eabi toolchain
+    CONFIG_ARM_TOOLCHAIN_GNU_EABI : Generic arm-none-eabi toolchain
 
   Generic arm-none-eabi GNU Toolchain
   -----------------------------------
diff --git a/boards/arm/lpc31xx/olimex-lpc-h3131/README.txt b/boards/arm/lpc31xx/olimex-lpc-h3131/README.txt
index cb0cef645af..2b1a411c863 100644
--- a/boards/arm/lpc31xx/olimex-lpc-h3131/README.txt
+++ b/boards/arm/lpc31xx/olimex-lpc-h3131/README.txt
@@ -43,7 +43,7 @@ GNU Toolchain Options
   a different toolchain, you simply need to modify the configuration.  As an
   example:
 
-    CONFIG_ARM_TOOLCHAIN_GNU_EABIL : Generic arm-none-eabi toolchain
+    CONFIG_ARM_TOOLCHAIN_GNU_EABI : Generic arm-none-eabi toolchain
 
   Generic arm-none-eabi GNU Toolchain
   -----------------------------------
@@ -478,7 +478,7 @@ Configurations
        CONFIG_WINDOWS_CYGWIN=y             : Using Cygwin or other POSIX environment
 
      System Type -> Toolchain:
-       CONFIG_ARM_TOOLCHAIN_GNU_EABIW=y : GNU EABI toolchain for windows
+       CONFIG_ARM_TOOLCHAIN_GNU_EABI=y     : GNU EABI toolchain for windows
 
   Configuration sub-directories
   -----------------------------
diff --git a/boards/arm/samd2l2/samd20-xplained/README.txt b/boards/arm/samd2l2/samd20-xplained/README.txt
index d847ab4f747..56343d0b213 100644
--- a/boards/arm/samd2l2/samd20-xplained/README.txt
+++ b/boards/arm/samd2l2/samd20-xplained/README.txt
@@ -283,8 +283,7 @@ GNU Toolchain Options
   the following configuration options to your .config (or defconfig) file:
 
     CONFIG_ARMV6M_TOOLCHAIN_BUILDROOT=y  : NuttX buildroot under Linux or Cygwin (default)
-    CONFIG_ARMV6M_TOOLCHAIN_GNU_EABIL=y  : Generic GCC ARM EABI toolchain for Linux
-    CONFIG_ARMV6M_TOOLCHAIN_GNU_EABIW=y  : Generic GCC ARM EABI toolchain for Windows
+    CONFIG_ARMV6M_TOOLCHAIN_GNU_EABI=y   : Generic GCC ARM EABI toolchain
 
   NOTE about Windows native toolchains
   ------------------------------------
@@ -664,7 +663,7 @@ Configurations
      that is easily reconfigured:
 
      System Type -> Toolchain:
-       CONFIG_ARMV6M_TOOLCHAIN_GNU_EABIW=y
+       CONFIG_ARMV6M_TOOLCHAIN_GNU_EABI=y
 
      Any re-configuration should be done before making NuttX or else the
      subsequent 'make' will fail.  If you have already attempted building
diff --git a/boards/arm/samd2l2/samd21-xplained/README.txt b/boards/arm/samd2l2/samd21-xplained/README.txt
index 295242201eb..be3accc83be 100644
--- a/boards/arm/samd2l2/samd21-xplained/README.txt
+++ b/boards/arm/samd2l2/samd21-xplained/README.txt
@@ -536,7 +536,7 @@ Configurations
      that is easily reconfigured:
 
      System Type -> Toolchain:
-       CONFIG_ARMV6M_TOOLCHAIN_GNU_EABIW=y
+       CONFIG_ARMV6M_TOOLCHAIN_GNU_EABI=y
 
      Any re-configuration should be done before making NuttX or else the
      subsequent 'make' will fail.  If you have already attempted building
diff --git a/boards/arm/samd2l2/saml21-xplained/README.txt b/boards/arm/samd2l2/saml21-xplained/README.txt
index fa327cf02af..4c33b93745d 100644
--- a/boards/arm/samd2l2/saml21-xplained/README.txt
+++ b/boards/arm/samd2l2/saml21-xplained/README.txt
@@ -694,7 +694,7 @@ Configurations
      that is easily reconfigured:
 
      System Type -> Toolchain:
-       CONFIG_ARMV6M_TOOLCHAIN_GNU_EABIW=y
+       CONFIG_ARMV6M_TOOLCHAIN_GNU_EABI=y
 
      Any re-configuration should be done before making NuttX or else the
      subsequent 'make' will fail.  If you have already attempted building
diff --git a/boards/arm/stm32/nucleo-f446re/README.txt b/boards/arm/stm32/nucleo-f446re/README.txt
index eb4ae0eb3a1..8ec543e4ae4 100644
--- a/boards/arm/stm32/nucleo-f446re/README.txt
+++ b/boards/arm/stm32/nucleo-f446re/README.txt
@@ -106,7 +106,7 @@ GNU Toolchain Options
   a different toolchain, you simply need to modify the configuration.  As an
   example:
 
-    CONFIG_ARM_TOOLCHAIN_GNU_EABIL : Generic arm-none-eabi toolchain
+    CONFIG_ARM_TOOLCHAIN_GNU_EABI : Generic arm-none-eabi toolchain
 
 IDEs
 ====
diff --git a/boards/arm/stm32/nucleo-f4x1re/README.txt b/boards/arm/stm32/nucleo-f4x1re/README.txt
index eaa300d6223..1b65abb1627 100644
--- a/boards/arm/stm32/nucleo-f4x1re/README.txt
+++ b/boards/arm/stm32/nucleo-f4x1re/README.txt
@@ -129,7 +129,7 @@ GNU Toolchain Options
   a different toolchain, you simply need to modify the configuration.  As an
   example:
 
-    CONFIG_ARM_TOOLCHAIN_GNU_EABIL : Generic arm-none-eabi toolchain
+    CONFIG_ARM_TOOLCHAIN_GNU_EABI : Generic arm-none-eabi toolchain
 
 IDEs
 ====
diff --git a/boards/arm/stm32l4/nucleo-l432kc/README.txt b/boards/arm/stm32l4/nucleo-l432kc/README.txt
index ae2cf54f23d..740a17e9c92 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/README.txt
+++ b/boards/arm/stm32l4/nucleo-l432kc/README.txt
@@ -93,7 +93,7 @@ GNU Toolchain Options
   a different toolchain, you simply need to modify the configuration.  As an
   example:
 
-    CONFIG_ARM_TOOLCHAIN_GNU_EABIL : Generic arm-none-eabi toolchain
+    CONFIG_ARM_TOOLCHAIN_GNU_EABI : Generic arm-none-eabi toolchain
 
 IDEs
 ====
diff --git a/boards/arm/stm32l4/nucleo-l476rg/README.txt b/boards/arm/stm32l4/nucleo-l476rg/README.txt
index d0d5a79e080..846b91b32bb 100644
--- a/boards/arm/stm32l4/nucleo-l476rg/README.txt
+++ b/boards/arm/stm32l4/nucleo-l476rg/README.txt
@@ -106,7 +106,7 @@ GNU Toolchain Options
   a different toolchain, you simply need to modify the configuration.  As an
   example:
 
-    CONFIG_ARM_TOOLCHAIN_GNU_EABIL : Generic arm-none-eabi toolchain
+    CONFIG_ARM_TOOLCHAIN_GNU_EABI : Generic arm-none-eabi toolchain
 
 IDEs
 ====