minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 12:13:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/wd/git/u-boot/custodians

Browse Source
This commit is contained in:
Wolfgang Denk 2008-07-07 00:33:07 +02:00
commit b0f1c03607
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpu/mpc83xx/cpu.c
View File

@ -44,7 +44,6 @@ int checkcpu(void)
char buf[32]; char buf[32];
int i; int i;
#define CPU_TYPE_ENTRY(x) {#x, SPR_##x}
const struct cpu_type { const struct cpu_type {
char name[15]; char name[15];
u32 partid; u32 partid;

5
cpu/mpc83xx/cpu_init.c
View File

@ -181,8 +181,13 @@ void cpu_init_f (volatile immap_t * im)
/* System General Purpose Register */ /* System General Purpose Register */
#ifdef CFG_SICRH #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; im->sysconf.sicrh = CFG_SICRH;
#endif #endif
#endif
#ifdef CFG_SICRL #ifdef CFG_SICRL
im->sysconf.sicrl = CFG_SICRL; im->sysconf.sicrl = CFG_SICRL;
#endif #endif

7
include/asm-ppc/processor.h
View File

@ -970,8 +970,15 @@ struct cpu_type {
struct cpu_type *identify_cpu(u32 ver); struct cpu_type *identify_cpu(u32 ver);
#if defined(CONFIG_MPC85xx)
#define CPU_TYPE_ENTRY(n, v) \ #define CPU_TYPE_ENTRY(n, v) \
{ .name = #n, .soc_ver = SVR_##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 #ifndef CONFIG_MACH_SPECIFIC
extern int _machine; extern int _machine;