diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-07-07 00:33:07 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-07-07 00:33:07 +0200 |
| commit | b0f1c03607b7c1ea07090a1d97a308fba901051d (patch) | |
| tree | 69aea3c0d693473ef2268fdadb94f6d4d6e50e74 | |
| parent | 9047bfa1e737d787be460387dd6f45737eeceb10 (diff) | |
| parent | 3070a9a3cb41ed6b19f79590f7713d5685ab1066 (diff) | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
| -rw-r--r-- | cpu/mpc83xx/cpu.c | 1 | ||||
| -rw-r--r-- | cpu/mpc83xx/cpu_init.c | 5 | ||||
| -rw-r--r-- | include/asm-ppc/processor.h | 7 |
3 files changed, 12 insertions, 1 deletions
diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c index 36de78d27..cc03f8a01 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 fb184d816..67c9e570c 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 diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h index 5b506791a..10fd478ba 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -970,8 +970,15 @@ struct cpu_type { struct cpu_type *identify_cpu(u32 ver); +#if defined(CONFIG_MPC85xx) #define CPU_TYPE_ENTRY(n, v) \ { .name = #n, .soc_ver = SVR_##v, } +#else +#if defined(CONFIG_MPC83XX) +#define CPU_TYPE_ENTRY(x) {#x, SPR_##x} +#endif +#endif + #ifndef CONFIG_MACH_SPECIFIC extern int _machine; |