aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorPaul Burton <paul.burton@mips.com>2018-11-07 23:14:02 +0000
committerPaul Burton <paul.burton@mips.com>2018-11-09 10:23:14 -0800
commit97f7dcbf279ada9a25f36666420a72ebbc0101df (patch)
treeda58ab4aec6c8af42371f20a36f61a8673e9d91b /arch/mips
parentMIPS: Drop forward declarations of sigcontext in asm/fpu.h (diff)
downloadlinux-dev-97f7dcbf279ada9a25f36666420a72ebbc0101df.tar.xz
linux-dev-97f7dcbf279ada9a25f36666420a72ebbc0101df.zip
MIPS: Better abstract R2300 FPU usage in Kconfig
Introduce a CONFIG_CPU_R2300_FPU Kconfig symbol mirroring the existing CONFIG_CPU_R4K_FPU, and use it to determine whether to build r4k_fpu.S. This removes the duplicate R3000 & TX39XX cases in arch/mips/kernel/Makefile and prepares us for the possibility of disabling FP support later. Signed-off-by: Paul Burton <paul.burton@mips.com> Patchwork: https://patchwork.linux-mips.org/patch/21004/ Cc: linux-mips@linux-mips.org
Diffstat (limited to '')
-rw-r--r--arch/mips/Kconfig6
-rw-r--r--arch/mips/kernel/Makefile3
2 files changed, 6 insertions, 3 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 47a8f44b5db6..b3f36c2c759d 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2255,9 +2255,13 @@ config CPU_GENERIC_DUMP_TLB
bool
default y if !(CPU_R3000 || CPU_R8000 || CPU_TX39XX)
+config CPU_R2300_FPU
+ bool
+ default y if CPU_R3000 || CPU_TX39XX
+
config CPU_R4K_FPU
bool
- default y if !(CPU_R3000 || CPU_TX39XX)
+ default y if !CPU_R2300_FPU
config CPU_R4K_CACHE_TLB
bool
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index 210c2802cf4d..847d71c90053 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -42,9 +42,8 @@ sw-$(CONFIG_CPU_TX39XX) := r2300_switch.o
sw-$(CONFIG_CPU_CAVIUM_OCTEON) := octeon_switch.o
obj-y += $(sw-y)
+obj-$(CONFIG_CPU_R2300_FPU) += r2300_fpu.o
obj-$(CONFIG_CPU_R4K_FPU) += r4k_fpu.o
-obj-$(CONFIG_CPU_R3000) += r2300_fpu.o
-obj-$(CONFIG_CPU_TX39XX) += r2300_fpu.o
obj-$(CONFIG_SMP) += smp.o
obj-$(CONFIG_SMP_UP) += smp-up.o