sh: Tidy up dependencies for SH-2 build.

SH-2 can presently get in to some pretty bogus states, so
we tidy up the dependencies a bit and get it all building
again.

This gets us a bit closer to a functional allyesconfig
and allmodconfig, though there are still a few things to
fix up.

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

1 files changed, 4 insertions, 12 deletions

diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index b013a05fbc51..58bf6225d913 100644
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -48,6 +48,7 @@ choice
 config CPU_SUBTYPE_SH7619
         bool "Support SH7619 processor"
         select CPU_SH2
+        select CPU_HAS_IPR_IRQ
 
 # SH-2A Processor Support
 
@@ -208,6 +209,7 @@ config CPU_SUBTYPE_SH7722
         select CPU_SHX2
         select CPU_HAS_IPR_IRQ
         select ARCH_SPARSEMEM_ENABLE
+        select SYS_SUPPORTS_NUMA
 
 endchoice
 
@@ -292,7 +294,7 @@ config VSYSCALL
 
 config NUMA
         bool "Non Uniform Memory Access (NUMA) Support"
-        depends on MMU && SPARSEMEM && EXPERIMENTAL
+        depends on MMU && SYS_SUPPORTS_NUMA && EXPERIMENTAL
         default n
         help
           Some SH systems have many various memories scattered around
@@ -308,6 +310,7 @@ config NODES_SHIFT
 
 config ARCH_FLATMEM_ENABLE
         def_bool y
+        depends on !NUMA
 
 config ARCH_SPARSEMEM_ENABLE
         def_bool y
@@ -419,15 +422,4 @@ config SH_WRITETHROUGH
 
           If unsure, say N.
 
-config SH_OCRAM
-        bool "Operand Cache RAM (OCRAM) support"
-        help
-          Selecting this option will automatically tear down the number of
-          sets in the dcache by half, which in turn exposes a memory range.
-
-          The addresses for the OC RAM base will vary according to the
-          processor version. Consult vendor documentation for specifics.
-
-          If unsure, say N.
-
 endmenu