summaryrefslogtreecommitdiff
path: root/cpu/ppc4xx/cpu_init.c
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2007-07-13 21:39:13 +0200
committerMichal Simek <monstr@monstr.eu>2007-07-13 21:39:13 +0200
commitbc2962482b707e44e0b43d20bd4dcf2a40230abb (patch)
tree751c5e07c5ff0aa7910da0fe33b0a0996bda518c /cpu/ppc4xx/cpu_init.c
parent093172f08d6afb3f34d8a2f26ee0ee874261cf27 (diff)
parent239f05ee4dd4cfe0b50f251b533dcebe9e67c360 (diff)
Merge git://www.denx.de/git/u-boot
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 66e86372603..351da36e855 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