1 files changed, 75 insertions, 98 deletions

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 1a0db1d4c952..1cc5c9b27bfd 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -8,6 +8,7 @@ mainmenu "Linux/SuperH Kernel Configuration"
 config SUPERH
         bool
         default y
+        select EMBEDDED
         help
           The SuperH is a RISC processor targeted for use in embedded systems
           and consumer electronics; it was also used in the Sega Dreamcast
@@ -51,18 +52,23 @@ source "init/Kconfig"
 
 menu "System type"
 
+config SOLUTION_ENGINE
+        bool
+
 choice
         prompt "SuperH system type"
         default SH_UNKNOWN
 
 config SH_SOLUTION_ENGINE
         bool "SolutionEngine"
+        select SOLUTION_ENGINE
         help
           Select SolutionEngine if configuring for a Hitachi SH7709
           or SH7750 evaluation board.
 
 config SH_7751_SOLUTION_ENGINE
         bool "SolutionEngine7751"
+        select SOLUTION_ENGINE
         select CPU_SUBTYPE_SH7751
         help
           Select 7751 SolutionEngine if configuring for a Hitachi SH7751
@@ -70,17 +76,27 @@ config SH_7751_SOLUTION_ENGINE
 
 config SH_7300_SOLUTION_ENGINE
         bool "SolutionEngine7300"
+        select SOLUTION_ENGINE
         select CPU_SUBTYPE_SH7300
         help
-          Select 7300 SolutionEngine if configuring for a Hitachi SH7300(SH-Mobile V)
-          evaluation board.
+          Select 7300 SolutionEngine if configuring for a Hitachi
+          SH7300(SH-Mobile V) evaluation board.
+
+config SH_7343_SOLUTION_ENGINE
+        bool "SolutionEngine7343"
+        select SOLUTION_ENGINE
+        select CPU_SUBTYPE_SH7343
+        help
+          Select 7343 SolutionEngine if configuring for a Hitachi
+          SH7343 (SH-Mobile 3AS) evaluation board.
 
 config SH_73180_SOLUTION_ENGINE
        bool "SolutionEngine73180"
-       select CPU_SUBTYPE_SH73180
-       help
-         Select 73180 SolutionEngine if configuring for a Hitachi SH73180(SH-Mobile 3)
-         evaluation board.
+        select SOLUTION_ENGINE
+        select CPU_SUBTYPE_SH73180
+        help
+          Select 73180 SolutionEngine if configuring for a Hitachi
+          SH73180(SH-Mobile 3) evaluation board.
 
 config SH_7751_SYSTEMH
         bool "SystemH7751R"
@@ -89,12 +105,6 @@ config SH_7751_SYSTEMH
           Select SystemH if you are configuring for a Renesas SystemH
           7751R evaluation board.
 
-config SH_STB1_HARP
-        bool "STB1_Harp"
-
-config SH_STB1_OVERDRIVE
-        bool "STB1_Overdrive"
-
 config SH_HP6XX
         bool "HP6XX"
         help
@@ -102,19 +112,6 @@ config SH_HP6XX
           More information (hardware only) at
           <http://www.hp.com/jornada/>.
 
-config SH_CQREEK
-        bool "CqREEK"
-        help
-          Select CqREEK if configuring for a CqREEK SH7708 or SH7750.
-          More information at
-          <http://sources.redhat.com/ecos/hardware.html#SuperH>.
-
-config SH_DMIDA
-        bool "DMIDA"
-        help
-          Select DMIDA if configuring for a DataMyte 4000 Industrial
-          Digital Assistant. More information at <http://www.dmida.com/>.
-
 config SH_EC3104
         bool "EC3104"
         help
@@ -136,25 +133,9 @@ config SH_DREAMCAST
           <http://www.m17n.org/linux-sh/dreamcast/>.  There is a
           Dreamcast project is at <http://linuxdc.sourceforge.net/>.
 
-config SH_CAT68701
-        bool "CAT68701"
-
 config SH_BIGSUR
         bool "BigSur"
 
