aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/mm
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-07-31 05:52:12 -0400
committerPaul Mundt <lethal@linux-sh.org>2007-09-20 22:57:47 -0400
commitac38e4d33d8da3c3c402d2b4858d107273287f43 (patch)
treec34438a807337bef69ed78fd10dac33ac5765e65 /arch/sh/mm
parentc9d03d9a80c4bcc571efd93fe80ed40973030422 (diff)
sh: Fix cache disabling build failures on nommu.
The cache disabling stuff screwed up some of the sh4 nommu builds, fix it up again. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/mm')
-rw-r--r--arch/sh/mm/Makefile24
1 files changed, 14 insertions, 10 deletions
diff --git a/arch/sh/mm/Makefile b/arch/sh/mm/Makefile
index e73d7f970ce0..6fbca50b64b4 100644
--- a/arch/sh/mm/Makefile
+++ b/arch/sh/mm/Makefile
@@ -4,10 +4,12 @@
4 4
5obj-y := init.o extable.o consistent.o 5obj-y := init.o extable.o consistent.o
6 6
7cache-$(CONFIG_CPU_SH2) := cache-sh2.o 7ifndef CONFIG_CACHE_OFF
8cache-$(CONFIG_CPU_SH3) := cache-sh3.o 8obj-$(CONFIG_CPU_SH2) += cache-sh2.o
9cache-$(CONFIG_CPU_SH4) := cache-sh4.o pg-sh4.o 9obj-$(CONFIG_CPU_SH3) += cache-sh3.o
10cache-$(CONFIG_CACHE_OFF) := 10obj-$(CONFIG_CPU_SH4) += cache-sh4.o
11obj-$(CONFIG_SH7705_CACHE_32KB) += cache-sh7705.o
12endif
11 13
12mmu-y := tlb-nommu.o pg-nommu.o 14mmu-y := tlb-nommu.o pg-nommu.o
13mmu-$(CONFIG_CPU_SH3) += fault-nommu.o 15mmu-$(CONFIG_CPU_SH3) += fault-nommu.o
@@ -15,19 +17,21 @@ mmu-$(CONFIG_CPU_SH4) += fault-nommu.o
15mmu-$(CONFIG_MMU) := fault.o clear_page.o copy_page.o tlb-flush.o \ 17mmu-$(CONFIG_MMU) := fault.o clear_page.o copy_page.o tlb-flush.o \
16 ioremap.o 18 ioremap.o
17 19
18obj-y += $(cache-y) $(mmu-y) 20obj-y += $(mmu-y)
19 21
20ifdef CONFIG_DEBUG_FS 22ifdef CONFIG_DEBUG_FS
21obj-$(CONFIG_CPU_SH4) += cache-debugfs.o 23obj-$(CONFIG_CPU_SH4) += cache-debugfs.o
22endif 24endif
23 25
24ifdef CONFIG_MMU 26ifdef CONFIG_MMU
25obj-$(CONFIG_CPU_SH3) += tlb-sh3.o 27obj-$(CONFIG_CPU_SH3) += tlb-sh3.o
26obj-$(CONFIG_CPU_SH4) += tlb-sh4.o 28obj-$(CONFIG_CPU_SH4) += tlb-sh4.o
27obj-$(CONFIG_SH7705_CACHE_32KB) += pg-sh7705.o 29ifndef CONFIG_CACHE_OFF
30obj-$(CONFIG_CPU_SH4) += pg-sh4.o
31obj-$(CONFIG_SH7705_CACHE_32KB) += pg-sh7705.o
32endif
28endif 33endif
29 34
30obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o 35obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
31obj-$(CONFIG_SH7705_CACHE_32KB) += cache-sh7705.o
32obj-$(CONFIG_32BIT) += pmb.o 36obj-$(CONFIG_32BIT) += pmb.o
33obj-$(CONFIG_NUMA) += numa.o 37obj-$(CONFIG_NUMA) += numa.o