sh: Consolidate CPU features in Kconfig.cpu.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/Kconfig.cpu b/arch/sh/Kconfig.cpu
new file mode 100644 (file)
index 0000000..9f329df
--- /dev/null
+++ b/arch/sh/Kconfig.cpu
@@ -0,0 +1,102 @@
+menu "Processor features"
+
+choice
+       prompt "Endianess selection" 
+       default CPU_LITTLE_ENDIAN
+       help
+         Some SuperH machines can be configured for either little or big
+         endian byte order. These modes require different kernels.
+
+config CPU_LITTLE_ENDIAN
+       bool "Little Endian"
+
+config CPU_BIG_ENDIAN
+       bool "Big Endian"
+
+endchoice
+
+config SH_FPU
+       bool "FPU support"
+       depends on CPU_HAS_FPU
+       default y
+       help
+         Selecting this option will enable support for SH processors that
+         have FPU units (ie, SH77xx).
+
+         This option must be set in order to enable the FPU.
+
+config SH_FPU_EMU
+       bool "FPU emulation support"
+       depends on !SH_FPU && EXPERIMENTAL
+       default n
+       help
+         Selecting this option will enable support for software FPU emulation.
+         Most SH-3 users will want to say Y here, whereas most SH-4 users will
+         want to say N.
+
+config SH_DSP
+       bool "DSP support"
+       depends on CPU_HAS_DSP
+       default y
+       help
+         Selecting this option will enable support for SH processors that
+         have DSP units (ie, SH2-DSP, SH3-DSP, and SH4AL-DSP).
+
+         This option must be set in order to enable the DSP.
+
+config SH_ADC
+       bool "ADC support"
+       depends on CPU_SH3
+       default y
+       help
+         Selecting this option will allow the Linux kernel to use SH3 on-chip
+         ADC module.
+
+         If unsure, say N.
+
+config SH_STORE_QUEUES
+       bool "Support for Store Queues"
+       depends on CPU_SH4
+       help
+         Selecting this option will enable an in-kernel API for manipulating
+         the store queues integrated in the SH-4 processors.
+
+config SPECULATIVE_EXECUTION
+       bool "Speculative subroutine return"
+       depends on CPU_SUBTYPE_SH7780 && EXPERIMENTAL
+       help
+         This enables support for a speculative instruction fetch for
+         subroutine return. There are various pitfalls associated with
+         this, as outlined in the SH7780 hardware manual.
+
+         If unsure, say N.
+
+config CPU_HAS_INTEVT
+       bool
+
+config CPU_HAS_MASKREG_IRQ
+       bool
+
+config CPU_HAS_IPR_IRQ
+       bool
+
+config CPU_HAS_SR_RB
+       bool
+       help
+         This will enable the use of SR.RB register bank usage. Processors
+         that are lacking this bit must have another method in place for
+         accomplishing what is taken care of by the banked registers.
+
+         See <file:Documentation/sh/register-banks.txt> for further
+         information on SR.RB and register banking in the kernel in general.
+
+config CPU_HAS_PTEA
+       bool
+
+config CPU_HAS_DSP
+       bool
+
+config CPU_HAS_FPU
+       bool
+
+endmenu

diff --git a/arch/sh/Kconfig.sh b/arch/sh/Kconfig.sh
index e6721b8e9dc1a2d6880468907a478953111ff81d..23eea5cf4ca0eab26d9fdede57f98aa303cfc047 100644 (file)
--- a/arch/sh/Kconfig.sh
+++ b/arch/sh/Kconfig.sh
@@ -291,109 +291,7 @@ config CPU_SUBTYPE_SH7722
 endchoice
 
 source "arch/sh/mm/Kconfig"
-
-menu "Processor features"
-
-choice
-       prompt "Endianess selection" 
-       default CPU_LITTLE_ENDIAN
-       help
-         Some SuperH machines can be configured for either little or big
-         endian byte order. These modes require different kernels.
-
-config CPU_LITTLE_ENDIAN
-       bool "Little Endian"
-
-config CPU_BIG_ENDIAN
-       bool "Big Endian"
-
-endchoice
-
-config SH_FPU
-       bool "FPU support"
-       depends on CPU_HAS_FPU
-       default y
-       help
-         Selecting this option will enable support for SH processors that
-         have FPU units (ie, SH77xx).
-
-         This option must be set in order to enable the FPU.
-
-config SH_FPU_EMU
-       bool "FPU emulation support"
-       depends on !SH_FPU && EXPERIMENTAL
-       default n
-       help
-         Selecting this option will enable support for software FPU emulation.
-         Most SH-3 users will want to say Y here, whereas most SH-4 users will
-         want to say N.
-
-config SH_DSP
-       bool "DSP support"
-       depends on CPU_HAS_DSP
-       default y
-       help
-         Selecting this option will enable support for SH processors that
-         have DSP units (ie, SH2-DSP, SH3-DSP, and SH4AL-DSP).
-
-         This option must be set in order to enable the DSP.
-
-config SH_ADC
-       bool "ADC support"
-       depends on CPU_SH3
-       default y
-       help
-         Selecting this option will allow the Linux kernel to use SH3 on-chip
-         ADC module.
-
-         If unsure, say N.
-
-config SH_STORE_QUEUES
-       bool "Support for Store Queues"
-       depends on CPU_SH4
-       help
-         Selecting this option will enable an in-kernel API for manipulating
-         the store queues integrated in the SH-4 processors.
-
-config SPECULATIVE_EXECUTION
-       bool "Speculative subroutine return"
-       depends on CPU_SUBTYPE_SH7780 && EXPERIMENTAL
-       help
-         This enables support for a speculative instruction fetch for
-         subroutine return. There are various pitfalls associated with
-         this, as outlined in the SH7780 hardware manual.
-
-         If unsure, say N.
-
-config CPU_HAS_INTEVT
-       bool
-
-config CPU_HAS_MASKREG_IRQ
-       bool
-
-config CPU_HAS_IPR_IRQ
-       bool
-
-config CPU_HAS_SR_RB
-       bool
-       help
-         This will enable the use of SR.RB register bank usage. Processors
-         that are lacking this bit must have another method in place for
-         accomplishing what is taken care of by the banked registers.
-
-         See <file:Documentation/sh/register-banks.txt> for further
-         information on SR.RB and register banking in the kernel in general.
-
-config CPU_HAS_PTEA
-       bool
-
-config CPU_HAS_DSP
-       bool
-
-config CPU_HAS_FPU
-       bool
-
-endmenu
+source "arch/sh/Kconfig.cpu"
 
 menu "Board support"
 

diff --git a/arch/sh/Kconfig.sh64 b/arch/sh/Kconfig.sh64
index 20db5e0c1401e2d9b777033ab54a03eaec6a7be3..10f5d30d31841f58dcfd8532ef1f159145d4c8ce 100644 (file)
--- a/arch/sh/Kconfig.sh64
+++ b/arch/sh/Kconfig.sh64
@@ -99,21 +99,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