summaryrefslogtreecommitdiff
path: root/cpu/mpc8260/cpu.c
diff options
context:
space:
mode:
authorwdenk <wdenk>2005-05-30 23:55:42 +0000
committerwdenk <wdenk>2005-05-30 23:55:42 +0000
commitba91e26a1923dfc703d4b96ae9428067b7447ff2 (patch)
treee7a9fe997185c6ff44f39dc1d7a1539dbde5d507 /cpu/mpc8260/cpu.c
parent2eab48f511b5445383009131c64141800720eb5e (diff)
downloadu-boot-imx-ba91e26a1923dfc703d4b96ae9428067b7447ff2.zip
u-boot-imx-ba91e26a1923dfc703d4b96ae9428067b7447ff2.tar.gz
u-boot-imx-ba91e26a1923dfc703d4b96ae9428067b7447ff2.tar.bz2
Patch by Juergen Selent, 17 May 2005:
Add support for Funkwerk VoVPN gateway module.
Diffstat (limited to 'cpu/mpc8260/cpu.c')
-rw-r--r--cpu/mpc8260/cpu.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/cpu/mpc8260/cpu.c b/cpu/mpc8260/cpu.c
index 8d634b0..a34386f 100644
--- a/cpu/mpc8260/cpu.c
+++ b/cpu/mpc8260/cpu.c
@@ -220,6 +220,7 @@ void upmconfig (uint upm, uint * table, uint size)
/* ------------------------------------------------------------------------- */
+#if !defined(CONFIG_HAVE_OWN_RESET)
int
do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
{
@@ -253,6 +254,7 @@ do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
return 1;
}
+#endif /* CONFIG_HAVE_OWN_RESET */
/* ------------------------------------------------------------------------- */