[U-Boot-Users] [PATCH] [UPDATED] POWERPC: Change 86xx platforms to use CONFIG_NR_CPUS

[Becky Bruce]

Currently, they use CONFIG_NUM_CPUS, which is different than
85xx for no good reason.

Signed-off-by: Becky Bruce <becky.bruce at freescale.com>
---
Note: This is a resend; the first version accidentally changed the NR_CPUs
on 8610 to 2.

 cpu/mpc86xx/start.S           |    4 ++--
 include/configs/MPC8610HPCD.h |    2 +-
 include/configs/MPC8641HPCN.h |    2 +-
 include/configs/sbc8641d.h    |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cpu/mpc86xx/start.S b/cpu/mpc86xx/start.S
index 03f2128..83072bb 100644
--- a/cpu/mpc86xx/start.S
+++ b/cpu/mpc86xx/start.S
@@ -183,7 +183,7 @@ boot_warm:
 	/* if this is a multi-core system we need to check which cpu
 	 * this is, if it is not cpu 0 send the cpu to the linux reset
 	 * vector */
-#if (CONFIG_NUM_CPUS > 1)
+#if (CONFIG_NR_CPUS > 1)
 	mfspr	r0, MSSCR0
 	andi.	r0, r0, 0x0020
 	rlwinm	r0,r0,27,31,31
@@ -979,7 +979,7 @@ unlock_ram_in_cache:
  * Sri:	 Much of this initialization is not required. Linux
  * rewrites the bats, and the sprs and also enables the L1 cache.
  */
-#if (CONFIG_NUM_CPUS > 1)
+#if (CONFIG_NR_CPUS > 1)
 .globl secondary_cpu_setup
 secondary_cpu_setup:
 	/* Do only core setup on all cores except cpu0 */
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 1cba270..50a05f2 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -17,7 +17,7 @@
 #define CONFIG_MPC86xx		1	/* MPC86xx */
 #define CONFIG_MPC8610		1	/* MPC8610 specific */
 #define CONFIG_MPC8610HPCD	1	/* MPC8610HPCD board specific */
-#define CONFIG_NUM_CPUS		1	/* Number of CPUs in the system */
+#define CONFIG_NR_CPUS		1	/* Number of CPUs in the system */
 #define CONFIG_LINUX_RESET_VEC	0x100	/* Reset vector used by Linux */
 
 #define CONFIG_FSL_DIU_FB	1	/* FSL DIU */
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index ccba409..78a9d11 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -36,7 +36,7 @@
 #define CONFIG_MPC86xx		1	/* MPC86xx */
 #define CONFIG_MPC8641		1	/* MPC8641 specific */
 #define CONFIG_MPC8641HPCN	1	/* MPC8641HPCN board specific */
-#define CONFIG_NUM_CPUS		2	/* Number of CPUs in the system */
+#define CONFIG_NR_CPUS		2	/* Number of CPUs in the system */
 #define CONFIG_LINUX_RESET_VEC	0x100	/* Reset vector used by Linux */
 
 #ifdef RUN_DIAG
diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index 3cd9ff8..76712fd 100644
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -40,7 +40,7 @@
 #define CONFIG_MPC86xx		1	/* MPC86xx */
 #define CONFIG_MPC8641		1	/* MPC8641 specific */
 #define CONFIG_SBC8641D		1	/* SBC8641D board specific */
-#define CONFIG_NUM_CPUS         2       /* Number of CPUs in the system */
+#define CONFIG_NR_CPUS		2	/* Number of CPUs in the system */
 #define CONFIG_LINUX_RESET_VEC  0x100   /* Reset vector used by Linux */
 
 #ifdef RUN_DIAG
-- 
1.5.5.1