summaryrefslogtreecommitdiff
path: root/arch/powerpc
diff options
context:
space:
mode:
authorYork Sun <yorksun@freescale.com>2012-11-08 12:33:39 +0000
committerAndy Fleming <afleming@freescale.com>2012-11-27 18:28:08 -0600
commitafbfdf545090472b734367ac2c874bfbe8928790 (patch)
tree507faa12583cec091333f7fadf8e8494d33ffc47 /arch/powerpc
parentb25f6de7c03cfa8663439581c90d303588168a29 (diff)
downloadu-boot-imx-afbfdf545090472b734367ac2c874bfbe8928790.zip
u-boot-imx-afbfdf545090472b734367ac2c874bfbe8928790.tar.gz
u-boot-imx-afbfdf545090472b734367ac2c874bfbe8928790.tar.bz2
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>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/cpu/mpc85xx/cpu_init.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index 9c1887f..d1155e8 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -350,7 +350,7 @@ int cpu_init_r(void)
#elif defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2)
struct ccsr_cluster_l2 * l2cache = (void __iomem *)CONFIG_SYS_FSL_CLUSTER_1_L2;
#endif
-#ifdef CONFIG_PPC_SPINTABLE_COMPATIBLE
+#if defined(CONFIG_PPC_SPINTABLE_COMPATIBLE) && defined(CONFIG_MP)
extern int spin_table_compat;
const char *spin;
#endif
@@ -399,7 +399,7 @@ int cpu_init_r(void)
}
#endif
-#ifdef CONFIG_PPC_SPINTABLE_COMPATIBLE
+#if defined(CONFIG_PPC_SPINTABLE_COMPATIBLE) && defined(CONFIG_MP)
spin = getenv("spin_table_compat");
if (spin && (*spin == 'n'))
spin_table_compat = 0;