---

yaml
---
r: 77764
b: refs/heads/master
c: ea0e1a9
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 711fe4369c5d3834cfe1750f8804ef2b74865e9e
+refs/heads/master: ea0e1a9a3d73b917226eca751bf369609fa0dc2f

trunk/arch/sh/Kconfig.sh → trunk/arch/sh/Kconfig

@@ -6,8 +6,7 @@
 mainmenu "Linux/SuperH Kernel Configuration"
 
 config SUPERH
-	bool
-	default y
+	def_bool y
 	select EMBEDDED
 	help
 	  The SuperH is a RISC processor targeted for use in embedded systems
@@ -16,12 +15,18 @@ config SUPERH
 	  <http://www.linux-sh.org/>.
 
 config SUPERH32
-	def_bool y
+	def_bool !SUPERH64
+
+config SUPERH64
+	def_bool y if CPU_SH5
 
 config RWSEM_GENERIC_SPINLOCK
 	bool
 	default y
 
+config SUPERH64
+	def_bool y if CPU_SH5
+
 config RWSEM_XCHGADD_ALGORITHM
 	bool
 
@@ -131,6 +136,10 @@ config CPU_SH4AL_DSP
 	select CPU_SH4A
 	select CPU_HAS_DSP
 
+config CPU_SH5
+	bool
+	select CPU_HAS_FPU
+
 config CPU_SHX2
 	bool
 
@@ -288,6 +297,15 @@ config CPU_SUBTYPE_SH7722
 	select ARCH_SPARSEMEM_ENABLE
 	select SYS_SUPPORTS_NUMA
 
+# SH-5 Processor Support
+
+config CPU_SUBTYPE_SH5_101
+	bool "Support SH5-101 processor"
+	select CPU_SH5
+
+config CPU_SUBTYPE_SH5_103
+	bool "Support SH5-103 processor"
+
 endchoice
 
 source "arch/sh/mm/Kconfig"
@@ -490,6 +508,18 @@ config SH_MAGIC_PANEL_R2
 	help
 	  Select Magic Panel R2 if configuring for Magic Panel R2.
 
+config SH_SIMULATOR
+	bool "Simulator"
+	depends on SUPERH64
+
+config SH_CAYMAN
+	bool "Hitachi Cayman"
+	depends on CPU_SUBTYPE_SH5_101 || CPU_SUBTYPE_SH5_103
+
+config SH_HARP
+	bool "ST50 Harp"
+	depends on CPU_SH5
+
 endmenu
 
 source "arch/sh/boards/renesas/hs7751rvoip/Kconfig"

trunk/arch/sh/Kconfig.cpu

@@ -25,6 +25,10 @@ config SH_FPU
 
 	  This option must be set in order to enable the FPU.
 
+config SH64_FPU_DENORM_FLUSH
+	bool "Flush floating point denorms to zero"
+	depends on SH_FPU && SUPERH64
+
 config SH_FPU_EMU
 	bool "FPU emulation support"
 	depends on !SH_FPU && EXPERIMENTAL
@@ -71,6 +75,15 @@ config SPECULATIVE_EXECUTION
 
 	  If unsure, say N.
 
+config SH64_USER_MISALIGNED_FIXUP
+	bool "Fixup misaligned loads/stores occurring in user mode"
+	depends on SUPERH64
+	default y
+
+config SH64_ID2815_WORKAROUND
+	bool "Include workaround for SH5-101 cut2 silicon defect ID2815"
+	depends on CPU_SUBTYPE_SH5_101
+
 config CPU_HAS_INTEVT
 	bool