MIPS: introduce CPU_R4K_FPU

R4K-style CPUs have this boolean defined by default. Allows us
to remove some lines in arch/mips/kernel/Makefile.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/3330/
Signed-off-by: John Crispin <blogic@openwrt.org>

2 files changed, 5 insertions, 18 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index b805ccd72d98..0920936fc67f 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1884,6 +1884,10 @@ config CPU_GENERIC_DUMP_TLB
         bool
         default y if !(CPU_R3000 || CPU_R6000 || CPU_R8000 || CPU_TX39XX)
 
+config CPU_R4K_FPU
+        bool
+        default y if !(CPU_R3000 || CPU_R6000 || CPU_TX39XX || CPU_CAVIUM_OCTEON)
+
 choice
         prompt "MIPS MT options"
 
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index fdaf65e1a99d..ab51dc99c03f 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -34,28 +34,11 @@ obj-$(CONFIG_MODULES)		+= mips_ksyms.o module.o
 
 obj-$(CONFIG_FUNCTION_TRACER)   += mcount.o ftrace.o
 
-obj-$(CONFIG_CPU_LOONGSON2)     += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_MIPS32)        += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_MIPS64)        += r4k_fpu.o r4k_switch.o
+obj-$(CONFIG_CPU_R4K_FPU)       += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_R3000)         += r2300_fpu.o r2300_switch.o
-obj-$(CONFIG_CPU_R4300)         += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_R4X00)         += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_R5000)         += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_R6000)         += r6000_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_R5432)         += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_R5500)         += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_R8000)         += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_RM7000)        += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_RM9000)        += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_NEVADA)        += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_R10000)        += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_SB1)           += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_TX39XX)        += r2300_fpu.o r2300_switch.o
-obj-$(CONFIG_CPU_TX49XX)        += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_VR41XX)        += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_CAVIUM_OCTEON) += octeon_switch.o
-obj-$(CONFIG_CPU_XLR)           += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_XLP)           += r4k_fpu.o r4k_switch.o
 
 obj-$(CONFIG_SMP)               += smp.o
 obj-$(CONFIG_SMP_UP)            += smp-up.o