Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / arch / sh / mm / Kconfig

diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index 998c5c86346fa436eb06bfce47be22da0359b633..f549b8cd25010c74fd3dbdfe054ec81e410ab1cc 100644 (file)
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -17,7 +17,8 @@ config MMU
 
 config PAGE_OFFSET
        hex
-       default "0x80000000" if MMU
+       default "0x80000000" if MMU && SUPERH32
+       default "0x20000000" if MMU && SUPERH64
        default "0x00000000"
 
 config MEMORY_START
@@ -38,17 +39,28 @@ config MEMORY_START
 
 config MEMORY_SIZE
        hex "Physical memory size"
-       default "0x00400000"
+       default "0x04000000"
        help
          This sets the default memory size assumed by your SH kernel. It can
          be overridden as normal by the 'mem=' argument on the kernel command
          line. If unsure, consult your board specifications or just leave it
-         as 0x00400000 which was the default value before this became
+         as 0x04000000 which was the default value before this became
          configurable.
 
+# Physical addressing modes
+
+config 29BIT
+       def_bool !32BIT
+       depends on SUPERH32
+
 config 32BIT
+       bool
+       default y if CPU_SH5
+
+config PMB
        bool "Support 32-bit physical addressing through PMB"
        depends on MMU && (CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785)
+       select 32BIT
        default y
        help
          If you say Y here, physical addressing will be extended to
@@ -66,7 +78,7 @@ config X2TLB
 
 config VSYSCALL
        bool "Support vsyscall page"
-       depends on MMU
+       depends on MMU && (CPU_SH3 || CPU_SH4)
        default y
        help
          This will enable support for the kernel mapping a vDSO page
@@ -145,7 +157,7 @@ config PAGE_SIZE_8KB
 
 config PAGE_SIZE_64KB
        bool "64kB"
-       depends on CPU_SH4
+       depends on CPU_SH4 || CPU_SH5
        help
          This enables support for 64kB pages, possible on all SH-4
          CPUs and later.
@@ -154,7 +166,7 @@ endchoice
 
 choice
        prompt "HugeTLB page size"
-       depends on HUGETLB_PAGE && CPU_SH4 && MMU
+       depends on HUGETLB_PAGE && (CPU_SH4 || CPU_SH5) && MMU
        default HUGETLB_PAGE_SIZE_64K
 
 config HUGETLB_PAGE_SIZE_64K
@@ -175,6 +187,10 @@ config HUGETLB_PAGE_SIZE_64MB
        bool "64MB"
        depends on X2TLB
 
+config HUGETLB_PAGE_SIZE_512MB
+       bool "512MB"
+       depends on CPU_SH5
+
 endchoice
 
 source "mm/Kconfig"
@@ -202,12 +218,12 @@ config SH_DIRECT_MAPPED
 
 choice
        prompt "Cache mode"
-       default CACHE_WRITEBACK if CPU_SH2A || CPU_SH3 || CPU_SH4
+       default CACHE_WRITEBACK if CPU_SH2A || CPU_SH3 || CPU_SH4 || CPU_SH5
        default CACHE_WRITETHROUGH if (CPU_SH2 && !CPU_SH2A)
 
 config CACHE_WRITEBACK
        bool "Write-back"
-       depends on CPU_SH2A || CPU_SH3 || CPU_SH4
+       depends on CPU_SH2A || CPU_SH3 || CPU_SH4 || CPU_SH5
 
 config CACHE_WRITETHROUGH
        bool "Write-through"