diff options
author | Paul Mundt <lethal@linux-sh.org> | 2007-11-11 04:11:18 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-01-27 23:18:46 -0500 |
commit | 343ac72248d360f1fae72176aca1117be19189ec (patch) | |
tree | f9f100f3e16aea8986e5054a4da26d69ecd954ca /arch | |
parent | 49e6c3e7460a718242dc11b801811f0ac6892154 (diff) |
sh: Move over the SH-5 entry.S.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-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 |
3 files changed, 8 insertions, 3 deletions
diff --git a/arch/sh/kernel/cpu/Makefile b/arch/sh/kernel/cpu/Makefile index d055a3ea6b4b..f471d242774e 100644 --- a/arch/sh/kernel/cpu/Makefile +++ b/arch/sh/kernel/cpu/Makefile | |||
@@ -6,8 +6,14 @@ obj-$(CONFIG_CPU_SH2) = sh2/ | |||
6 | obj-$(CONFIG_CPU_SH2A) = sh2a/ | 6 | obj-$(CONFIG_CPU_SH2A) = sh2a/ |
7 | obj-$(CONFIG_CPU_SH3) = sh3/ | 7 | obj-$(CONFIG_CPU_SH3) = sh3/ |
8 | obj-$(CONFIG_CPU_SH4) = sh4/ | 8 | obj-$(CONFIG_CPU_SH4) = sh4/ |
9 | obj-$(CONFIG_CPU_SH5) = sh5/ | ||
10 | |||
11 | # Special cases for family ancestry. | ||
12 | |||
9 | obj-$(CONFIG_CPU_SH4A) += sh4a/ | 13 | obj-$(CONFIG_CPU_SH4A) += sh4a/ |
10 | 14 | ||
15 | # Common interfaces. | ||
16 | |||
11 | obj-$(CONFIG_UBC_WAKEUP) += ubc.o | 17 | obj-$(CONFIG_UBC_WAKEUP) += ubc.o |
12 | obj-$(CONFIG_SH_ADC) += adc.o | 18 | obj-$(CONFIG_SH_ADC) += adc.o |
13 | 19 | ||
diff --git a/arch/sh/kernel/cpu/sh5/Makefile b/arch/sh/kernel/cpu/sh5/Makefile new file mode 100644 index 000000000000..9778f9bdff3a --- /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 7013fcb6665c..2f505a7cb5f9 100644 --- a/arch/sh64/kernel/entry.S +++ b/arch/sh/kernel/cpu/sh5/entry.S | |||
@@ -10,12 +10,10 @@ | |||
10 | * Copyright (C) 2003, 2004 Richard Curnow | 10 | * Copyright (C) 2003, 2004 Richard Curnow |
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | |||
14 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
15 | #include <linux/sys.h> | 14 | #include <linux/sys.h> |
16 | 15 | #include <asm/cpu/registers.h> | |
17 | #include <asm/processor.h> | 16 | #include <asm/processor.h> |
18 | #include <asm/registers.h> | ||
19 | #include <asm/unistd.h> | 17 | #include <asm/unistd.h> |
20 | #include <asm/thread_info.h> | 18 | #include <asm/thread_info.h> |
21 | #include <asm/asm-offsets.h> | 19 | #include <asm/asm-offsets.h> |