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>

14 files changed, 57 insertions, 55 deletions

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 78f5f2305132..b16407c9f2c4 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -55,8 +55,21 @@ config GENERIC_TIME
 config GENERIC_CLOCKEVENTS
         def_bool n
 
+config SYS_SUPPORTS_PM
+        bool
+
 config SYS_SUPPORTS_APM_EMULATION
         bool
+        select SYS_SUPPORTS_PM
+
+config SYS_SUPPORTS_SMP
+        bool
+
+config SYS_SUPPORTS_NUMA
+        bool
+
+config SYS_SUPPORTS_PCI
+        bool
 
 config ARCH_MAY_HAVE_PC_FDC
         bool
@@ -102,7 +115,7 @@ endchoice
 
 config SH_FPU
         bool "FPU support"
-        depends on !CPU_SH3
+        depends on CPU_SH4
         default y
         help
           Selecting this option will enable support for SH processors that
@@ -236,6 +249,7 @@ config SH_7751_SOLUTION_ENGINE
 config SH_7780_SOLUTION_ENGINE
         bool "SolutionEngine7780"
         select SOLUTION_ENGINE
+        select SYS_SUPPORTS_PCI
         depends on CPU_SUBTYPE_SH7780
         help
           Select 7780 SolutionEngine if configuring for a Renesas SH7780
@@ -275,20 +289,16 @@ config SH_7751_SYSTEMH
 config SH_HP6XX
         bool "HP6XX"
         select SYS_SUPPORTS_APM_EMULATION
+        select HD6446X_SERIES
         depends on CPU_SUBTYPE_SH7709
         help
           Select HP6XX if configuring for a HP jornada HP6xx.
           More information (hardware only) at
           <http://www.hp.com/jornada/>.
 
-config SH_SATURN
-        bool "Saturn"
-        depends on CPU_SUBTYPE_SH7604
-        help
-          Select Saturn if configuring for a SEGA Saturn.
-
 config SH_DREAMCAST
         bool "Dreamcast"
+        select SYS_SUPPORTS_PCI
         depends on CPU_SUBTYPE_SH7091
         help
           Select Dreamcast if configuring for a SEGA Dreamcast.
@@ -307,6 +317,7 @@ config SH_MPC1211
 config SH_SH03
         bool "Interface CTP/PCI-SH03"
         depends on CPU_SUBTYPE_SH7751 && BROKEN
+        select SYS_SUPPORTS_PCI
         help
           CTP/PCI-SH03 is a CPU module computer that is produced
           by Interface Corporation.
@@ -315,6 +326,7 @@ config SH_SH03
 config SH_SECUREEDGE5410
         bool "SecureEdge5410"
         depends on CPU_SUBTYPE_SH7751R
+        select SYS_SUPPORTS_PCI
         help
           Select SecureEdge5410 if configuring for a SnapGear SH board.
           This includes both the OEM SecureEdge products as well as the
@@ -337,6 +349,7 @@ config SH_7710VOIPGW
 config SH_RTS7751R2D
         bool "RTS7751R2D"
         depends on CPU_SUBTYPE_SH7751R
+        select SYS_SUPPORTS_PCI
         help
           Select RTS7751R2D if configuring for a Renesas Technology
           Sales SH-Graphics board.
@@ -344,6 +357,7 @@ config SH_RTS7751R2D
 config SH_HIGHLANDER
         bool "Highlander"
         depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785
+        select SYS_SUPPORTS_PCI
 
 config SH_EDOSK7705
         bool "EDOSK7705"
@@ -359,12 +373,14 @@ config SH_SH4202_MICRODEV
 config SH_LANDISK
         bool "LANDISK"
         depends on CPU_SUBTYPE_SH7751R
+        select SYS_SUPPORTS_PCI
         help
           I-O DATA DEVICE, INC. "LANDISK Series" support.
 
 config SH_TITAN
         bool "TITAN"
         depends on CPU_SUBTYPE_SH7751R
