From 00a41cd174867783318e6aa49a8a415a0d938ab8 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 23 Feb 2020 18:57:45 +0100 Subject: [PATCH] kernel: Use new symbol to deactivate MIPS FPU support With kernel 5.4 the upstream kernel supports deactivating the FPU support on MIPS. Use this new upstream feature instead of our older patch which was removed when porting the kernel patches to kernel 5.4. This way both options are set which should work for older kernel versions and also new ones. Signed-off-by: Hauke Mehrtens --- config/Config-kernel.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config/Config-kernel.in b/config/Config-kernel.in index b4e6b9647d..175ba16a2f 100644 --- a/config/Config-kernel.in +++ b/config/Config-kernel.in @@ -44,11 +44,16 @@ config KERNEL_DEBUG_FS write to these files. Many common debugging facilities, such as ftrace, require the existence of debugfs. +# remove KERNEL_MIPS_FPU_EMULATOR after kernel 4.14 and 4.14 are gone config KERNEL_MIPS_FPU_EMULATOR bool "Compile the kernel with MIPS FPU Emulator" - default y + default y if TARGET_pistachio depends on (mips || mipsel || mips64 || mips64el) +config KERNEL_MIPS_FP_SUPPORT + bool + default y if KERNEL_MIPS_FPU_EMULATOR + config KERNEL_ARM_PMU bool default n