Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next

[oweals/u-boot.git] / cpu / mpc85xx / mp.c

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);
                };