Patchwork [U-Boot] powerpc/mpc85xx: Fix a bug introduced by CONFIG_PPC_SPINTABLE_COMPATIBLE

login
register
mail settings
Submitter York Sun
Date Nov. 8, 2012, 10:33 p.m.
Message ID <1352414019-15712-1-git-send-email-yorksun@freescale.com>
Download mbox | patch
Permalink /patch/197902/
State Awaiting Upstream
Delegated to: Andy Fleming
Headers show

Comments

York Sun - Nov. 8, 2012, 10:33 p.m.
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>
---
Please squash this patch with the earlier one when applying.

 arch/powerpc/cpu/mpc85xx/cpu_init.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index 371a58c..9a9ab5d 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -376,7 +376,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
@@ -425,7 +425,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;