diff --git a/cmake/kconfig.cmake b/cmake/kconfig.cmake
index 60c9293079da3..89766c63c396c 100644
--- a/cmake/kconfig.cmake
+++ b/cmake/kconfig.cmake
@@ -42,6 +42,7 @@ add_custom_target(
   BOARD_DIR=$ENV{BOARD_DIR}
   SOC_DIR=$ENV{SOC_DIR}
   PROJECT_BINARY_DIR=$ENV{PROJECT_BINARY_DIR}
+  ZEPHYR_TOOLCHAIN_VARIANT=${ZEPHYR_TOOLCHAIN_VARIANT}
   ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/kconfig/menuconfig.py ${KCONFIG_ROOT}
   WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/kconfig
   USES_TERMINAL
diff --git a/soc/riscv32/openisa_rv32m1/Kconfig.defconfig b/soc/riscv32/openisa_rv32m1/Kconfig.defconfig
index 7f85641cc5a54..7436f6feaca15 100644
--- a/soc/riscv32/openisa_rv32m1/Kconfig.defconfig
+++ b/soc/riscv32/openisa_rv32m1/Kconfig.defconfig
@@ -29,6 +29,7 @@ config XIP
 
 config RISCV_GENERIC_TOOLCHAIN
 	bool
+	default y if "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "zephyr"
 	default n
 
 config RISCV_SOC_CONTEXT_SAVE