diff --git a/arch/z80/src/z80/Kconfig b/arch/z80/src/z80/Kconfig
index a91973167be..99c12ae0648 100644
--- a/arch/z80/src/z80/Kconfig
+++ b/arch/z80/src/z80/Kconfig
@@ -4,4 +4,19 @@
 #
 
 if ARCH_CHIP_Z80
+
+choice
+        prompt "Toolchain Selection"
+        default Z80_TOOLCHAIN_SDCCW if HOST_WINDOWS
+        default Z80_TOOLCHAIN_SDCCL if !HOST_WINDOWS
+
+config Z80_TOOLCHAIN_SDCCL
+        bool "SDCC for Linux, MAC OSX, or Cygwin"
+
+config Z80_TOOLCHAIN_SDCCW
+        bool "SDCC for Windows"
+        depends on HOST_WINDOWS
+
+endchoice
+
 endif
diff --git a/arch/z80/src/z80/Toolchain.defs b/arch/z80/src/z80/Toolchain.defs
index 9c262f593dd..e6ece2b5577 100644
--- a/arch/z80/src/z80/Toolchain.defs
+++ b/arch/z80/src/z80/Toolchain.defs
@@ -44,19 +44,19 @@
 # built to run on Windows as a POSIX toolchain.  The various SDCC options are
 # selected in the NuttX configuration with:
 #
-#  CONFIG_SDCC_POSIX=y   : SDCC for Linux, MAC OSX or Cygwin
-#  CONFIG_SDCC_WINDOWS=y : SDCC for Win32
+#  CONFIG_Z80_TOOLCHAIN_SDCCL=y : SDCC for Linux, MAC OSX or Cygwin
+#  CONFIG_Z80_TOOLCHAIN_SDCCW=y : SDCC for Win32
 #
 
 ifeq ($(filter y, \
-      $(CONFIG_SDCC_POSIX) \
+      $(CONFIG_Z80_TOOLCHAIN_SDCCL) \
     ),y)
-  CONFIG_Z80_TOOLCHAIN ?= POSIX
+  CONFIG_Z80_TOOLCHAIN ?= SDCCPOSIX
 endif
 ifeq ($(filter y, \
-      $(CONFIG_SDCC_WINDOWS) \
+      $(CONFIG_Z80_TOOLCHAIN_SDCCW) \
     ),y)
-  CONFIG_Z80_TOOLCHAIN ?= WINDOWS
+  CONFIG_Z80_TOOLCHAIN ?= SDCCWIN32
 endif
 
 # SDCC toolchain under Linux, MAC OSX or Cygwin
@@ -66,7 +66,7 @@ endif
 
 # SDCC  toolchain under Windows/Cygwin
 
-ifeq ($(CONFIG_AVR_TOOLCHAIN),WINAVR)
+ifeq ($(CONFIG_AVR_TOOLCHAIN),SDCCWIN32)
   ifneq ($(CONFIG_WINDOWS_NATIVE),y)
     WINTOOL = y
   endif