summaryrefslogtreecommitdiff
path: root/cpu/mpc83xx/cpu_init.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-07-07 00:33:07 +0200
committerWolfgang Denk <wd@denx.de>2008-07-07 00:33:07 +0200
commitb0f1c03607b7c1ea07090a1d97a308fba901051d (patch)
tree69aea3c0d693473ef2268fdadb94f6d4d6e50e74 /cpu/mpc83xx/cpu_init.c
parent9047bfa1e737d787be460387dd6f45737eeceb10 (diff)
parent3070a9a3cb41ed6b19f79590f7713d5685ab1066 (diff)
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'cpu/mpc83xx/cpu_init.c')
-rw-r--r--cpu/mpc83xx/cpu_init.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/cpu/mpc83xx/cpu_init.c b/cpu/mpc83xx/cpu_init.c
index fb184d816b6..67c9e570c31 100644
--- a/cpu/mpc83xx/cpu_init.c
+++ b/cpu/mpc83xx/cpu_init.c
@@ -181,8 +181,13 @@ void cpu_init_f (volatile immap_t * im)
/* System General Purpose Register */
#ifdef CFG_SICRH
+#if defined(CONFIG_MPC834X) || defined(CONFIG_MPC8313)
+ /* regarding to MPC34x manual rev.1 bits 28..29 must be preserved */
+ im->sysconf.sicrh = (im->sysconf.sicrh & 0x0000000C) | CFG_SICRH;
+#else
im->sysconf.sicrh = CFG_SICRH;
#endif
+#endif
#ifdef CFG_SICRL
im->sysconf.sicrl = CFG_SICRL;
#endif