diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2007-11-16 21:01:19 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2007-11-16 21:01:19 -0700 |
| commit | efe33035acd5f7c13963a4d52e5aac1b68612ae4 (patch) | |
| tree | 37d6ccca1c82953ae4c41451cb3ec5fe53e2dc3c /cpu/mcf532x/cpu.c | |
| parent | 4d4faae65e115e327425cd514c1a35146a85166b (diff) | |
| parent | 5947f6999aafa7c54c1390983d264a8463dfea8e (diff) | |
| download | u-boot-imx-efe33035acd5f7c13963a4d52e5aac1b68612ae4.zip u-boot-imx-efe33035acd5f7c13963a4d52e5aac1b68612ae4.tar.gz u-boot-imx-efe33035acd5f7c13963a4d52e5aac1b68612ae4.tar.bz2 | |
Merge branch 'origin' into kconfig-for-1.3.1
Conflicts:
drivers/Makefile
Diffstat (limited to 'cpu/mcf532x/cpu.c')
| -rw-r--r-- | cpu/mcf532x/cpu.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/cpu/mcf532x/cpu.c b/cpu/mcf532x/cpu.c index 2f62e95..89cc8ad 100644 --- a/cpu/mcf532x/cpu.c +++ b/cpu/mcf532x/cpu.c @@ -35,14 +35,10 @@ DECLARE_GLOBAL_DATA_PTR; int do_reset(cmd_tbl_t * cmdtp, bd_t * bd, int flag, int argc, char *argv[]) { - volatile wdog_t *wdp = (wdog_t *) (MMAP_WDOG); + volatile rcm_t *rcm = (rcm_t *) (MMAP_RCM); - wdp->cr = 0; udelay(1000); - - /* enable watchdog, set timeout to 0 and wait */ - wdp->cr = WTM_WCR_EN; - while (1) ; + rcm->rcr |= RCM_RCR_SOFTRST; /* we don't return! */ return 0; |