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>
This commit is contained in:
parent
3216ca9692
commit
902ca09246
|
@ -34,9 +34,9 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||||
}
|
}
|
||||||
|
|
||||||
cpuid = simple_strtoul(argv[1], NULL, 10);
|
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",
|
printf ("Core num: %lu is out of range[0..%d]\n",
|
||||||
cpuid, CONFIG_NR_CPUS - 1);
|
cpuid, CONFIG_NUM_CPUS - 1);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -147,7 +147,7 @@ static void pq3_mp_up(unsigned long bootpg)
|
||||||
out_be32(&gur->devdisr, devdisr);
|
out_be32(&gur->devdisr, devdisr);
|
||||||
|
|
||||||
/* release the hounds */
|
/* release the hounds */
|
||||||
up = ((1 << CONFIG_NR_CPUS) - 1);
|
up = ((1 << CONFIG_NUM_CPUS) - 1);
|
||||||
bpcr = in_be32(&ecm->eebpcr);
|
bpcr = in_be32(&ecm->eebpcr);
|
||||||
bpcr |= (up << 24);
|
bpcr |= (up << 24);
|
||||||
out_be32(&ecm->eebpcr, bpcr);
|
out_be32(&ecm->eebpcr, bpcr);
|
||||||
|
@ -157,7 +157,7 @@ static void pq3_mp_up(unsigned long bootpg)
|
||||||
/* wait for everyone */
|
/* wait for everyone */
|
||||||
while (timeout) {
|
while (timeout) {
|
||||||
int i;
|
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])
|
if (table[i * NUM_BOOT_ENTRY + BOOT_ENTRY_ADDR_LOWER])
|
||||||
cpu_up_mask |= (1 << i);
|
cpu_up_mask |= (1 << i);
|
||||||
};
|
};
|
||||||
|
|
|
@ -173,7 +173,7 @@ __secondary_start_page:
|
||||||
.align L1_CACHE_SHIFT
|
.align L1_CACHE_SHIFT
|
||||||
.globl __spin_table
|
.globl __spin_table
|
||||||
__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
|
/* Fill in the empty space. The actual reset vector is
|
||||||
* the last word of the page */
|
* the last word of the page */
|
||||||
|
|
Loading…
Reference in New Issue