[U-Boot] [PATCH] 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 --- common/cmd_mp.c | 4 ++-- cpu/mpc85xx/mp.c | 4 ++-- cpu/mpc85xx/release.S | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/cmd_mp.c b/common/cmd_mp.c index b2a397c..c8444fb 100644 --- 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 554830f..4e09c9c 100644 --- 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 a47edae..75676b5 100644 --- 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 */
On Mon, 2008-08-11 at 11:29 -0500, Kumar Gala wrote:
Use CONFIG_NUM_CPUS to match existing define used by 86xx.
Signed-off-by: Kumar Gala galak@kernel.crashing.org
common/cmd_mp.c | 4 ++-- cpu/mpc85xx/mp.c | 4 ++-- cpu/mpc85xx/release.S | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
Acked-by: Jon Loeliger jdl@freescale.com
Thanks!
jdl
On Aug 11, 2008, at 11:33 AM, Jon Loeliger wrote:
On Mon, 2008-08-11 at 11:29 -0500, Kumar Gala wrote:
Use CONFIG_NUM_CPUS to match existing define used by 86xx.
Signed-off-by: Kumar Gala galak@kernel.crashing.org
common/cmd_mp.c | 4 ++-- cpu/mpc85xx/mp.c | 4 ++-- cpu/mpc85xx/release.S | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
Acked-by: Jon Loeliger jdl@freescale.com
Not paying attention? I already sent a patch changing 86xx to match 85xx as we originally discussed, but this is also OK, as my patch hasn't been picked up.... Doesn't matter to me as long as it's consistent.
Acked-by: Becky Bruce becky.bruce@freescale.com
On Aug 11, 2008, at 1:00 PM, Becky Bruce wrote:
On Aug 11, 2008, at 11:33 AM, Jon Loeliger wrote:
On Mon, 2008-08-11 at 11:29 -0500, Kumar Gala wrote:
Use CONFIG_NUM_CPUS to match existing define used by 86xx.
Signed-off-by: Kumar Gala galak@kernel.crashing.org
common/cmd_mp.c | 4 ++-- cpu/mpc85xx/mp.c | 4 ++-- cpu/mpc85xx/release.S | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
Acked-by: Jon Loeliger jdl@freescale.com
Not paying attention? I already sent a patch changing 86xx to match 85xx as we originally discussed, but this is also OK, as my patch hasn't been picked up.... Doesn't matter to me as long as it's consistent.
We discussed this on IRC and decided to use the 86xx name.
- k
Dear Kumar Gala,
In message Pine.LNX.4.64.0808111128580.27861@blarg.am.freescale.net you wrote:
Use CONFIG_NUM_CPUS to match existing define used by 86xx.
Signed-off-by: Kumar Gala galak@kernel.crashing.org
common/cmd_mp.c | 4 ++-- cpu/mpc85xx/mp.c | 4 ++-- cpu/mpc85xx/release.S | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
participants (4)
-
Becky Bruce -
Jon Loeliger -
Kumar Gala -
Wolfgang Denk