diff options
author | Wolfgang Denk <wd@denx.de> | 2010-09-07 22:19:49 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-09-07 22:19:49 +0200 |
commit | f91506e28387fece392b5dd3bb3aa309e4ce7e4d (patch) | |
tree | 3e46227d94b7b379341fba534df5aa3dd3948f68 /arch/powerpc/cpu/mpc8xxx/cpu.c | |
parent | 5549d22b656550d36b2cc46743c7220ab0e9dcc4 (diff) | |
parent | 2df0e6fc6b71448e1752e4ce1d5577d8977f3e5e (diff) | |
download | u-boot-imx-f91506e28387fece392b5dd3bb3aa309e4ce7e4d.zip u-boot-imx-f91506e28387fece392b5dd3bb3aa309e4ce7e4d.tar.gz u-boot-imx-f91506e28387fece392b5dd3bb3aa309e4ce7e4d.tar.bz2 |
Merge branch 'master' of /home/wd/git/u-boot/master
Diffstat (limited to 'arch/powerpc/cpu/mpc8xxx/cpu.c')
-rw-r--r-- | arch/powerpc/cpu/mpc8xxx/cpu.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c index 97a94f4..5b30fbd 100644 --- a/arch/powerpc/cpu/mpc8xxx/cpu.c +++ b/arch/powerpc/cpu/mpc8xxx/cpu.c @@ -110,13 +110,15 @@ struct cpu_type *identify_cpu(u32 ver) } int cpu_numcores() { - ccsr_pic_t __iomem *pic = (void *)CONFIG_SYS_MPC85xx_PIC_ADDR; + ccsr_pic_t __iomem *pic = (void *)CONFIG_SYS_MPC8xxx_PIC_ADDR; struct cpu_type *cpu = gd->cpu; /* better to query feature reporting register than just assume 1 */ +#define MPC8xxx_PICFRR_NCPU_MASK 0x00001f00 +#define MPC8xxx_PICFRR_NCPU_SHIFT 8 if (cpu == &cpu_type_unknown) - return ((in_be32(&pic->frr) & MPC85xx_PICFRR_NCPU_MASK) >> - MPC85xx_PICFRR_NCPU_SHIFT) + 1; + return ((in_be32(&pic->frr) & MPC8xxx_PICFRR_NCPU_MASK) >> + MPC8xxx_PICFRR_NCPU_SHIFT) + 1; return cpu->num_cores; } |