[MIPS] MT: Enable coexistence of AP/SP with VSMP and SMTC.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 12 insertions, 12 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 0893e084150e..3513e226837b 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1377,17 +1377,6 @@ config MIPS_MT_SMTC
           This is a kernel model which is known a SMTC or lately has been
           marketesed into SMVP.
 
-config MIPS_VPE_LOADER
-        bool "VPE loader support."
-        depends on SYS_SUPPORTS_MULTITHREADING
-        select CPU_MIPSR2_IRQ_VI
-        select CPU_MIPSR2_IRQ_EI
-        select CPU_MIPSR2_SRS
-        select MIPS_MT
-        help
-          Includes a loader for loading an elf relocatable object
-          onto another VPE and running it.
-
 endchoice
 
 config MIPS_MT
@@ -1398,8 +1387,19 @@ config SYS_SUPPORTS_MULTITHREADING
 
 config MIPS_MT_FPAFF
         bool "Dynamic FPU affinity for FP-intensive threads"
-        depends on MIPS_MT
         default y
+        depends on MIPS_MT_SMP || MIPS_MT_SMTC
+
+config MIPS_VPE_LOADER
+        bool "VPE loader support."
+        depends on SYS_SUPPORTS_MULTITHREADING
+        select CPU_MIPSR2_IRQ_VI
+        select CPU_MIPSR2_IRQ_EI
+        select CPU_MIPSR2_SRS
+        select MIPS_MT
+        help
+          Includes a loader for loading an elf relocatable object
+          onto another VPE and running it.
 
 config MIPS_MT_SMTC_INSTANT_REPLAY
         bool "Low-latency Dispatch of Deferred SMTC IPIs"