-config SH_SH2000
-        bool "SH2000"
-        select CPU_SUBTYPE_SH7709
-        help
-          SH-2000 is a single-board computer based around SH7709A chip
-          intended for embedded applications.
-          It has an Ethernet interface (CS8900A), direct connected
-          Compact Flash socket, three serial ports and PC-104 bus.
-          More information at <http://sh2000.sh-linux.org>.
-
-config SH_ADX
-        bool "ADX"
-
 config SH_MPC1211
         bool "Interface MPC1211"
         help
@@ -184,6 +165,13 @@ config SH_HS7751RVOIP
           Select HS7751RVOIP if configuring for a Renesas Technology
           Sales VoIP board.
 
+config SH_7710VOIPGW
+        bool "SH7710-VOIP-GW"
+        select CPU_SUBTYPE_SH7710
+        help
+          Select this option to build a kernel for the SH7710 based
+          VOIP GW.
+
 config SH_RTS7751R2D
         bool "RTS7751R2D"
         select CPU_SUBTYPE_SH7751R
@@ -222,6 +210,12 @@ config SH_TITAN
           Select Titan if you are configuring for a Nimble Microsystems
           NetEngine NP51R.
 
+config SH_SHMIN
+        bool "SHMIN"
+        select CPU_SUBTYPE_SH7706
+        help
+          Select SHMIN if configureing for the SHMIN board
+
 config SH_UNKNOWN
         bool "BareCPU"
         help
@@ -238,35 +232,9 @@ endchoice
 
 source "arch/sh/mm/Kconfig"
 
-config MEMORY_START
-        hex "Physical memory start address"
-        default "0x08000000"
-        ---help---
-          Computers built with Hitachi SuperH processors always
-          map the ROM starting at address zero.  But the processor
-          does not specify the range that RAM takes.
-
-          The physical memory (RAM) start address will be automatically
-          set to 08000000. Other platforms, such as the Solution Engine
-          boards typically map RAM at 0C000000.
-
-          Tweak this only when porting to a new machine which does not
-          already have a defconfig. Changing it from the known correct
-          value on any of the known systems will only lead to disaster.
-
-config MEMORY_SIZE
-        hex "Physical memory size"
-        default "0x00400000"
-        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
-          configurable.
-
 config CF_ENABLER
         bool "Compact Flash Enabler support"
