Commit 91405eb69ee007ee854aa917e2a15e6ccede2cd1

Authored by Florian Fainelli
Committed by John Crispin
1 parent 3165c846a2

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>

Showing 2 changed files with 5 additions and 18 deletions Side-by-side Diff

... ... @@ -1884,6 +1884,10 @@
1884 1884 bool
1885 1885 default y if !(CPU_R3000 || CPU_R6000 || CPU_R8000 || CPU_TX39XX)
1886 1886  
  1887 +config CPU_R4K_FPU
  1888 + bool
  1889 + default y if !(CPU_R3000 || CPU_R6000 || CPU_TX39XX || CPU_CAVIUM_OCTEON)
  1890 +
1887 1891 choice
1888 1892 prompt "MIPS MT options"
1889 1893  
arch/mips/kernel/Makefile
... ... @@ -34,28 +34,11 @@
34 34  
35 35 obj-$(CONFIG_FUNCTION_TRACER) += mcount.o ftrace.o
36 36  
37   -obj-$(CONFIG_CPU_LOONGSON2) += r4k_fpu.o r4k_switch.o
38   -obj-$(CONFIG_CPU_MIPS32) += r4k_fpu.o r4k_switch.o
39   -obj-$(CONFIG_CPU_MIPS64) += r4k_fpu.o r4k_switch.o
  37 +obj-$(CONFIG_CPU_R4K_FPU) += r4k_fpu.o r4k_switch.o
40 38 obj-$(CONFIG_CPU_R3000) += r2300_fpu.o r2300_switch.o
41   -obj-$(CONFIG_CPU_R4300) += r4k_fpu.o r4k_switch.o
42   -obj-$(CONFIG_CPU_R4X00) += r4k_fpu.o r4k_switch.o
43   -obj-$(CONFIG_CPU_R5000) += r4k_fpu.o r4k_switch.o
44 39 obj-$(CONFIG_CPU_R6000) += r6000_fpu.o r4k_switch.o
45   -obj-$(CONFIG_CPU_R5432) += r4k_fpu.o r4k_switch.o
46   -obj-$(CONFIG_CPU_R5500) += r4k_fpu.o r4k_switch.o
47   -obj-$(CONFIG_CPU_R8000) += r4k_fpu.o r4k_switch.o
48   -obj-$(CONFIG_CPU_RM7000) += r4k_fpu.o r4k_switch.o
49   -obj-$(CONFIG_CPU_RM9000) += r4k_fpu.o r4k_switch.o
50   -obj-$(CONFIG_CPU_NEVADA) += r4k_fpu.o r4k_switch.o
51   -obj-$(CONFIG_CPU_R10000) += r4k_fpu.o r4k_switch.o
52   -obj-$(CONFIG_CPU_SB1) += r4k_fpu.o r4k_switch.o
53 40 obj-$(CONFIG_CPU_TX39XX) += r2300_fpu.o r2300_switch.o
54   -obj-$(CONFIG_CPU_TX49XX) += r4k_fpu.o r4k_switch.o
55   -obj-$(CONFIG_CPU_VR41XX) += r4k_fpu.o r4k_switch.o
56 41 obj-$(CONFIG_CPU_CAVIUM_OCTEON) += octeon_switch.o
57   -obj-$(CONFIG_CPU_XLR) += r4k_fpu.o r4k_switch.o
58   -obj-$(CONFIG_CPU_XLP) += r4k_fpu.o r4k_switch.o
59 42  
60 43 obj-$(CONFIG_SMP) += smp.o
61 44 obj-$(CONFIG_SMP_UP) += smp-up.o