diff --git a/arch/arm/src/arm/Toolchain.defs b/arch/arm/src/arm/Toolchain.defs
index d54631b152b..82e38780ff0 100644
--- a/arch/arm/src/arm/Toolchain.defs
+++ b/arch/arm/src/arm/Toolchain.defs
@@ -49,27 +49,18 @@ ifeq ($(filter y, \
 endif
 
 ifeq ($(filter y, \
-      $(CONFIG_DM320_CODESOURCERYL) \
-      $(CONFIG_LPC31_CODESOURCERYL) \
-      $(CONFIG_OLIMEX_LPC2378_CODESOURCERYL) \
       $(CONFIG_ARM_TOOLCHAIN_CODESOURCERYL) \
     ),y)
   CONFIG_ARM_TOOLCHAIN ?= CODESOURCERYL
 endif
 
 ifeq ($(filter y, \
-      $(CONFIG_DM320_CODESOURCERYW) \
-      $(CONFIG_LPC31_CODESOURCERYW) \
-      $(CONFIG_OLIMEX_LPC2378_CODESOURCERYW) \
       $(CONFIG_ARM_TOOLCHAIN_CODESOURCERYW) \
     ),y)
   CONFIG_ARM_TOOLCHAIN ?= CODESOURCERYW
 endif
 
 ifeq ($(filter y, \
-      $(CONFIG_DM320_DEVKITARM) \
-      $(CONFIG_LPC31_DEVKITARM) \
-      $(CONFIG_OLIMEX_LPC2378_DEVKITARM) \
       $(CONFIG_ARM_TOOLCHAIN_DEVKITARM) \
     ),y)
   CONFIG_ARM_TOOLCHAIN ?= DEVKITARM
diff --git a/arch/arm/src/armv7-m/Toolchain.defs b/arch/arm/src/armv7-m/Toolchain.defs
index 838951d5b2c..a698d6cacce 100644
--- a/arch/arm/src/armv7-m/Toolchain.defs
+++ b/arch/arm/src/armv7-m/Toolchain.defs
@@ -43,10 +43,6 @@
 #
 
 ifeq ($(filter y, \
-      $(CONFIG_LPC43_ATOLLIC_LITE) \
-      $(CONFIG_STM32_ATOLLIC_LITE) \
-      $(CONFIG_LPC43_ATOLLIC_PRO) \
-      $(CONFIG_STM32_ATOLLIC_PRO) \
       $(CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC) \
     ),y)
   CONFIG_ARMV7M_TOOLCHAIN ?= ATOLLIC
@@ -59,58 +55,36 @@ ifeq ($(filter y, \
 endif
 
 ifeq ($(filter y, \
-      $(CONFIG_LPC17_CODEREDL) \
       $(CONFIG_ARMV7M_TOOLCHAIN_CODEREDL) \
     ),y)
   CONFIG_ARMV7M_TOOLCHAIN ?= CODEREDL
 endif
 
 ifeq ($(filter y, \
-      $(CONFIG_LPC17_CODEREDW) \
-      $(CONFIG_LPC43_CODEREDW) \
       $(CONFIG_ARMV7M_TOOLCHAIN_CODEREDW) \
     ),y)
   CONFIG_ARMV7M_TOOLCHAIN ?= CODEREDW
 endif
 
 ifeq ($(filter y, \
-      $(CONFIG_KINETIS_CODESOURCERYL) \
-      $(CONFIG_LM_CODESOURCERYL) \
-      $(CONFIG_LPC17_CODESOURCERYL) \
-      $(CONFIG_LPC43_CODESOURCERYL) \
-      $(CONFIG_SAM3U_CODESOURCERYL) \
-      $(CONFIG_STM32_CODESOURCERYL) \
       $(CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL) \
     ),y)
   CONFIG_ARMV7M_TOOLCHAIN ?= CODESOURCERYL
 endif
 
 ifeq ($(filter y, \
-      $(CONFIG_KINETIS_CODESOURCERYW) \
-      $(CONFIG_LM_CODESOURCERYW) \
-      $(CONFIG_LPC17_CODESOURCERYW) \
-      $(CONFIG_LPC43_CODESOURCERYW) \
-      $(CONFIG_SAM3U_CODESOURCERYW) \
-      $(CONFIG_STM32_CODESOURCERYW) \
       $(CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW) \
     ),y)
   CONFIG_ARMV7M_TOOLCHAIN ?= CODESOURCERYW
 endif
 
 ifeq ($(filter y, \
-      $(CONFIG_KINETIS_DEVKITARM) \
-      $(CONFIG_LM_DEVKITARM) \
-      $(CONFIG_LPC17_DEVKITARM) \
-      $(CONFIG_LPC43_DEVKITARM) \
-      $(CONFIG_SAM3U_DEVKITARM) \
-      $(CONFIG_STM32_DEVKITARM) \
       $(CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM) \
     ),y)
   CONFIG_ARMV7M_TOOLCHAIN ?= DEVKITARM
 endif
 
 ifeq ($(filter y, \
-      $(CONFIG_STM32_RAISONANCE) \
       $(CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE) \
     ),y)
   CONFIG_ARMV7M_TOOLCHAIN ?= RAISONANCE