-        depends on SH_ADX || SH_SOLUTION_ENGINE || SH_UNKNOWN || SH_CAT68701 || SH_SH03
+        depends on SH_SOLUTION_ENGINE || SH_UNKNOWN || SH_SH03
         ---help---
           Compact Flash is a small, removable mass storage device introduced
           in 1994 originally as a PCMCIA device.  If you say `Y' here, you
@@ -294,7 +262,7 @@ config CF_AREA5
           - "Area5" if CompactFlash is connected to Area 5 (0x14000000)
           - "Area6" if it is connected to Area 6 (0x18000000)
 
-          "Area6" will work for most boards. For ADX, select "Area5".
+          "Area6" will work for most boards.
 
 config CF_AREA6
         bool "Area6"
@@ -316,19 +284,6 @@ config CPU_LITTLE_ENDIAN
           endian byte order. These modes require different kernels. Say Y if
           your machine is little endian, N if it's a big endian machine.
 
-# The SH7750 RTC module is disabled in the Dreamcast
-config SH_RTC
-        bool
-        depends on !SH_DREAMCAST && !SH_SATURN && !SH_7300_SOLUTION_ENGINE && \
-                   !SH_73180_SOLUTION_ENGINE && !SH_LANDISK && \
-                   !SH_R7780RP
-        default y
-        help
-          Selecting this option will allow the Linux kernel to emulate
-          PC's RTC.
-
-          If unsure, say N.
-
 config SH_FPU
         bool "FPU support"
         depends on !CPU_SH3
@@ -339,14 +294,22 @@ config SH_FPU
 
           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_SH4
-        default y
+        default y if SH4AL_DSP || !CPU_SH4
+        default n
         help
           Selecting this option will enable support for SH processors that
-          have DSP units (ie, SH2-DSP and SH3-DSP). It is safe to say Y here
-          by default, as the existance of the DSP will be probed at runtime.
+          have DSP units (ie, SH2-DSP, SH3-DSP, and SH4AL-DSP).
 
           This option must be set in order to enable the DSP.
 
@@ -373,6 +336,9 @@ config CPU_HAS_INTEVT
 config CPU_HAS_PINT_IRQ
         bool
 
+config CPU_HAS_MASKREG_IRQ
+        bool
+
 config CPU_HAS_INTC2_IRQ
         bool
 
@@ -400,16 +366,19 @@ config SH_TMU
 
 endmenu
 
-#source "arch/sh/boards/renesas/hs7751rvoip/Kconfig"
+source "arch/sh/boards/renesas/hs7751rvoip/Kconfig"
+
+source "arch/sh/boards/renesas/rts7751r2d/Kconfig"
 
-#source "arch/sh/boards/renesas/rts7751r2d/Kconfig"
+source "arch/sh/boards/renesas/r7780rp/Kconfig"
 
 config SH_PCLK_FREQ
         int "Peripheral clock frequency (in Hz)"
         default "50000000" if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7780
         default "60000000" if CPU_SUBTYPE_SH7751
-        default "33333333" if CPU_SUBTYPE_SH7300 || CPU_SUBTYPE_SH7770 || CPU_SUBTYPE_SH7760
-        default "27000000" if CPU_SUBTYPE_SH73180
+        default "33333333" if CPU_SUBTYPE_SH7300 || CPU_SUBTYPE_SH7770 || \
+                              CPU_SUBTYPE_SH7760
+        default "27000000" if CPU_SUBTYPE_SH73180 || CPU_SUBTYPE_SH7343
         default "66000000" if CPU_SUBTYPE_SH4_202
         help
           This option is used to specify the peripheral clock frequency.
@@ -440,10 +409,8 @@ source "arch/sh/cchips/Kconfig"
 
 config HEARTBEAT
         bool "Heartbeat LED"
-        depends on SH_MPC1211 || SH_SH03 || SH_CAT68701 || \
-                   SH_STB1_HARP || SH_STB1_OVERDRIVE || SH_BIGSUR || \
-                   SH_7751_SOLUTION_ENGINE || SH_7300_SOLUTION_ENGINE || \
-                   SH_73180_SOLUTION_ENGINE || SH_SOLUTION_ENGINE || \
+        depends on SH_MPC1211 || SH_SH03 || \
+                   SH_BIGSUR || SOLUTION_ENGINE || \
                    SH_RTS7751R2D || SH_SH4202_MICRODEV || SH_LANDISK
         help
           Use the power-on LED on your machine as a load meter.  The exact
@@ -459,6 +426,8 @@ config ISA_DMA_API
 
 menu "Kernel features"
 
+source kernel/Kconfig.hz
+
 config KEXEC
         bool "kexec system call (EXPERIMENTAL)"
         depends on EXPERIMENTAL
@@ -476,10 +445,6 @@ config KEXEC
           support.  As of this writing the exact hardware interface is
           strongly in flux, so no good recommendation can be made.
 
-config PREEMPT
-        bool "Preemptible Kernel (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
-
 config SMP
         bool "Symmetric multi-processing support"
         ---help---
@@ -515,6 +480,8 @@ config NR_CPUS
           This is purely to save memory - each supported CPU adds
           approximately eight kilobytes to the kernel image.
 
+source "kernel/Kconfig.preempt"
+
 config CPU_HAS_SR_RB
         bool "CPU has SR.RB"
         depends on CPU_SH3 || CPU_SH4
@@ -636,6 +603,16 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
+menu "Power management options (EXPERIMENTAL)"
+depends on EXPERIMENTAL
+
+source kernel/power/Kconfig
+
+config APM
+        bool "Advanced Power Management Emulation"
+        depends on PM
+endmenu
+
 source "net/Kconfig"
 
 source "drivers/Kconfig"