sh: Move over the SH-5 entry.S.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
git-mirror · Jan 28, 2008 · 343ac72 · 343ac72
1 parent 49e6c3e
commit 343ac72
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/arch/sh/kernel/cpu/Makefile b/arch/sh/kernel/cpu/Makefile
@@ -6,8 +6,14 @@ obj-$(CONFIG_CPU_SH2)		= sh2/
 obj-$(CONFIG_CPU_SH2A)		= sh2a/
 obj-$(CONFIG_CPU_SH3)		= sh3/
 obj-$(CONFIG_CPU_SH4)		= sh4/
+obj-$(CONFIG_CPU_SH5)		= sh5/
+
+# Special cases for family ancestry.
+
 obj-$(CONFIG_CPU_SH4A)		+= sh4a/
 
+# Common interfaces.
+
 obj-$(CONFIG_UBC_WAKEUP)	+= ubc.o
 obj-$(CONFIG_SH_ADC)		+= adc.o
 

diff --git a/arch/sh/kernel/cpu/sh5/Makefile b/arch/sh/kernel/cpu/sh5/Makefile
@@ -0,0 +1 @@
+obj-y := entry.o
diff --git a/arch/sh64/kernel/entry.S → arch/sh/kernel/cpu/sh5/entry.S b/arch/sh64/kernel/entry.S → arch/sh/kernel/cpu/sh5/entry.S
@@ -10,12 +10,10 @@
  * Copyright (C) 2003, 2004 Richard Curnow
  *
  */
-
 #include <linux/errno.h>
 #include <linux/sys.h>
-
+#include <asm/cpu/registers.h>
 #include <asm/processor.h>
-#include <asm/registers.h>
 #include <asm/unistd.h>
 #include <asm/thread_info.h>
 #include <asm/asm-offsets.h>

diff --git a/include/asm-sh/processor.h b/include/asm-sh/processor.h
@@ -3,6 +3,8 @@
 
 #include <asm/cpu-features.h>
 
+#ifndef __ASSEMBLY__
+
 /*
  *  CPU type and hardware bug flags. Kept separately for each CPU.
  *
@@ -40,11 +42,8 @@ enum cpu_type {
 	CPU_SH_NONE
 };
 
-#ifdef CONFIG_SUPERH32
-# include "processor_32.h"
-#else
-# include "processor_64.h"
-#endif
+/* Forward decl */
+struct sh_cpuinfo;
 
 /* arch/sh/kernel/setup.c */
 const char *get_cpu_subtype(struct sh_cpuinfo *c);
@@ -55,4 +54,12 @@ int vsyscall_init(void);
 #define vsyscall_init() do { } while (0)
 #endif
 
+#endif /* __ASSEMBLY__ */
+
+#ifdef CONFIG_SUPERH32
+# include "processor_32.h"
+#else
+# include "processor_64.h"
+#endif
+
 #endif /* __ASM_SH_PROCESSOR_H */