diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-01-23 14:23:13 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-01-23 14:23:13 +0100 |
| commit | e57ed96baca1222e6cd3d7032691a89d5890bb4a (patch) | |
| tree | ce82b7473894c8336d786a5779c893e58085f989 /cpu/mcf532x/cpu.c | |
| parent | 2468592d79891fea4f39d0a414c7316f3af03f4c (diff) | |
| parent | 57a127201eb3d8cc19170a008e0bd7af608bd72f (diff) | |
| download | u-boot-imx-e57ed96baca1222e6cd3d7032691a89d5890bb4a.zip u-boot-imx-e57ed96baca1222e6cd3d7032691a89d5890bb4a.tar.gz u-boot-imx-e57ed96baca1222e6cd3d7032691a89d5890bb4a.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 | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/cpu/mcf532x/cpu.c b/cpu/mcf532x/cpu.c index 89cc8ad..61541ab 100644 --- a/cpu/mcf532x/cpu.c +++ b/cpu/mcf532x/cpu.c @@ -64,6 +64,18 @@ int checkcpu(void) case 0x61: id = 5327; break; + case 0x65: + id = 5373; + break; + case 0x68: + id = 53721; + break; + case 0x69: + id = 5372; + break; + case 0x6B: + id = 5372; + break; } if (id) { @@ -84,6 +96,7 @@ void watchdog_reset(void) volatile wdog_t *wdp = (wdog_t *) (MMAP_WDOG); wdp->sr = 0x5555; /* Count register */ + wdp->sr = 0xAAAA; /* Count register */ } int watchdog_disable(void) @@ -104,8 +117,11 @@ int watchdog_init(void) /* set timeout and enable watchdog */ wdog_module = ((CFG_CLK / 1000) * CONFIG_WATCHDOG_TIMEOUT); - wdog_module |= (wdog_module / 8192); - wdp->mr = wdog_module; +#ifdef CONFIG_M5329 + wdp->mr = (wdog_module / 8192); +#else + wdp->mr = (wdog_module / 4096); +#endif wdp->cr = WTM_WCR_EN; puts("WATCHDOG:enabled\n"); |