mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-21 06:31:31 +00:00
powerpc/mpc85xx: Fix a bug introduced by CONFIG_PPC_SPINTABLE_COMPATIBLE
Fix a bug introduced by this patch powerpc/mpc85xx: Temporary fix for spin table backward compatibility Should have checked both CONFIG_PPC_SPINTABLE_COMPATIBLE and CONFIG_MP in cpu_init.c. Signed-off-by: York Sun <yorksun@freescale.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
This commit is contained in:
parent
b25f6de7c0
commit
afbfdf5450
1 changed files with 2 additions and 2 deletions
|
@ -350,7 +350,7 @@ int cpu_init_r(void)
|
||||||
#elif defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2)
|
#elif defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2)
|
||||||
struct ccsr_cluster_l2 * l2cache = (void __iomem *)CONFIG_SYS_FSL_CLUSTER_1_L2;
|
struct ccsr_cluster_l2 * l2cache = (void __iomem *)CONFIG_SYS_FSL_CLUSTER_1_L2;
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_PPC_SPINTABLE_COMPATIBLE
|
#if defined(CONFIG_PPC_SPINTABLE_COMPATIBLE) && defined(CONFIG_MP)
|
||||||
extern int spin_table_compat;
|
extern int spin_table_compat;
|
||||||
const char *spin;
|
const char *spin;
|
||||||
#endif
|
#endif
|
||||||
|
@ -399,7 +399,7 @@ int cpu_init_r(void)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_PPC_SPINTABLE_COMPATIBLE
|
#if defined(CONFIG_PPC_SPINTABLE_COMPATIBLE) && defined(CONFIG_MP)
|
||||||
spin = getenv("spin_table_compat");
|
spin = getenv("spin_table_compat");
|
||||||
if (spin && (*spin == 'n'))
|
if (spin && (*spin == 'n'))
|
||||||
spin_table_compat = 0;
|
spin_table_compat = 0;
|
||||||
|
|
Loading…
Add table
Reference in a new issue