Merge branch 'fixes'

[u-boot] / common / cmd_mp.c

diff --git a/common/cmd_mp.c b/common/cmd_mp.c
index d96e6a302d49d7bbb3b9f030728f0b796a0b74f9..f3a7f49e10f84634a61d94bb7e02118f14e7104c 100644 (file)
--- a/common/cmd_mp.c
+++ b/common/cmd_mp.c
@@ -26,7 +26,7 @@
 int
 cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
-       unsigned long cpuid, val = 0;
+       unsigned long cpuid;
 
        if (argc < 3) {
                printf ("Usage:\n%s\n", cmdtp->usage);
@@ -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;
        }
 
@@ -59,9 +59,7 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                return 1;
        }
 
-       val = simple_strtoul(argv[3], NULL, 16);
-
-       if (cpu_release(cpuid, val, argc - 4, argv + 4)) {
+       if (cpu_release(cpuid, argc - 3, argv + 3)) {
                printf ("Usage:\n%s\n", cmdtp->usage);
                return 1;
        }
@@ -71,21 +69,20 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 #ifdef CONFIG_PPC
 #define CPU_ARCH_HELP \
-       "                         [args] : <pir> <r3> <r4> <r6> <r7>\n" \
+       "                         [args] : <pir> <r3> <r6>\n" \
        "                                   pir - processor id (if writeable)\n" \
        "                                    r3 - value for gpr 3\n" \
-       "                                    r4 - value for gpr 4\n" \
        "                                    r6 - value for gpr 6\n" \
-       "                                    r7 - value for gpr 7\n" \
        "\n" \
        "     Use '-' for any arg if you want the default value.\n" \
-       "     Default for r3, r4, r7 is 0, r6 is 0x65504150\n" \
+       "     Default for r3 is <num> and r6 is 0\n" \
        "\n" \
-       "     When cpu <num> is released r5 = 0 per the ePAPR spec.\n"
+       "     When cpu <num> is released r4 and r5 = 0.\n" \
+       "     r7 will contain the size of the initial mapped area\n"
 #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"