diff options
author | Paul Mundt <lethal@linux-sh.org> | 2007-11-08 04:54:16 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-01-27 23:18:39 -0500 |
commit | a09063da33a222adaceea85c9d168cbbb3e626b0 (patch) | |
tree | 93e836e3b3927439ff960f02e4ee670d8d40d37a /arch/sh/mm/Kconfig | |
parent | c20c20047b1aa4ba6fc2bb4e9ab91402026c3e71 (diff) |
sh: Switch Kconfig.sh64 to use arch/sh/mm/Kconfig.
Consolidates the HUGETLB definitions and others.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/mm/Kconfig')
-rw-r--r-- | arch/sh/mm/Kconfig | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig index 998c5c86346f..a7bbc2cbbf8c 100644 --- a/arch/sh/mm/Kconfig +++ b/arch/sh/mm/Kconfig | |||
@@ -66,7 +66,7 @@ config X2TLB | |||
66 | 66 | ||
67 | config VSYSCALL | 67 | config VSYSCALL |
68 | bool "Support vsyscall page" | 68 | bool "Support vsyscall page" |
69 | depends on MMU | 69 | depends on MMU && (CPU_SH3 || CPU_SH4) |
70 | default y | 70 | default y |
71 | help | 71 | help |
72 | This will enable support for the kernel mapping a vDSO page | 72 | This will enable support for the kernel mapping a vDSO page |
@@ -175,6 +175,10 @@ config HUGETLB_PAGE_SIZE_64MB | |||
175 | bool "64MB" | 175 | bool "64MB" |
176 | depends on X2TLB | 176 | depends on X2TLB |
177 | 177 | ||
178 | config HUGETLB_PAGE_SIZE_512MB | ||
179 | bool "512MB" | ||
180 | depends on CPU_SH5 | ||
181 | |||
178 | endchoice | 182 | endchoice |
179 | 183 | ||
180 | source "mm/Kconfig" | 184 | source "mm/Kconfig" |
@@ -202,12 +206,12 @@ config SH_DIRECT_MAPPED | |||
202 | 206 | ||
203 | choice | 207 | choice |
204 | prompt "Cache mode" | 208 | prompt "Cache mode" |
205 | default CACHE_WRITEBACK if CPU_SH2A || CPU_SH3 || CPU_SH4 | 209 | default CACHE_WRITEBACK if CPU_SH2A || CPU_SH3 || CPU_SH4 || CPU_SH5 |
206 | default CACHE_WRITETHROUGH if (CPU_SH2 && !CPU_SH2A) | 210 | default CACHE_WRITETHROUGH if (CPU_SH2 && !CPU_SH2A) |
207 | 211 | ||
208 | config CACHE_WRITEBACK | 212 | config CACHE_WRITEBACK |
209 | bool "Write-back" | 213 | bool "Write-back" |
210 | depends on CPU_SH2A || CPU_SH3 || CPU_SH4 | 214 | depends on CPU_SH2A || CPU_SH3 || CPU_SH4 || CPU_SH5 |
211 | 215 | ||
212 | config CACHE_WRITETHROUGH | 216 | config CACHE_WRITETHROUGH |
213 | bool "Write-through" | 217 | bool "Write-through" |