6 files changed, 37 insertions, 45 deletions
diff --git a/target/config/Config.in.arm.default b/target/config/Config.in.arm.default
index 53ddb76be..4e1e17c7e 100644
--- a/target/config/Config.in.arm.default
+++ b/target/config/Config.in.arm.default
@@ -1,33 +1,12 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-config ADK_soft_float
-	bool
-
-config ADK_hard_float
-	bool
-
 config ADK_fpu_neon
 	bool
 
 config ADK_fpu_vfp
 	bool
 
-config ADK_TARGET_ARM_HARD_FLOAT
-	bool
-        select ADK_hard_float
-	default y if ADK_TARGET_ABI_EABIHF
-
-config ADK_TARGET_ARM_SOFT_FLOAT
-	bool
-        select ADK_soft_float
-	default y if ADK_TARGET_ABI_EABI
-
-config ADK_TARGET_FLOAT
-	string
-	default "hard" if ADK_hard_float
-	default "soft" if ADK_soft_float
-
 config ADK_TARGET_FPU
 	string
 	default "vfp" if ADK_fpu_vfp
diff --git a/target/config/Config.in.float b/target/config/Config.in.float
new file mode 100644
index 000000000..c193a9f2d
--- /dev/null
+++ b/target/config/Config.in.float
@@ -0,0 +1,5 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+source target/config/Config.in.float.choice
+source target/config/Config.in.float.default
diff --git a/target/config/Config.in.float.choice b/target/config/Config.in.float.choice
new file mode 100644
index 000000000..c071e1744
--- /dev/null
+++ b/target/config/Config.in.float.choice
@@ -0,0 +1,18 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+choice ADK_TARGET_FLOAT
+prompt "Float configuration"
+depends on ADK_TARGET_ARCH_ARM || \
+	   ADK_TARGET_ARCH_MIPS || \
+	   ADK_TARGET_ARCH_PPC
+
+config ADK_TARGET_HARD_FLOAT
+	bool "hard-float"
+	select ADK_hard_float
+
+config ADK_TARGET_SOFT_FLOAT
+	bool "soft-float"
+	select ADK_soft_float
+
+endchoice
diff --git a/target/config/Config.in.float.default b/target/config/Config.in.float.default
new file mode 100644
index 000000000..087a79fff
--- /dev/null
+++ b/target/config/Config.in.float.default
@@ -0,0 +1,14 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+config ADK_soft_float
+	bool
+
+config ADK_hard_float
+	bool
+
+config ADK_TARGET_FLOAT
+	string
+	default "hard" if ADK_hard_float
+	default "soft" if ADK_soft_float
+
diff --git a/target/config/Config.in.mips.choice b/target/config/Config.in.mips.choice
index 0e1c80475..71e6c8ea2 100644
--- a/target/config/Config.in.mips.choice
+++ b/target/config/Config.in.mips.choice
@@ -14,17 +14,3 @@ config ADK_CPU_MIPS_MIPS32R2
         select ADK_CPU_MIPS32R2
 
 endchoice
-
-choice ADK_TARGET_MIPS_FLOAT
-prompt "Float configuration"
-depends on ADK_TARGET_ARCH_MIPS
-
-config ADK_TARGET_MIPS_HARD_FLOAT
-	bool "hard-float"
-	select ADK_hard_float
-
-config ADK_TARGET_MIPS_SOFT_FLOAT
-	bool "soft-float"
-	select ADK_soft_float
-
-endchoice
diff --git a/target/config/Config.in.mips.default b/target/config/Config.in.mips.default
index 3241681ce..43df6220c 100644
--- a/target/config/Config.in.mips.default
+++ b/target/config/Config.in.mips.default
@@ -1,13 +1,3 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-config ADK_soft_float
-	bool
-
-config ADK_hard_float
-	bool
-
-config ADK_TARGET_FLOAT
-	string
-	default "hard" if ADK_hard_float
-	default "soft" if ADK_soft_float