diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2007-05-07 14:10:38 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@pollux.denx.de> | 2007-05-07 14:10:38 +0200 |
| commit | 6ede0c8b69ad1e6b16463ec75a6dccca152c4b17 (patch) | |
| tree | 978dcbd6189998876bb227ae5bbea03000a2f9c5 /cpu/mpc85xx/cpu_init.c | |
| parent | 61ea75aa07838435ec570ac85a2e3fc038844596 (diff) | |
| parent | ac4cd59d59c9bf3f89cb7a344abf8184d678f562 (diff) | |
| download | blackbird-obmc-uboot-6ede0c8b69ad1e6b16463ec75a6dccca152c4b17.tar.gz blackbird-obmc-uboot-6ede0c8b69ad1e6b16463ec75a6dccca152c4b17.zip | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'cpu/mpc85xx/cpu_init.c')
| -rw-r--r-- | cpu/mpc85xx/cpu_init.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cpu/mpc85xx/cpu_init.c b/cpu/mpc85xx/cpu_init.c index 9f4d36c1ab..9517146ed2 100644 --- a/cpu/mpc85xx/cpu_init.c +++ b/cpu/mpc85xx/cpu_init.c @@ -143,12 +143,10 @@ void cpu_init_f (void) memctl->br1 = CFG_BR1_PRELIM; #endif -#if !defined(CONFIG_MPC85xx) #if defined(CFG_BR2_PRELIM) && defined(CFG_OR2_PRELIM) memctl->or2 = CFG_OR2_PRELIM; memctl->br2 = CFG_BR2_PRELIM; #endif -#endif #if defined(CFG_BR3_PRELIM) && defined(CFG_OR3_PRELIM) memctl->or3 = CFG_OR3_PRELIM; |
