diff --git a/arch/arm/src/arm/Kconfig b/arch/arm/src/arm/Kconfig
index 0d08d89a8e8..665fab5758c 100644
--- a/arch/arm/src/arm/Kconfig
+++ b/arch/arm/src/arm/Kconfig
@@ -33,3 +33,10 @@ config ARM_TOOLCHAIN_GNU_EABI
 		configured for arm-none-eabi.
 
 endchoice
+
+config ARM_OABI_TOOLCHAIN
+	bool "OABI (vs EABI)"
+	default y
+	depends on ARM_TOOLCHAIN_BUILDROOT
+	---help---
+		Most of the older buildroot toolchains are OABI and are named arm-nuttx-elf- vs. arm-nuttx-eabi-
diff --git a/arch/arm/src/arm/Toolchain.defs b/arch/arm/src/arm/Toolchain.defs
index defe30b51bd..ea11c4dc904 100644
--- a/arch/arm/src/arm/Toolchain.defs
+++ b/arch/arm/src/arm/Toolchain.defs
@@ -102,8 +102,13 @@ endif
 # NuttX buildroot under Linux or Cygwin
 
 ifeq ($(CONFIG_ARM_TOOLCHAIN),BUILDROOT)
+ifeq ($(CONFIG_ARMV_OABI_TOOLCHAIN),y)
   CROSSDEV = arm-nuttx-elf-
   ARCROSSDEV = arm-nuttx-elf-
+else
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
+endif
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/arch/arm/src/armv7-m/Kconfig b/arch/arm/src/armv7-m/Kconfig
index dc5aa391534..a154a4c5c4a 100644
--- a/arch/arm/src/armv7-m/Kconfig
+++ b/arch/arm/src/armv7-m/Kconfig
@@ -49,3 +49,11 @@ config ARMV7M_TOOLCHAIN_RAISONANCE
 	depends on HOST_WINDOWS
 
 endchoice
+
+config ARMV7M_OABI_TOOLCHAIN
+	bool "OABI (vs EABI)"
+	default y
+	depends on ARMV7M_TOOLCHAIN_BUILDROOT
+	---help---
+		Most of the older buildroot toolchains are OABI and are named arm-nuttx-elf- vs. arm-nuttx-eabi-
+
diff --git a/arch/arm/src/armv7-m/Toolchain.defs b/arch/arm/src/armv7-m/Toolchain.defs
index e214ce8bd0c..d7f2ed77f1f 100644
--- a/arch/arm/src/armv7-m/Toolchain.defs
+++ b/arch/arm/src/armv7-m/Toolchain.defs
@@ -160,14 +160,15 @@ endif
 # NuttX buildroot under Linux or Cygwin
 
 ifeq ($(CONFIG_ARMV7M_TOOLCHAIN),BUILDROOT)
-  # OABI
-  # CROSSDEV = arm-nuttx-elf-
-  # ARCROSSDEV = arm-nuttx-elf-
-  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
-  # EABI
+ifeq ($(CONFIG_ARMV7M_OABI_TOOLCHAIN),y)
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
+  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+else
   CROSSDEV = arm-nuttx-eabi-
   ARCROSSDEV = arm-nuttx-eabi-
   ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+endif
   MAXOPTIMIZATION = -Os
 endif