sh: Plug in support for ARCH=sh64 using sh SRCARCH.

This adds in support for building with ARCH=sh64 using the sh SRCARCH.
This tidies up the randconfig generation somewhat to make sure that we
don't end up with impossible configurations, and without having to rely
on things like KCONFIG_ALLCONFIG to detect the proper CPU support subset.

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

1 files changed, 15 insertions, 2 deletions

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 45f4a322ce4a..e7390dd0283d 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -22,7 +22,7 @@ config SUPERH
           <http://www.linux-sh.org/>.
 
 config SUPERH32
-        def_bool !SUPERH64
+        def_bool ARCH = "sh"
         select HAVE_KPROBES
         select HAVE_KRETPROBES
         select HAVE_FUNCTION_TRACER
@@ -32,7 +32,7 @@ config SUPERH32
         select ARCH_HIBERNATION_POSSIBLE if MMU
 
 config SUPERH64
-        def_bool y if CPU_SH5
+        def_bool ARCH = "sh64"
 
 config ARCH_DEFCONFIG
         string
@@ -188,6 +188,8 @@ config ARCH_SHMOBILE
         bool
         select ARCH_SUSPEND_POSSIBLE
 
+if SUPERH32
+
 choice
         prompt "Processor sub-type selection"
 
@@ -409,6 +411,15 @@ config CPU_SUBTYPE_SH7366
         select SYS_SUPPORTS_NUMA
         select SYS_SUPPORTS_CMT
 
+endchoice
+
+endif
+
+if SUPERH64
+
+choice
+        prompt "Processor sub-type selection"
+
 # SH-5 Processor Support
 
 config CPU_SUBTYPE_SH5_101
@@ -421,6 +432,8 @@ config CPU_SUBTYPE_SH5_103
 
 endchoice
 
+endif
+
 source "arch/sh/mm/Kconfig"
  
 source "arch/sh/Kconfig.cpu"