diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-11-11 18:11:18 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-01-28 13:18:46 +0900 |
| commit | 343ac72248d360f1fae72176aca1117be19189ec (patch) | |
| tree | f9f100f3e16aea8986e5054a4da26d69ecd954ca | |
| parent | 49e6c3e7460a718242dc11b801811f0ac6892154 (diff) | |
sh: Move over the SH-5 entry.S.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | arch/sh/kernel/cpu/Makefile | 6 | ||||
| -rw-r--r-- | arch/sh/kernel/cpu/sh5/Makefile | 1 | ||||
| -rw-r--r-- | arch/sh/kernel/cpu/sh5/entry.S (renamed from arch/sh64/kernel/entry.S) | 4 | ||||
| -rw-r--r-- | include/asm-sh/processor.h | 17 |
4 files changed, 20 insertions, 8 deletions
diff --git a/arch/sh/kernel/cpu/Makefile b/arch/sh/kernel/cpu/Makefile index d055a3ea6b4..f471d242774 100644 --- 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 new file mode 100644 index 00000000000..9778f9bdff3 --- /dev/null +++ b/arch/sh/kernel/cpu/sh5/Makefile @@ -0,0 +1 @@ +obj-y := entry.o diff --git a/arch/sh64/kernel/entry.S b/arch/sh/kernel/cpu/sh5/entry.S index 7013fcb6665..2f505a7cb5f 100644 --- a/arch/sh64/kernel/entry.S +++ b/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 index 76c4dc7021c..f3bd82e9589 100644 --- 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 */ |