sh: Bump the MEMORY_SIZE default to something reasonable.

[linux-2.6] / arch / sh / Kconfig.sh64

diff --git a/arch/sh/Kconfig.sh64 b/arch/sh/Kconfig.sh64
index 6884d5a518ad78315ec8fcf107da8661c82d933d..9f71f9531c08de3be841d838a339eeb6c186a1f0 100644 (file)
--- a/arch/sh/Kconfig.sh64
+++ b/arch/sh/Kconfig.sh64
@@ -83,6 +83,7 @@ choice
 
 config CPU_SH5
        bool "SH-5"
+       select CPU_HAS_FPU
 
 endchoice
 
@@ -99,63 +100,17 @@ config CPU_SUBTYPE_SH5_103
 
 endchoice
 
-choice
-       prompt "Endianness"
-       default LITTLE_ENDIAN
-
-config LITTLE_ENDIAN
-       bool "Little-Endian"
-
-config BIG_ENDIAN
-       bool "Big-Endian"
-
-endchoice
-
-config SH_FPU
-       bool "FPU support"
-       default y
+source "arch/sh/Kconfig.cpu"
 
 config SH64_FPU_DENORM_FLUSH
        depends on SH_FPU
        bool "Flush floating point denorms to zero"
 
-choice
-       prompt "Page table levels"
-       default SH64_PGTABLE_2_LEVEL
-
-config SH64_PGTABLE_2_LEVEL
-       bool "2"
-
-config SH64_PGTABLE_3_LEVEL
-       bool "3"
-
-endchoice
-
-choice
-       prompt "HugeTLB page size"
-       depends on HUGETLB_PAGE && MMU
-       default HUGETLB_PAGE_SIZE_64K
-
-config HUGETLB_PAGE_SIZE_64K
-       bool "64K"
-
-config HUGETLB_PAGE_SIZE_1MB
-       bool "1MB"
-
-config HUGETLB_PAGE_SIZE_512MB
-       bool "512MB"
-
-endchoice
-
 config SH64_USER_MISALIGNED_FIXUP
        bool "Fixup misaligned loads/stores occurring in user mode"
 
 comment "Memory options"
 
-config CACHED_MEMORY_OFFSET
-       hex "Cached Area Offset"
-       default "20000000"
-
 config MEMORY_START
        hex "Physical memory start address"
        default "80000000"
@@ -188,22 +143,6 @@ endchoice
 config ICACHE_DISABLED
        bool "ICache Disabling"
 
-config PCIDEVICE_MEMORY_START
-       hex
-       default "C0000000"
-
-config DEVICE_MEMORY_START
-       hex
-       default "E0000000"
-
-config FLASH_MEMORY_START
-       hex "Flash memory/on-chip devices start address"
-       default "00000000"
-
-config PCI_BLOCK_START
-       hex "PCI block start address"
-       default "40000000"
-
 comment "CPU Subtype specific options"
 
 config SH64_ID2815_WORKAROUND
@@ -226,7 +165,12 @@ config PREEMPT
        bool "Preemptible Kernel (EXPERIMENTAL)"
        depends on EXPERIMENTAL
 
-source "mm/Kconfig"
+config SH_PCLK_FREQ
+       int "Peripheral clock frequency (in Hz)"
+       default "50000000"
+
+source "kernel/Kconfig.hz"
+source "arch/sh/mm/Kconfig"
 
 endmenu
 
@@ -286,7 +230,7 @@ source "fs/Kconfig"
 
 source "kernel/Kconfig.instrumentation"
 
-source "arch/sh64/Kconfig.debug"
+source "arch/sh/Kconfig.debug"
 
 source "security/Kconfig"