diff --git a/arch/risc-v/Kconfig b/arch/risc-v/Kconfig
index bc35d323fed..f44241a7f07 100644
--- a/arch/risc-v/Kconfig
+++ b/arch/risc-v/Kconfig
@@ -261,20 +261,10 @@ config ARCH_MPU_HAS_NAPOT
 
 choice
 	prompt "Toolchain Selection"
-	default RISCV_TOOLCHAIN_GNU_RVGW if TOOLCHAIN_WINDOWS
-	default RISCV_TOOLCHAIN_GNU_RVGL if !TOOLCHAIN_WINDOWS
+	default RISCV_TOOLCHAIN_GNU_RVG
 
-config RISCV_TOOLCHAIN_GNU_RVGL
-	bool "Generic GNU RVG toolchain under Linux (or other POSIX environment)"
-	select ARCH_TOOLCHAIN_GNU
-	---help---
-		This option should work for any modern GNU toolchain (GCC 5.2 or newer)
-		configured for riscv64-unknown-elf.
-
-config RISCV_TOOLCHAIN_GNU_RVGW
-	bool "Generic GNU RVG toolchain under Windows"
-	depends on TOOLCHAIN_WINDOWS
-	select CYGWIN_WINTOOL if WINDOWS_CYGWIN
+config RISCV_TOOLCHAIN_GNU_RVG
+	bool "Generic GNU RVG toolchain"
 	select ARCH_TOOLCHAIN_GNU
 	---help---
 		This option should work for any modern GNU toolchain (GCC 5.2 or newer)
diff --git a/arch/risc-v/src/common/Toolchain.defs b/arch/risc-v/src/common/Toolchain.defs
index 0be47e26794..81adabc3489 100644
--- a/arch/risc-v/src/common/Toolchain.defs
+++ b/arch/risc-v/src/common/Toolchain.defs
@@ -27,11 +27,7 @@
 # command-line selection.
 #
 
-ifeq ($(filter y, $(CONFIG_RISCV_TOOLCHAIN_GNU_RVGL)),y)
-  CONFIG_RISCV_TOOLCHAIN ?= GNU_RVG
-endif
-
-ifeq ($(filter y, $(CONFIG_RISCV_TOOLCHAIN_GNU_RVGW)),y)
+ifeq ($(filter y, $(CONFIG_RISCV_TOOLCHAIN_GNU_RVG)),y)
   CONFIG_RISCV_TOOLCHAIN ?= GNU_RVG
 endif
 
diff --git a/tools/README.txt b/tools/README.txt
index 0d05e062ce9..aae444c2761 100644
--- a/tools/README.txt
+++ b/tools/README.txt
@@ -1029,7 +1029,7 @@ testbuild.sh
     stm32f429i-disco:nsh
     arduino-due:nsh
     /arm
-    /risc-v,CONFIG_RISCV_TOOLCHAIN_GNU_RVGL
+    /risc-v
 
   The first value is the usual configuration description of the form
   <board-name>:<configuration-name> or /<folder-name> and must correspond to a
diff --git a/tools/ci/testlist/macos.dat b/tools/ci/testlist/macos.dat
index f3c94325700..222505abf41 100644
--- a/tools/ci/testlist/macos.dat
+++ b/tools/ci/testlist/macos.dat
@@ -17,9 +17,9 @@
 
 # RISC-V
 
-/risc-v/bl602/bl602evb/configs/wifi,CONFIG_RISCV_TOOLCHAIN_GNU_RVGL
+/risc-v/bl602/bl602evb/configs/wifi
 
-/risc-v/esp32c3/esp32c3-devkit/configs/wapi,CONFIG_RISCV_TOOLCHAIN_GNU_RVGL
+/risc-v/esp32c3/esp32c3-devkit/configs/wapi
 
 # ARM
 
diff --git a/tools/ci/testlist/risc-v.dat b/tools/ci/testlist/risc-v.dat
index 31ed032c739..184cd480093 100644
--- a/tools/ci/testlist/risc-v.dat
+++ b/tools/ci/testlist/risc-v.dat
@@ -1 +1 @@
-/risc-v,CONFIG_RISCV_TOOLCHAIN_GNU_RVGL
+/risc-v