diff options
| author | Stefan Roese <sr@denx.de> | 2007-06-25 20:20:30 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-06-25 20:20:30 +0200 |
| commit | e4feb7638ca0a2138973f14456424acbc332ae43 (patch) | |
| tree | b69d9c1ecce5ad19ffa73b58e251974fcbf68025 /cpu/ppc4xx/cpu_init.c | |
| parent | a1bd6200eccd3a02040a955d5f43d3ee1fc9f93b (diff) | |
| parent | 1636d1c8529c006d106287cfbc20cd0a246fe1cb (diff) | |
| download | u-boot-imx-e4feb7638ca0a2138973f14456424acbc332ae43.zip u-boot-imx-e4feb7638ca0a2138973f14456424acbc332ae43.tar.gz u-boot-imx-e4feb7638ca0a2138973f14456424acbc332ae43.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.c | 4 |
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 |