diff --git a/toolchain/Config.in b/toolchain/Config.in
index 84b50bbd0a..aaf4f47006 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -86,6 +86,15 @@ menuconfig TOOLCHAINOPTS
 	bool "Toolchain Options"  if DEVEL
 	depends NEED_TOOLCHAIN
 
+config EABI_SUPPORT
+	bool
+	depends arm||armeb
+	prompt "Enable EABI support" if TOOLCHAINOPTS
+	default n if TARGET_gemini
+	default y
+	help
+	  Enable ARM EABI support
+
 menuconfig EXTRA_TARGET_ARCH
 	bool
 	prompt "Enable an extra toolchain target architecture" if TOOLCHAINOPTS
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 873dbfcdc2..07f050aad5 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -40,15 +40,6 @@ endif
 
 endchoice
 
-config EABI_SUPPORT
-	bool
-	depends arm||armeb
-	prompt "Enable EABI support" if TOOLCHAINOPTS
-	default n if TARGET_gemini
-	default y
-	help
-	  Enable ARM EABI support
-
 config EXTRA_GCC_CONFIG_OPTIONS
 	string
 	prompt "Additional gcc configure options" if TOOLCHAINOPTS