projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
[oweals/u-boot.git]
/
arch
/
powerpc
/
cpu
/
mpc8xxx
/
cpu.c
diff --git
a/arch/powerpc/cpu/mpc8xxx/cpu.c
b/arch/powerpc/cpu/mpc8xxx/cpu.c
index dfedc536ffb902144867dd113fe4eb36500ab2e0..15561a15331d5c341125107bef2dc9d2bf1c5a04 100644
(file)
--- a/
arch/powerpc/cpu/mpc8xxx/cpu.c
+++ b/
arch/powerpc/cpu/mpc8xxx/cpu.c
@@
-67,6
+67,7
@@
static struct cpu_type cpu_type_list[] = {
CPU_TYPE_ENTRY(G4860, G4860, 0),
CPU_TYPE_ENTRY(G4060, G4060, 0),
CPU_TYPE_ENTRY(B4440, B4440, 0),
CPU_TYPE_ENTRY(G4860, G4860, 0),
CPU_TYPE_ENTRY(G4060, G4060, 0),
CPU_TYPE_ENTRY(B4440, B4440, 0),
+ CPU_TYPE_ENTRY(B4460, B4460, 0),
CPU_TYPE_ENTRY(G4440, G4440, 0),
CPU_TYPE_ENTRY(B4420, B4420, 0),
CPU_TYPE_ENTRY(B4220, B4220, 0),
CPU_TYPE_ENTRY(G4440, G4440, 0),
CPU_TYPE_ENTRY(B4420, B4420, 0),
CPU_TYPE_ENTRY(B4220, B4220, 0),
@@
-177,7
+178,7
@@
struct cpu_type *identify_cpu(u32 ver)
/*
* Return a 32-bit mask indicating which cores are present on this SOC.
*/
/*
* Return a 32-bit mask indicating which cores are present on this SOC.
*/
-u32 cpu_mask(void)
+
__weak
u32 cpu_mask(void)
{
ccsr_pic_t __iomem *pic = (void *)CONFIG_SYS_MPC8xxx_PIC_ADDR;
struct cpu_type *cpu = gd->arch.cpu;
{
ccsr_pic_t __iomem *pic = (void *)CONFIG_SYS_MPC8xxx_PIC_ADDR;
struct cpu_type *cpu = gd->arch.cpu;
@@
-196,7
+197,7
@@
u32 cpu_mask(void)
/*
* Return the number of cores on this SOC.
*/
/*
* Return the number of cores on this SOC.
*/
-int cpu_numcores(void)
+
__weak
int cpu_numcores(void)
{
struct cpu_type *cpu = gd->arch.cpu;
{
struct cpu_type *cpu = gd->arch.cpu;