Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 62cedc4fde2d15b08e4502aa3fb2d9d798f3ccd8

Authored by Florian Fainelli
Committed by John Crispin
1 parent 91405eb69e
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

MIPS: introduce CPU_R4K_CACHE_TLB 

R4K-style CPUs having common code to support their caches and tlb have this
boolean defined by default. Allows us to remove some lines in
arch/mips/mm/Makefile.

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

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

... ... @@ -1888,6 +1888,10 @@
1888 1888 bool
1889 1889 default y if !(CPU_R3000 || CPU_R6000 || CPU_TX39XX || CPU_CAVIUM_OCTEON)
1890 1890  
  1891 +config CPU_R4K_CACHE_TLB
  1892 + bool
  1893 + default y if !(CPU_R3000 || CPU_R8000 || CPU_SB1 || CPU_TX39XX || CPU_CAVIUM_OCTEON)
  1894 +
1891 1895 choice
1892 1896 prompt "MIPS MT options"
1893 1897  
arch/mips/mm/Makefile
Diff comments   View file @ 62cedc4
... ... @@ -11,27 +11,12 @@
11 11 obj-$(CONFIG_HIGHMEM) += highmem.o
12 12 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
13 13  
14   -obj-$(CONFIG_CPU_LOONGSON2) += c-r4k.o cex-gen.o tlb-r4k.o
15   -obj-$(CONFIG_CPU_MIPS32) += c-r4k.o cex-gen.o tlb-r4k.o
16   -obj-$(CONFIG_CPU_MIPS64) += c-r4k.o cex-gen.o tlb-r4k.o
17   -obj-$(CONFIG_CPU_NEVADA) += c-r4k.o cex-gen.o tlb-r4k.o
18   -obj-$(CONFIG_CPU_R10000) += c-r4k.o cex-gen.o tlb-r4k.o
  14 +obj-$(CONFIG_CPU_R4K_CACHE_TLB) += c-r4k.o cex-gen.o tlb-r4k.o
19 15 obj-$(CONFIG_CPU_R3000) += c-r3k.o tlb-r3k.o
20   -obj-$(CONFIG_CPU_R4300) += c-r4k.o cex-gen.o tlb-r4k.o
21   -obj-$(CONFIG_CPU_R4X00) += c-r4k.o cex-gen.o tlb-r4k.o
22   -obj-$(CONFIG_CPU_R5000) += c-r4k.o cex-gen.o tlb-r4k.o
23   -obj-$(CONFIG_CPU_R5432) += c-r4k.o cex-gen.o tlb-r4k.o
24   -obj-$(CONFIG_CPU_R5500) += c-r4k.o cex-gen.o tlb-r4k.o
25 16 obj-$(CONFIG_CPU_R8000) += c-r4k.o cex-gen.o tlb-r8k.o
26   -obj-$(CONFIG_CPU_RM7000) += c-r4k.o cex-gen.o tlb-r4k.o
27   -obj-$(CONFIG_CPU_RM9000) += c-r4k.o cex-gen.o tlb-r4k.o
28 17 obj-$(CONFIG_CPU_SB1) += c-r4k.o cerr-sb1.o cex-sb1.o tlb-r4k.o
29 18 obj-$(CONFIG_CPU_TX39XX) += c-tx39.o tlb-r3k.o
30   -obj-$(CONFIG_CPU_TX49XX) += c-r4k.o cex-gen.o tlb-r4k.o
31   -obj-$(CONFIG_CPU_VR41XX) += c-r4k.o cex-gen.o tlb-r4k.o
32 19 obj-$(CONFIG_CPU_CAVIUM_OCTEON) += c-octeon.o cex-oct.o tlb-r4k.o
33   -obj-$(CONFIG_CPU_XLR) += c-r4k.o tlb-r4k.o cex-gen.o
34   -obj-$(CONFIG_CPU_XLP) += c-r4k.o tlb-r4k.o cex-gen.o
35 20  
36 21 obj-$(CONFIG_IP22_CPU_SCACHE) += sc-ip22.o
37 22 obj-$(CONFIG_R5000_CPU_SCACHE) += sc-r5k.o