diff --git a/arch/arm/src/arm/Toolchain.defs b/arch/arm/src/arm/Toolchain.defs
index 82e38780ff0..d713e92e5da 100644
--- a/arch/arm/src/arm/Toolchain.defs
+++ b/arch/arm/src/arm/Toolchain.defs
@@ -127,7 +127,7 @@ ifeq ($(CONFIG_ARM_TOOLCHAIN),CODESOURCERYW)
   CROSSDEV ?= arm-none-eabi-
   ARCROSSDEV ?= arm-none-eabi-
   MAXOPTIMIZATION ?= -O2
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
 endif
@@ -137,7 +137,7 @@ endif
 ifeq ($(CONFIG_ARM_TOOLCHAIN),DEVKITARM)
   CROSSDEV ?= arm-eabi-
   ARCROSSDEV ?= arm-eabi-
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
 endif
@@ -156,7 +156,7 @@ ifeq ($(CONFIG_ARM_TOOLCHAIN),GNU_EABIW)
   CROSSDEV ?= arm-none-eabi-
   ARCROSSDEV ?= arm-none-eabi-
   MAXOPTIMIZATION ?= -Os
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
 endif
diff --git a/arch/arm/src/armv6-m/Toolchain.defs b/arch/arm/src/armv6-m/Toolchain.defs
index bb9fc54e9fb..dfe5b9c9fdb 100644
--- a/arch/arm/src/armv6-m/Toolchain.defs
+++ b/arch/arm/src/armv6-m/Toolchain.defs
@@ -105,7 +105,7 @@ endif
 ifeq ($(CONFIG_ARMV6M_TOOLCHAIN),ATOLLIC)
   CROSSDEV ?= arm-atollic-eabi-
   ARCROSSDEV ?= arm-atollic-eabi-
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
   ARCHCPUFLAGS = -mcpu=cortex-m0 -mthumb -mfloat-abi=soft
@@ -132,7 +132,7 @@ endif
 ifeq ($(CONFIG_ARMV6M_TOOLCHAIN),CODEREDW)
   CROSSDEV ?= arm-none-eabi-
   ARCROSSDEV ?= arm-none-eabi-
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
   ARCHCPUFLAGS = -mcpu=cortex-m0 -mthumb -mfloat-abi=soft
@@ -151,7 +151,7 @@ endif
 ifeq ($(CONFIG_ARMV6M_TOOLCHAIN),CODESOURCERYW)
   CROSSDEV ?= arm-none-eabi-
   ARCROSSDEV ?= arm-none-eabi-
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
   ARCHCPUFLAGS = -mcpu=cortex-m0 -mthumb -mfloat-abi=soft
@@ -162,7 +162,7 @@ endif
 ifeq ($(CONFIG_ARMV6M_TOOLCHAIN),DEVKITARM)
   CROSSDEV ?= arm-eabi-
   ARCROSSDEV ?= arm-eabi-
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
   ARCHCPUFLAGS = -mcpu=cortex-m0 -mthumb -mfloat-abi=soft
@@ -179,7 +179,7 @@ endif
 ifeq ($(CONFIG_ARMV6M_TOOLCHAIN),GNU_EABIW)
   CROSSDEV ?= arm-none-eabi-
   ARCROSSDEV ?= arm-none-eabi-
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
   ARCHCPUFLAGS = -mcpu=cortex-m0 -mthumb -mfloat-abi=soft
diff --git a/arch/arm/src/armv7-a/Toolchain.defs b/arch/arm/src/armv7-a/Toolchain.defs
index 80fc6778267..8ee6efdf2ad 100644
--- a/arch/arm/src/armv7-a/Toolchain.defs
+++ b/arch/arm/src/armv7-a/Toolchain.defs
@@ -127,7 +127,7 @@ ifeq ($(CONFIG_ARMV7A_TOOLCHAIN),CODESOURCERYW)
   CROSSDEV ?= $(TARGET_ARCH)-none-eabi-
   ARCROSSDEV ?= $(TARGET_ARCH)-none-eabi-
   MAXOPTIMIZATION ?= -O2
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
 endif
@@ -137,7 +137,7 @@ endif
 ifeq ($(CONFIG_ARMV7A_TOOLCHAIN),DEVKITARM)
   CROSSDEV ?= $(TARGET_ARCH)-eabi-
   ARCROSSDEV ?= $(TARGET_ARCH)-eabi-
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
 endif
