aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-11-11 18:11:18 +0900
committerPaul Mundt <lethal@linux-sh.org>2008-01-28 13:18:46 +0900
commit343ac72248d360f1fae72176aca1117be19189ec (patch)
treef9f100f3e16aea8986e5054a4da26d69ecd954ca /arch
parentsh: Split out linker script to _32 and _64 variants. (diff)
downloadlinux-dev-343ac72248d360f1fae72176aca1117be19189ec.tar.xz
linux-dev-343ac72248d360f1fae72176aca1117be19189ec.zip
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/Makefile6
-rw-r--r--arch/sh/kernel/cpu/sh5/Makefile1
-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/
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 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 @@
* 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>