diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-07-07 00:32:47 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-07-07 00:32:47 +0200 |
| commit | 3070a9a3cb41ed6b19f79590f7713d5685ab1066 (patch) | |
| tree | 2d69ea08d00d228dac08992180c421defee3105b /cpu | |
| parent | 9fea65a6c469b1b474b27446feb58738baba2d31 (diff) | |
| parent | f16ed51702cb9fb6fa2e019bbc0fcd1466b57c3b (diff) | |
| download | u-boot-imx-3070a9a3cb41ed6b19f79590f7713d5685ab1066.zip u-boot-imx-3070a9a3cb41ed6b19f79590f7713d5685ab1066.tar.gz u-boot-imx-3070a9a3cb41ed6b19f79590f7713d5685ab1066.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/mpc83xx/cpu.c | 1 | ||||
| -rw-r--r-- | cpu/mpc83xx/cpu_init.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c index 36de78d..cc03f8a 100644 --- a/cpu/mpc83xx/cpu.c +++ b/cpu/mpc83xx/cpu.c @@ -44,7 +44,6 @@ int checkcpu(void) char buf[32]; int i; -#define CPU_TYPE_ENTRY(x) {#x, SPR_##x} const struct cpu_type { char name[15]; u32 partid; diff --git a/cpu/mpc83xx/cpu_init.c b/cpu/mpc83xx/cpu_init.c index fb184d8..67c9e57 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 |