@@ -156,7 +156,7 @@ ifeq ($(CONFIG_ARMV7A_TOOLCHAIN),GNU_EABIW)
   CROSSDEV ?= $(TARGET_ARCH)-none-eabi-
   ARCROSSDEV ?= $(TARGET_ARCH)-none-eabi-
   MAXOPTIMIZATION ?= -Os
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
 endif
diff --git a/arch/arm/src/armv7-m/Toolchain.defs b/arch/arm/src/armv7-m/Toolchain.defs
index e673cd7ab0a..9d5ce9ce18a 100644
--- a/arch/arm/src/armv7-m/Toolchain.defs
+++ b/arch/arm/src/armv7-m/Toolchain.defs
@@ -165,7 +165,7 @@ ifeq ($(CONFIG_ARMV7M_TOOLCHAIN),ATOLLIC)
   ARCROSSDEV ?= arm-atollic-eabi-
   MAXOPTIMIZATION ?= -Os
   ARCHCPUFLAGS = $(TOOLCHAIN_MCPU) -mthumb $(TOOLCHAIN_MFLOAT)
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
 endif
@@ -201,7 +201,7 @@ ifeq ($(CONFIG_ARMV7M_TOOLCHAIN),CODEREDW)
   ARCROSSDEV ?= arm-none-eabi-
   MAXOPTIMIZATION ?= -Os
   ARCHCPUFLAGS = $(TOOLCHAIN_MCPU) -mthumb $(TOOLCHAIN_MFLOAT)
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
 endif
@@ -222,7 +222,7 @@ ifeq ($(CONFIG_ARMV7M_TOOLCHAIN),CODESOURCERYW)
   ARCROSSDEV ?= arm-none-eabi-
   MAXOPTIMIZATION ?= -Os
   ARCHCPUFLAGS = $(TOOLCHAIN_MCPU) -mthumb $(TOOLCHAIN_MFLOAT)
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
 endif
@@ -232,7 +232,7 @@ endif
 ifeq ($(CONFIG_ARMV7M_TOOLCHAIN),DEVKITARM)
   CROSSDEV ?= arm-none-eabi-
   ARCROSSDEV ?= arm-none-eabi-
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
   ARCHCPUFLAGS = $(TOOLCHAIN_MCPU) -mthumb $(TOOLCHAIN_MFLOAT)
@@ -254,7 +254,7 @@ ifeq ($(CONFIG_ARMV7M_TOOLCHAIN),GNU_EABIW)
   ARCROSSDEV ?= arm-none-eabi-
   MAXOPTIMIZATION ?= -Os
   ARCHCPUFLAGS = $(TOOLCHAIN_MCPU) -mthumb $(TOOLCHAIN_MFLOAT)
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
 endif
@@ -264,7 +264,7 @@ endif
 ifeq ($(CONFIG_ARMV7M_TOOLCHAIN),RAISONANCE)
   CROSSDEV ?= arm-none-eabi-
   ARCROSSDEV ?= arm-none-eabi-
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
   ARCHCPUFLAGS = $(TOOLCHAIN_MCPU) -mthumb $(TOOLCHAIN_MFLOAT)
diff --git a/arch/arm/src/armv7-r/Toolchain.defs b/arch/arm/src/armv7-r/Toolchain.defs
index 419a30a19fa..f1eb9db8170 100644
--- a/arch/arm/src/armv7-r/Toolchain.defs
+++ b/arch/arm/src/armv7-r/Toolchain.defs
@@ -127,7 +127,7 @@ ifeq ($(CONFIG_ARMV7R_TOOLCHAIN),CODESOURCERYW)
   CROSSDEV ?= $(TARGET_ARCH)-none-eabi-
   ARCROSSDEV ?= $(TARGET_ARCH)-none-eabi-
   MAXOPTIMIZATION ?= -O2
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
 endif
@@ -137,7 +137,7 @@ endif
 ifeq ($(CONFIG_ARMV7R_TOOLCHAIN),DEVKITARM)
   CROSSDEV ?= $(TARGET_ARCH)-eabi-
   ARCROSSDEV ?= $(TARGET_ARCH)-eabi-
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
 endif
@@ -156,7 +156,7 @@ ifeq ($(CONFIG_ARMV7R_TOOLCHAIN),GNU_EABIW)
   CROSSDEV ?= $(TARGET_ARCH)-none-eabi-
   ARCROSSDEV ?= $(TARGET_ARCH)-none-eabi-
   MAXOPTIMIZATION ?= -Os
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
 endif