+        select SYS_SUPPORTS_PCI
         help
           Select Titan if you are configuring for a Nimble Microsystems
           NetEngine NP51R.
@@ -378,6 +394,7 @@ config SH_SHMIN
 config SH_LBOX_RE2
         bool "L-BOX RE2"
         depends on CPU_SUBTYPE_SH7751R
+        select SYS_SUPPORTS_PCI
         help
           Select L-BOX RE2 if configuring for the NTT COMWARE L-BOX RE2.
 
@@ -481,8 +498,10 @@ config SH_PCLK_FREQ
 
 config SH_CLK_MD
         int "CPU Mode Pin Setting"
-        default 0
         depends on CPU_SUBTYPE_SH7619 || CPU_SUBTYPE_SH7206
+        default 6 if CPU_SUBTYPE_SH7206
+        default 5 if CPU_SUBTYPE_SH7619
+        default 0
         help
           MD2 - MD0 pin setting.
 
@@ -554,6 +573,7 @@ config CRASH_DUMP
 
 config SMP
         bool "Symmetric multi-processing support"
+        depends on SYS_SUPPORTS_SMP
         ---help---
           This enables support for systems with more than one CPU. If you have
           a system with only one CPU, like most personal computers, say N. If
@@ -617,6 +637,7 @@ config BOOT_LINK_OFFSET
 
 config UBC_WAKEUP
         bool "Wakeup UBC on startup"
+        depends on CPU_SH4
         help
           Selecting this option will wakeup the User Break Controller (UBC) on
           startup. Although the UBC is left in an awake state when the processor
@@ -645,8 +666,8 @@ menu "Bus options"
 # we're not using PCMCIA, so we make it dependent on
 # PCMCIA outright. -- PFM.
 config ISA
-        bool
-        default y if PCMCIA
+        def_bool y
+        depends on PCMCIA && HD6446X_SERIES
         help
           Find out whether you have ISA slots on your motherboard.  ISA is the
           name of a bus system, i.e. the way the CPU talks to the other stuff
@@ -701,7 +722,7 @@ source "fs/Kconfig.binfmt"
 endmenu
 
 menu "Power management options (EXPERIMENTAL)"
-depends on EXPERIMENTAL
+depends on EXPERIMENTAL && SYS_SUPPORTS_PM
 
 source kernel/power/Kconfig
 
diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug
index d849d47d6af9..52f6a99c8ecc 100644
--- a/arch/sh/Kconfig.debug
+++ b/arch/sh/Kconfig.debug
@@ -86,6 +86,7 @@ config SH_KGDB
         bool "Include KGDB kernel debugger"
         select FRAME_POINTER
         select DEBUG_INFO
+        depends on CPU_SH3 || CPU_SH4
         help
           Include in-kernel hooks for kgdb, the Linux kernel source level
           debugger.  See <http://kgdb.sourceforge.net/> for more information.
diff --git a/arch/sh/cchips/Kconfig b/arch/sh/cchips/Kconfig
index 0582ca8346b6..2e516e9a6ede 100644
--- a/arch/sh/cchips/Kconfig
+++ b/arch/sh/cchips/Kconfig
@@ -13,10 +13,8 @@ config VOYAGERGX
           are additional GPIO bits that can be used to interface to
           external as well.
 
-# A board must have defined HD6446X_SERIES in order to see these
 config HD6446X_SERIES
-        bool "HD6446x support"
-        default n
+        bool
 
 choice
         prompt "HD6446x options"
@@ -25,7 +23,6 @@ choice
 
 config HD64461
         bool "Hitachi HD64461 companion chip support"
-        depends on CPU_SUBTYPE_SH7709
         ---help---
           The Hitachi HD64461 provides an interface for
           the SH7709 CPU, supporting a LCD controller,
