summaryrefslogtreecommitdiff
path: root/cpu/ppc4xx/cpu_init.c
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2007-07-04 08:11:37 +0200
committerStefan Roese <sr@denx.de>2007-07-04 08:11:37 +0200
commit8e990cb076a1c77daf3a50cc0df9732135e9eef5 (patch)
tree3b860d74bb4ddc5e0c9485e44da1bc0a08ed839c /cpu/ppc4xx/cpu_init.c
parentd677b32855f577ae2690dcd64a172cdd706e0ffc (diff)
parent98c440bee623ecdd5322852732b883e696fb2140 (diff)
downloadu-boot-imx-8e990cb076a1c77daf3a50cc0df9732135e9eef5.zip
u-boot-imx-8e990cb076a1c77daf3a50cc0df9732135e9eef5.tar.gz
u-boot-imx-8e990cb076a1c77daf3a50cc0df9732135e9eef5.tar.bz2
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'cpu/ppc4xx/cpu_init.c')
-rw-r--r--cpu/ppc4xx/cpu_init.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/cpu/ppc4xx/cpu_init.c b/cpu/ppc4xx/cpu_init.c
index 66e8637..351da36 100644
--- a/cpu/ppc4xx/cpu_init.c
+++ b/cpu/ppc4xx/cpu_init.c
@@ -153,7 +153,7 @@ cpu_init_f (void)
*/
asm volatile(" bl 0f" ::: "lr");
asm volatile("0: mflr 3" ::: "r3");
- asm volatile(" addi 4, 0, 14" ::: "r4");
+ asm volatile(" addi 4, 0, 14" ::: "r4");
asm volatile(" mtctr 4" ::: "ctr");
asm volatile("1: icbt 0, 3");
asm volatile(" addi 3, 3, 32" ::: "r3");
@@ -211,6 +211,8 @@ cpu_init_f (void)
val = mfspr(tcr);
#if defined(CONFIG_440EP) || defined(CONFIG_440GR)
val |= 0xb8000000; /* generate system reset after 1.34 seconds */
+#elif defined(CONFIG_440EPX)
+ val |= 0xb0000000; /* generate system reset after 1.34 seconds */
#else
val |= 0xf0000000; /* generate system reset after 2.684 seconds */
#endif