85xx: Rename CONFIG_NR_CPUS to CONFIG_NUM_CPUS

Use CONFIG_NUM_CPUS to match existing define used by 86xx.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Jon Loeliger <jdl@freescale.com>

diff --git a/common/cmd_mp.c b/common/cmd_mp.c
index b2a397cdfbd23cae642b60ee34f85ce9fc45af6d..c8444fb841c5623a069928dbd0d8a18dc8e1b208 100644 (file)
--- a/common/cmd_mp.c
+++ b/common/cmd_mp.c
@@ -34,9 +34,9 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        }
 
        cpuid = simple_strtoul(argv[1], NULL, 10);
-       if (cpuid >= CONFIG_NR_CPUS) {
+       if (cpuid >= CONFIG_NUM_CPUS) {
                printf ("Core num: %lu is out of range[0..%d]\n",
-                               cpuid, CONFIG_NR_CPUS - 1);
+                               cpuid, CONFIG_NUM_CPUS - 1);
                return 1;
        }
 

diff --git a/cpu/mpc85xx/mp.c b/cpu/mpc85xx/mp.c
index 554830f46a08de46992e7d00605d4985b7b98f1d..4e09c9c258bb5214f0a9399d02c420db869d889c 100644 (file)
--- a/cpu/mpc85xx/mp.c
+++ b/cpu/mpc85xx/mp.c
@@ -147,7 +147,7 @@ static void pq3_mp_up(unsigned long bootpg)
        out_be32(&gur->devdisr, devdisr);
 
        /* release the hounds */
-       up = ((1 << CONFIG_NR_CPUS) - 1);
+       up = ((1 << CONFIG_NUM_CPUS) - 1);
        bpcr = in_be32(&ecm->eebpcr);
        bpcr |= (up << 24);
        out_be32(&ecm->eebpcr, bpcr);
@@ -157,7 +157,7 @@ static void pq3_mp_up(unsigned long bootpg)
        /* wait for everyone */
        while (timeout) {
                int i;
-               for (i = 0; i < CONFIG_NR_CPUS; i++) {
+               for (i = 0; i < CONFIG_NUM_CPUS; i++) {
                        if (table[i * NUM_BOOT_ENTRY + BOOT_ENTRY_ADDR_LOWER])
                                cpu_up_mask |= (1 << i);
                };

diff --git a/cpu/mpc85xx/release.S b/cpu/mpc85xx/release.S
index a47edaea62f5842697bcee3613d6c6a358146cff..75676b5b9e8bd9d88d2e3ce0b139cb070b29298e 100644 (file)
--- a/cpu/mpc85xx/release.S
+++ b/cpu/mpc85xx/release.S
@@ -173,7 +173,7 @@ __secondary_start_page:
        .align L1_CACHE_SHIFT
        .globl __spin_table
 __spin_table:
-       .space CONFIG_NR_CPUS*ENTRY_SIZE
+       .space CONFIG_NUM_CPUS*ENTRY_SIZE
 
        /* Fill in the empty space.  The actual reset vector is
         * the last word of the page */