sh: Sync up the _64 linker script with the _32 version.

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

diff --git a/arch/sh/Kconfig.sh64 b/arch/sh/Kconfig.sh64
index 6884d5a518ad78315ec8fcf107da8661c82d933d..e37cd8c51e34b42283eaace93af8690ba0078081 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,21 +100,7 @@ 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
@@ -131,22 +118,6 @@ config SH64_PGTABLE_3_LEVEL
 
 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"
 
@@ -226,7 +197,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 +262,7 @@ source "fs/Kconfig"
 
 source "kernel/Kconfig.instrumentation"
 
-source "arch/sh64/Kconfig.debug"
+source "arch/sh/Kconfig.debug"
 
 source "security/Kconfig"