diff --git a/arch/misoc/src/lm32/Kconfig b/arch/misoc/src/lm32/Kconfig
index 83ce834dce..b4c3e858d8 100644
--- a/arch/misoc/src/lm32/Kconfig
+++ b/arch/misoc/src/lm32/Kconfig
@@ -7,25 +7,15 @@ if ARCH_CHIP_LM32
 
 choice
 	prompt "Toolchain Selection"
-	default LM32_TOOLCHAIN_GNUW if TOOLCHAIN_WINDOWS
-	default LM32_TOOLCHAIN_GNUL if !TOOLCHAIN_WINDOWS
+	default LM32_TOOLCHAIN_GNU
 
 config LM32_TOOLCHAIN_BUILDROOT
 	bool "Buildroot (Cygwin or Linux)"
 	depends on !WINDOWS_NATIVE
 	select ARCH_TOOLCHAIN_GNU
 
-config LM32_TOOLCHAIN_GNUL
-	bool "Generic GNU toolchain under Linux (or other POSIX environment)"
-	select ARCH_TOOLCHAIN_GNU
-	---help---
-		This option should work for any modern GNU toolchain (GCC 4.5 or newer)
-		configured for lm32-elf-.
-
-config LM32_TOOLCHAIN_GNUW
-	bool "Generic GNU toolchain under Windows"
-	depends on TOOLCHAIN_WINDOWS
-	select CYGWIN_WINTOOL if WINDOWS_CYGWIN
+config LM32_TOOLCHAIN_GNU
+	bool "Generic GNU toolchain"
 	select ARCH_TOOLCHAIN_GNU
 	---help---
 		This option should work for any modern GNU toolchain (GCC 4.5 or newer)
diff --git a/arch/misoc/src/lm32/Toolchain.defs b/arch/misoc/src/lm32/Toolchain.defs
index 0ba33d9da0..9b1016e170 100644
--- a/arch/misoc/src/lm32/Toolchain.defs
+++ b/arch/misoc/src/lm32/Toolchain.defs
@@ -32,13 +32,7 @@ ifeq ($(filter y, \
 endif
 
 ifeq ($(filter y, \
-      $(CONFIG_LM32_TOOLCHAIN_GNUL) \
-    ),y)
-  CONFIG_LM32_TOOLCHAIN ?= GNU
-endif
-
-ifeq ($(filter y, \
-      $(CONFIG_LM32_TOOLCHAIN_GNUW) \
+      $(CONFIG_LM32_TOOLCHAIN_GNU) \
     ),y)
   CONFIG_LM32_TOOLCHAIN ?= GNU
 endif
diff --git a/arch/misoc/src/minerva/Kconfig b/arch/misoc/src/minerva/Kconfig
index 3be1b36d58..df536bc7a3 100644
--- a/arch/misoc/src/minerva/Kconfig
+++ b/arch/misoc/src/minerva/Kconfig
@@ -7,25 +7,15 @@ if ARCH_CHIP_MINERVA
 
 choice
 	prompt "Toolchain Selection"
-	default MINERVA_TOOLCHAIN_GNUW if TOOLCHAIN_WINDOWS
-	default MINERVA_TOOLCHAIN_GNUL if !TOOLCHAIN_WINDOWS
+	default MINERVA_TOOLCHAIN_GNU
 
 config MINERVA_TOOLCHAIN_BUILDROOT
 	bool "Buildroot (Cygwin or Linux)"
 	depends on !WINDOWS_NATIVE
 	select ARCH_TOOLCHAIN_GNU
 
-config MINERVA_TOOLCHAIN_GNUL
-	bool "Generic GNU toolchain under Linux (or other POSIX environment)"
-	select ARCH_TOOLCHAIN_GNU
-	---help---
-		This option should work for any modern GNU toolchain (GCC 4.5 or newer)
-		configured for risc64-elf-.
-
-config MINERVA_TOOLCHAIN_GNUW
-	bool "Generic GNU toolchain under Windows"
-	depends on TOOLCHAIN_WINDOWS
-	select CYGWIN_WINTOOL if WINDOWS_CYGWIN
+config MINERVA_TOOLCHAIN_GNU
+	bool "Generic GNU toolchain"
 	select ARCH_TOOLCHAIN_GNU
 	---help---
 		This option should work for any modern GNU toolchain (GCC 4.5 or newer)