at91: extract reset from timer

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/cpu/arm926ejs/at91/Makefile b/cpu/arm926ejs/at91/Makefile
index 71acb0b65f0ba6114eae585c62ee6f3c11e94e15..66eec76ea19c402d0cb8a620cd9bba374812cf46 100644 (file)
--- a/cpu/arm926ejs/at91/Makefile
+++ b/cpu/arm926ejs/at91/Makefile
@@ -34,6 +34,7 @@ COBJS-$(CONFIG_AT91SAM9RL)    += at91sam9rl_devices.o
 COBJS-$(CONFIG_AT91_LED)       += led.o
 COBJS-y += clock.o
 COBJS-y += cpu.o
+COBJS-y        += reset.o
 COBJS-y        += timer.o
 
 SRCS    := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)

diff --git a/cpu/arm926ejs/at91/reset.c b/cpu/arm926ejs/at91/reset.c
new file mode 100644 (file)
index 0000000..f963e14
--- /dev/null
+++ b/cpu/arm926ejs/at91/reset.c
@@ -0,0 +1,42 @@
+/*
+ * (C) Copyright 2007-2008
+ * Stelian Pop <stelian.pop@leadtechdesign.com>
+ * Lead Tech Design <www.leadtechdesign.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/at91_rstc.h>
+#include <asm/arch/io.h>
+
+/*
+ * Reset the cpu by setting up the watchdog timer and let him time out.
+ */
+void reset_cpu(ulong ignored)
+{
+       /* this is the way Linux does it */
+       at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY |
+                                    AT91_RSTC_PROCRST |
+                                    AT91_RSTC_PERRST);
+
+       while (1);
+       /* Never reached */
+}

diff --git a/cpu/arm926ejs/at91/timer.c b/cpu/arm926ejs/at91/timer.c
index c84cb5e96f73ebb03054551388c3752efdad7bb2..811bb3c5906d8fc73fabd0fe72dd3941e5596ab8 100644 (file)
--- a/cpu/arm926ejs/at91/timer.c
+++ b/cpu/arm926ejs/at91/timer.c
@@ -26,7 +26,6 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_pit.h>
 #include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_rstc.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/io.h>
 #include <div64.h>
@@ -139,17 +138,3 @@ ulong get_tbclk(void)
        tbclk = CONFIG_SYS_HZ;
        return tbclk;
 }
-
-/*
- * Reset the cpu by setting up the watchdog timer and let him time out.
- */
-void reset_cpu(ulong ignored)
-{
-       /* this is the way Linux does it */
-       at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY |
-                                    AT91_RSTC_PROCRST |
-                                    AT91_RSTC_PERRST);
-
-       while (1);
-       /* Never reached */
-}