summaryrefslogtreecommitdiffstats
path: root/arch/ppc
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2007-07-05 21:43:36 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2007-07-05 21:43:36 +0200
commit432693b7332027e6a726944ce05f0e79fc7080df (patch)
tree27df440826871235fe6094037634746e0c66bb01 /arch/ppc
parentd7df71636776a1577d2880894aea28d6e1ed212b (diff)
downloadbarebox-432693b7332027e6a726944ce05f0e79fc7080df.tar.gz
barebox-432693b7332027e6a726944ce05f0e79fc7080df.tar.xz
use reset_cpu()
Diffstat (limited to 'arch/ppc')
-rw-r--r--arch/ppc/lib/ppclinux.c2
-rw-r--r--arch/ppc/mach-mpc5xxx/cpu.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/lib/ppclinux.c b/arch/ppc/lib/ppclinux.c
index 7a0e86f2e5..c75b842039 100644
--- a/arch/ppc/lib/ppclinux.c
+++ b/arch/ppc/lib/ppclinux.c
@@ -254,7 +254,7 @@ do_bootm_linux(image_header_t *os_header, image_header_t *initrd_header, const c
(*kernel) ((bd_t *)of_flat_tree, (ulong)kernel, 0, 0, 0);
#endif
- do_reset();
+ reset_cpu(0);
/* not reached */
return -1;
diff --git a/arch/ppc/mach-mpc5xxx/cpu.c b/arch/ppc/mach-mpc5xxx/cpu.c
index 1bb340dedb..ff8403dc00 100644
--- a/arch/ppc/mach-mpc5xxx/cpu.c
+++ b/arch/ppc/mach-mpc5xxx/cpu.c
@@ -72,7 +72,7 @@ int checkcpu (void)
/* ------------------------------------------------------------------------- */
-void do_reset (void)
+void reset_cpu (ulong unused)
{
ulong msr;
/* Interrupts and MMU off */