arch: consolidate existing CONFIG_PAGE_SIZE_*KB definitions

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

diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index 455311d..f32a196 100644 (file)
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -4,6 +4,9 @@ menu "Memory management options"
 config MMU
         bool "Support for memory management hardware"
        depends on !CPU_SH2
+       select HAVE_PAGE_SIZE_4KB
+       select HAVE_PAGE_SIZE_8KB if X2TLB
+       select HAVE_PAGE_SIZE_64KB if CPU_SH4
        default y
        help
          Some SH processors (such as SH-2/SH-2A) lack an MMU. In order to
@@ -13,6 +16,15 @@ config MMU
          turning this off will boot the kernel on these machines with the
          MMU implicitly switched off.
 
+config NOMMU
+       def_bool !MMU
+       select HAVE_PAGE_SIZE_4KB
+       select HAVE_PAGE_SIZE_8KB
+       select HAVE_PAGE_SIZE_16KB
+       select HAVE_PAGE_SIZE_64KB
+       help
+         On MMU-less systems, any of these page sizes can be selected
+
 config PAGE_OFFSET
        hex
        default "0x80000000" if MMU
@@ -147,36 +159,6 @@ config HAVE_SRAM_POOL
        bool
        select GENERIC_ALLOCATOR
 
-choice
-       prompt "Kernel page size"
-       default PAGE_SIZE_4KB
-
-config PAGE_SIZE_4KB
-       bool "4kB"
-       help
-         This is the default page size used by all SuperH CPUs.
-
-config PAGE_SIZE_8KB
-       bool "8kB"
-       depends on !MMU || X2TLB
-       help
-         This enables 8kB pages as supported by SH-X2 and later MMUs.
-
-config PAGE_SIZE_16KB
-       bool "16kB"
-       depends on !MMU
-       help
-         This enables 16kB pages on MMU-less SH systems.
-
-config PAGE_SIZE_64KB
-       bool "64kB"
-       depends on !MMU || CPU_SH4
-       help
-         This enables support for 64kB pages, possible on all SH-4
-         CPUs and later.
-
-endchoice
-
 choice
        prompt "HugeTLB page size"
        depends on HUGETLB_PAGE