@@ -40,7 +37,6 @@ config HD64461
 
 config HD64465
         bool "Hitachi HD64465 companion chip support"
-        depends on CPU_SUBTYPE_SH7750
         ---help---
           The Hitachi HD64465 provides an interface for
           the SH7750 CPU, supporting a LCD controller,
diff --git a/arch/sh/drivers/pci/Kconfig b/arch/sh/drivers/pci/Kconfig
index 6d1cbbe6745c..fbc6f2c8649f 100644
--- a/arch/sh/drivers/pci/Kconfig
+++ b/arch/sh/drivers/pci/Kconfig
@@ -1,5 +1,6 @@
 config PCI
         bool "PCI support"
+        depends on SYS_SUPPORTS_PCI
         help
           Find out whether you have a PCI motherboard. PCI is the name of a
           bus system, i.e. the way the CPU talks to the other stuff inside
diff --git a/arch/sh/kernel/cpu/init.c b/arch/sh/kernel/cpu/init.c
index 6451ad630174..9172e97dc26a 100644
--- a/arch/sh/kernel/cpu/init.c
+++ b/arch/sh/kernel/cpu/init.c
@@ -21,8 +21,7 @@
 #include <asm/cacheflush.h>
 #include <asm/cache.h>
 #include <asm/io.h>
-
-extern void detect_cpu_and_cache_system(void);
+#include <asm/ubc.h>
 
 /*
  * Generic wrapper for command line arguments to disable on-chip
@@ -152,15 +151,6 @@ static void __init cache_init(void)
         flags |= CCR_CACHE_CB;
 #endif
 
-#ifdef CONFIG_SH_OCRAM
-        /* Turn on OCRAM -- halve the OC */
-        flags |= CCR_CACHE_ORA;
-        current_cpu_data.dcache.sets >>= 1;
-
-        current_cpu_data.dcache.way_size = current_cpu_data.dcache.sets *
-                                    current_cpu_data.dcache.linesz;
-#endif
-
         ctrl_outl(flags, CCR);
         back_to_P1();
 }
@@ -269,7 +259,6 @@ asmlinkage void __init sh_cpu_init(void)
         }
 #endif
 
-#ifdef CONFIG_UBC_WAKEUP
         /*
          * Some brain-damaged loaders decided it would be a good idea to put
          * the UBC to sleep. This causes some issues when it comes to things
@@ -277,7 +266,5 @@ asmlinkage void __init sh_cpu_init(void)
          * we wake it up and hope that all is well.
          */
         ubc_wakeup();
-#endif
-
         speculative_execution_init();
 }
diff --git a/arch/sh/kernel/cpu/sh2/probe.c b/arch/sh/kernel/cpu/sh2/probe.c
index 74765ae42929..abbf17427e52 100644
--- a/arch/sh/kernel/cpu/sh2/probe.c
+++ b/arch/sh/kernel/cpu/sh2/probe.c
@@ -9,9 +9,8 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  */
-
-
 #include <linux/init.h>
+#include <linux/smp.h>
 #include <asm/processor.h>
 #include <asm/cache.h>
 
diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c
index 9ae3da00eaae..6334a4c54c7c 100644
--- a/arch/sh/kernel/process.c
+++ b/arch/sh/kernel/process.c
@@ -320,9 +320,7 @@ static void ubc_set_tracing(int asid, unsigned long pc)
         ctrl_outl(pc, UBC_BARA);
 
 #ifdef CONFIG_MMU
-        /* We don't have any ASID settings for the SH-2! */
-        if (current_cpu_data.type != CPU_SH7604)
-                ctrl_outb(asid, UBC_BASRA);
+        ctrl_outb(asid, UBC_BASRA);
 #endif
 
         ctrl_outl(0, UBC_BAMRA);
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
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index 40d4e798e7fb..82b68c789a5f 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -300,6 +300,7 @@ int remove_memory(u64 start, u64 size)
 }
 EXPORT_SYMBOL_GPL(remove_memory);
 
