summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2007-07-05 18:02:18 +0200
committerSascha Hauer <sha@octopus.labnet.pengutronix.de>2007-07-05 18:02:18 +0200
commit9afd20bdb089714c423b21367f6036c4d0e9ffe3 (patch)
tree5ce4b7ba2c90dcc1a994a46c52b2950811317477 /arch/arm
parentccfa1e06a53d44dd9fa7032872d3339bc6ef2d0b (diff)
downloadbarebox-9afd20bdb089714c423b21367f6036c4d0e9ffe3.tar.gz
barebox-9afd20bdb089714c423b21367f6036c4d0e9ffe3.tar.xz
svn_rev_693
remove do_reset
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/cpu/cpu.c19
-rw-r--r--arch/arm/cpu/interrupts.c1
2 files changed, 5 insertions, 15 deletions
diff --git a/arch/arm/cpu/cpu.c b/arch/arm/cpu/cpu.c
index f9c1b1bc3d..f3d01798f8 100644
--- a/arch/arm/cpu/cpu.c
+++ b/arch/arm/cpu/cpu.c
@@ -73,18 +73,15 @@ int icache_status (void)
return (read_p15_c1 () & C1_IC) != 0;
}
+/*
+ * this function is called just before we call linux
+ * it prepares the processor for linux
+ */
int cleanup_before_linux (void)
{
int i;
/*
- * this function is called just before we call linux
- * it prepares the processor for linux
- */
-
- disable_interrupts ();
-
- /*
* we never enable dcache so we do not need to disable
* it. Linux can be called with icache enabled, so just
* do nothing here
@@ -109,11 +106,3 @@ static int cpu_init (void)
core_initcall(cpu_init);
#endif
-
-void do_reset (void)
-{
- disable_interrupts();
- reset_cpu(0);
-
- /* NOT REACHED */
-}
diff --git a/arch/arm/cpu/interrupts.c b/arch/arm/cpu/interrupts.c
index 5eefdfc4d5..23f8b3f029 100644
--- a/arch/arm/cpu/interrupts.c
+++ b/arch/arm/cpu/interrupts.c
@@ -1,4 +1,5 @@
#include <common.h>
+#include <asm/ptrace.h>
#ifdef CONFIG_USE_IRQ
/* enable IRQ interrupts */