diff --git a/arch/avr/src/avr/Toolchain.defs b/arch/avr/src/avr/Toolchain.defs
index c9c97c48feb..7503086fb07 100644
--- a/arch/avr/src/avr/Toolchain.defs
+++ b/arch/avr/src/avr/Toolchain.defs
@@ -132,7 +132,7 @@ endif
 
 ifeq ($(_WINAVR),1)
   CROSSDEV ?= avr-
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
   MAXOPTIMIZATION ?= -O2
diff --git a/arch/avr/src/avr32/Toolchain.defs b/arch/avr/src/avr32/Toolchain.defs
index 51fe4fbba8f..b0a40e34b30 100644
--- a/arch/avr/src/avr32/Toolchain.defs
+++ b/arch/avr/src/avr32/Toolchain.defs
@@ -60,7 +60,7 @@ else
 endif
 
 ifeq ($(CONFIG_AVR32_TOOLCHAIN),AVRTOOLSW)
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
 else
diff --git a/arch/mips/src/mips32/Toolchain.defs b/arch/mips/src/mips32/Toolchain.defs
index 059c194e512..cee45311d8e 100644
--- a/arch/mips/src/mips32/Toolchain.defs
+++ b/arch/mips/src/mips32/Toolchain.defs
@@ -176,7 +176,7 @@ endif
 
 ifeq ($(CONFIG_MIPS32_TOOLCHAIN),MICROCHIPW_XC32)
   CROSSDEV ?= xc32-
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
 ifeq ($(CONFIG_MIPS32_TOOLCHAIN_MICROCHIP_XC32_LICENSED),y)
@@ -191,7 +191,7 @@ endif
 
 ifeq ($(CONFIG_MIPS32_TOOLCHAIN),MICROCHIPW)
   CROSSDEV ?= pic32-
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
   MAXOPTIMIZATION ?= -O2
@@ -217,7 +217,7 @@ endif
 ifeq ($(CONFIG_MIPS32_TOOLCHAIN),MICROCHIPW_LITE)
   CROSSDEV ?= pic32-
   # CROSSDEV ?= xc32-
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
   # MAXOPTIMIZATION ?= -O2
@@ -243,7 +243,7 @@ endif
 ifeq ($(CONFIG_MIPS32_TOOLCHAIN),PINGUINOW)
   #CROSSDEV ?= mips-
   CROSSDEV ?= p32-
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
   MAXOPTIMIZATION ?= -O2
diff --git a/arch/z80/src/ez80/Toolchain.defs b/arch/z80/src/ez80/Toolchain.defs
index 483bc84e73b..4f0bdc7f3f7 100644
--- a/arch/z80/src/ez80/Toolchain.defs
+++ b/arch/z80/src/ez80/Toolchain.defs
@@ -42,6 +42,6 @@
 
 CONFIG_EZ80_TOOLCHAIN ?= ZDSII
 
-ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
   WINTOOL = y
 endif
diff --git a/arch/z80/src/z180/Toolchain.defs b/arch/z80/src/z180/Toolchain.defs
index 3979f3f0ed3..cf97558ffca 100644
--- a/arch/z80/src/z180/Toolchain.defs
+++ b/arch/z80/src/z180/Toolchain.defs
@@ -67,7 +67,7 @@ endif
 # SDCC  toolchain under Windows/Cygwin
 
 ifeq ($(CONFIG_AVR_TOOLCHAIN),SDCCWIN32)
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
 endif
diff --git a/arch/z80/src/z8/Toolchain.defs b/arch/z80/src/z8/Toolchain.defs
index a5f139eb5a9..9aaf1b89ced 100644
--- a/arch/z80/src/z8/Toolchain.defs
+++ b/arch/z80/src/z8/Toolchain.defs
@@ -42,6 +42,6 @@
 
 CONFIG_Z8_TOOLCHAIN ?= ZDSII
 
-ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
   WINTOOL = y
 endif
diff --git a/arch/z80/src/z80/Toolchain.defs b/arch/z80/src/z80/Toolchain.defs
index e6ece2b5577..90fc9944ad2 100644
--- a/arch/z80/src/z80/Toolchain.defs
+++ b/arch/z80/src/z80/Toolchain.defs
@@ -67,7 +67,7 @@ endif
 # SDCC  toolchain under Windows/Cygwin
 
 ifeq ($(CONFIG_AVR_TOOLCHAIN),SDCCWIN32)
-  ifneq ($(CONFIG_WINDOWS_NATIVE),y)
+  ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
     WINTOOL = y
   endif
 endif