Merge branch 'fixes'

[u-boot] / common / cmd_mp.c

diff --git a/common/cmd_mp.c b/common/cmd_mp.c
index 26a57c5e96c7ae00d8cad546710f0e409d1dbdf6..f3a7f49e10f84634a61d94bb7e02118f14e7104c 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) {
-               printf ("Core num: %d is out of range[0..%d]\n",
-                               cpuid, CONFIG_NR_CPUS - 1);
+       if (cpuid >= CONFIG_NUM_CPUS) {
+               printf ("Core num: %lu is out of range[0..%d]\n",
+                               cpuid, CONFIG_NUM_CPUS - 1);
                return 1;
        }
 
@@ -82,7 +82,7 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 #endif
 
 U_BOOT_CMD(
-       cpu, CFG_MAXARGS, 1, cpu_cmd,
+       cpu, CONFIG_SYS_MAXARGS, 1, cpu_cmd,
        "cpu     - Multiprocessor CPU boot manipulation and release\n",
            "<num> reset                 - Reset cpu <num>\n"
        "cpu <num> status                - Status of cpu <num>\n"