diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2007-07-05 18:02:18 +0200 |
|---|---|---|
| committer | Sascha Hauer <sha@octopus.labnet.pengutronix.de> | 2007-07-05 18:02:18 +0200 |
| commit | 9afd20bdb089714c423b21367f6036c4d0e9ffe3 (patch) | |
| tree | 5ce4b7ba2c90dcc1a994a46c52b2950811317477 | |
| parent | ccfa1e06a53d44dd9fa7032872d3339bc6ef2d0b (diff) | |
| download | barebox-9afd20bdb089714c423b21367f6036c4d0e9ffe3.tar.gz barebox-9afd20bdb089714c423b21367f6036c4d0e9ffe3.tar.xz | |
svn_rev_693
remove do_reset
| -rw-r--r-- | arch/arm/cpu/cpu.c | 19 | ||||
| -rw-r--r-- | arch/arm/cpu/interrupts.c | 1 | ||||
| -rw-r--r-- | commands/reset.c | 2 | ||||
| -rw-r--r-- | include/common.h | 1 | ||||
| -rw-r--r-- | lib/vsprintf.c | 2 |
5 files changed, 7 insertions, 18 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 */ diff --git a/commands/reset.c b/commands/reset.c index 1cc3702ff9..25e34d681c 100644 --- a/commands/reset.c +++ b/commands/reset.c @@ -3,7 +3,7 @@ static int cmd_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { - do_reset(); + reset_cpu(0); /* Not reached */ return 1; diff --git a/include/common.h b/include/common.h index c2c0ebdf4a..1bad8ecffd 100644 --- a/include/common.h +++ b/include/common.h @@ -66,7 +66,6 @@ typedef void (interrupt_handler_t)(void *); /* * Function Prototypes */ -void do_reset(void); void reginfo(void); void hang (void) __attribute__ ((noreturn)); diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 5e320f5248..77fb2a450a 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -375,6 +375,6 @@ void panic(const char *fmt, ...) hang(); #else udelay(100000); /* allow messages to go out */ - do_reset(); + reset_cpu(0); #endif } |