diff --git a/arch/risc-v/Kconfig b/arch/risc-v/Kconfig
index fc8ff42229a..bc35d323fed 100644
--- a/arch/risc-v/Kconfig
+++ b/arch/risc-v/Kconfig
@@ -259,8 +259,30 @@ config ARCH_MPU_HAS_NAPOT
 	bool "PMP supports NAPOT"
 	default y	if !PMP_HAS_LIMITED_FEATURES
 
+choice
+	prompt "Toolchain Selection"
+	default RISCV_TOOLCHAIN_GNU_RVGW if TOOLCHAIN_WINDOWS
+	default RISCV_TOOLCHAIN_GNU_RVGL if !TOOLCHAIN_WINDOWS
+
+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
+	select ARCH_TOOLCHAIN_GNU
+	---help---
+		This option should work for any modern GNU toolchain (GCC 5.2 or newer)
+		configured for riscv64-unknown-elf.
+
+endchoice
+
 source "arch/risc-v/src/opensbi/Kconfig"
-source "arch/risc-v/src/common/Kconfig"
 
 if ARCH_CHIP_FE310
 source "arch/risc-v/src/fe310/Kconfig"
diff --git a/arch/risc-v/src/common/Kconfig b/arch/risc-v/src/common/Kconfig
deleted file mode 100644
index 44843f453f5..00000000000
--- a/arch/risc-v/src/common/Kconfig
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see the file kconfig-language.txt in the NuttX tools repository.
-#
-
-comment "RISC-V Common Options"
-
-choice
-	prompt "Toolchain Selection"
-	default RISCV_TOOLCHAIN_GNU_RVGW if TOOLCHAIN_WINDOWS
-	default RISCV_TOOLCHAIN_GNU_RVGL if !TOOLCHAIN_WINDOWS
-
-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
-	select ARCH_TOOLCHAIN_GNU
-	---help---
-		This option should work for any modern GNU toolchain (GCC 5.2 or newer)
-		configured for riscv64-unknown-elf.
-
-endchoice