diff options
author | Wolfgang Denk <wd@pollux.denx.de> | 2006-11-27 23:11:18 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2006-11-27 23:11:18 +0100 |
commit | d2c83f549378fb3fc34cb3c2e62fd772fbf8b68b (patch) | |
tree | f00383ed01ca18fa0beee4930ebb7f3dc4153e5e /cpu/ppc4xx/cpu_init.c | |
parent | 4f4b602ec7524a032bdf3c6d28c7f525a4a67eaa (diff) | |
parent | 1729b92cde575476684bffe819d0b7791b57bff2 (diff) | |
download | u-boot-imx-d2c83f549378fb3fc34cb3c2e62fd772fbf8b68b.zip u-boot-imx-d2c83f549378fb3fc34cb3c2e62fd772fbf8b68b.tar.gz u-boot-imx-d2c83f549378fb3fc34cb3c2e62fd772fbf8b68b.tar.bz2 |
Merge with /home/sr/git/u-boot/denx-alpr-merge-test
Diffstat (limited to 'cpu/ppc4xx/cpu_init.c')
-rw-r--r-- | cpu/ppc4xx/cpu_init.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cpu/ppc4xx/cpu_init.c b/cpu/ppc4xx/cpu_init.c index def46f1..4b746b0 100644 --- a/cpu/ppc4xx/cpu_init.c +++ b/cpu/ppc4xx/cpu_init.c @@ -321,6 +321,10 @@ cpu_init_f (void) #else val |= 0xf0000000; /* generate system reset after 2.684 seconds */ #endif +#if defined(CFG_4xx_RESET_TYPE) + val &= ~0x30000000; /* clear WRC bits */ + val |= CFG_4xx_RESET_TYPE << 28; /* set board specific WRC type */ +#endif mtspr(tcr, val); val = mfspr(tsr); |