diff options
author | Wolfgang Denk <wd@denx.de> | 2007-11-17 02:28:26 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2007-11-17 02:28:26 +0100 |
commit | a75e1a3ddafd3ba0bdd870a1395fd2ae8585fb36 (patch) | |
tree | e73ec7f662fb01381ef2b87343ba77e504ff7eed /cpu/mcf532x/cpu.c | |
parent | 9e5285eca4e9b285844f1db8f764ef769e12b130 (diff) | |
parent | 8d737a28152ec12873f8544cca1fb39a49e5e693 (diff) | |
download | u-boot-imx-a75e1a3ddafd3ba0bdd870a1395fd2ae8585fb36.zip u-boot-imx-a75e1a3ddafd3ba0bdd870a1395fd2ae8585fb36.tar.gz u-boot-imx-a75e1a3ddafd3ba0bdd870a1395fd2ae8585fb36.tar.bz2 |
Merge branch 'master' of git://www.denx.de/git/u-boot-coldfire
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; |