+#ifdef CONFIG_NUMA
 int memory_add_physaddr_to_nid(u64 addr)
 {
         /* Node 0 for now.. */
@@ -307,3 +308,4 @@ int memory_add_physaddr_to_nid(u64 addr)
 }
 EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
 #endif
+#endif
diff --git a/include/asm-sh/cache.h b/include/asm-sh/cache.h
index 9a3cb6ba9d15..7a18649d1ccb 100644
--- a/include/asm-sh/cache.h
+++ b/include/asm-sh/cache.h
@@ -9,6 +9,7 @@
 #define __ASM_SH_CACHE_H
 #ifdef __KERNEL__
 
+#include <linux/init.h>
 #include <asm/cpu/cache.h>
 
 #define SH_CACHE_VALID          1
@@ -48,6 +49,9 @@ struct cache_info {
 
         unsigned long flags;
 };
+
+int __init detect_cpu_and_cache_system(void);
+
 #endif /* __ASSEMBLY__ */
 #endif /* __KERNEL__ */
 #endif /* __ASM_SH_CACHE_H */
diff --git a/include/asm-sh/hd64461.h b/include/asm-sh/hd64461.h
index 27e5c34e2659..c9050b2b5510 100644
--- a/include/asm-sh/hd64461.h
+++ b/include/asm-sh/hd64461.h
@@ -184,7 +184,7 @@
 #define HD64461_NIRR            0x15000
 #define HD64461_NIMR            0x15002
 
-#define HD64461_IRQBASE         OFFCHIP_IRQ_BASE
+#define HD64461_IRQBASE         64
 #define HD64461_IRQ_NUM         16
 
 #define HD64461_IRQ_UART        (HD64461_IRQBASE+5)
diff --git a/include/asm-sh/processor.h b/include/asm-sh/processor.h
index 1fc5eed1b22a..1a20db096196 100644
--- a/include/asm-sh/processor.h
+++ b/include/asm-sh/processor.h
@@ -228,11 +228,7 @@ static __inline__ void grab_fpu(struct pt_regs *regs)
         regs->sr &= ~SR_FD;
 }
 
-#ifdef CONFIG_CPU_SH4
 extern void save_fpu(struct task_struct *__tsk, struct pt_regs *regs);
-#else
-#define save_fpu(tsk)   do { } while (0)
-#endif
 
 #define unlazy_fpu(tsk, regs) do {                      \
         if (test_tsk_thread_flag(tsk, TIF_USEDFPU)) {   \
diff --git a/include/asm-sh/system.h b/include/asm-sh/system.h
index fb22fc3f87ad..7c75045ae22b 100644
--- a/include/asm-sh/system.h
+++ b/include/asm-sh/system.h
@@ -126,7 +126,7 @@ static inline void sched_cacheflush(void)
 #define smp_read_barrier_depends()      do { } while(0)
 #endif
 
-#define set_mb(var, value) do { xchg(&var, value); } while (0)
+#define set_mb(var, value) do { (void)xchg(&var, value); } while (0)
 
 /*
  * Jump to P2 area.
diff --git a/include/asm-sh/ubc.h b/include/asm-sh/ubc.h
index ae9bbdeefbe1..38d46e01b846 100644
--- a/include/asm-sh/ubc.h
+++ b/include/asm-sh/ubc.h
@@ -51,9 +51,14 @@
 #define BRCR_UBDE               (1 << 0)
 
 #ifndef __ASSEMBLY__
-/* arch/sh/kernel/ubc.S */
-extern void ubc_wakeup(void);
+/* arch/sh/kernel/cpu/ubc.S */
 extern void ubc_sleep(void);
+
+#ifdef CONFIG_UBC_WAKEUP
+extern void ubc_wakeup(void);
+#else
+#define ubc_wakeup()    do { } while (0)
+#endif
 #endif
 
 #endif /* __KERNEL__ */