Create CPUDIR variable

[karo-tx-uboot.git] / common / cmd_mp.c

diff --git a/common/cmd_mp.c b/common/cmd_mp.c
index d96e6a302d49d7bbb3b9f030728f0b796a0b74f9..d78c20951ee34060a04af1acc1c7dbd7a83dc9f1 100644 (file)
--- a/common/cmd_mp.c
+++ b/common/cmd_mp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Freescale Semiconductor, Inc.
+ * Copyright 2008-2009 Freescale Semiconductor, Inc.
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -26,17 +26,17 @@
 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);
+               cmd_usage(cmdtp);
                return 1;
        }
 
        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 >= cpu_numcores()) {
+               printf ("Core num: %lu is out of range[0..%d]\n",
+                               cpuid, cpu_numcores() - 1);
                return 1;
        }
 
@@ -46,8 +46,10 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        cpu_reset(cpuid);
                } else if (strncmp(argv[2], "status", 6) == 0) {
                        cpu_status(cpuid);
+               } else if (strncmp(argv[2], "disable", 7) == 0) {
+                       return cpu_disable(cpuid);
                } else {
-                       printf ("Usage:\n%s\n", cmdtp->usage);
+                       cmd_usage(cmdtp);
                        return 1;
                }
                return 0;
@@ -55,14 +57,12 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        /* 4 or greater, make sure its release */
        if (strncmp(argv[2], "release", 7) != 0) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
-       val = simple_strtoul(argv[3], NULL, 16);
-
-       if (cpu_release(cpuid, val, argc - 4, argv + 4)) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+       if (cpu_release(cpuid, argc - 3, argv + 3)) {
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -71,26 +71,27 @@ 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"
 #endif
 
 U_BOOT_CMD(
-       cpu, CFG_MAXARGS, 1, cpu_cmd,
-       "cpu     - Multiprocessor CPU boot manipulation and release\n",
+       cpu, CONFIG_SYS_MAXARGS, 1, cpu_cmd,
+       "Multiprocessor CPU boot manipulation and release",
            "<num> reset                 - Reset cpu <num>\n"
        "cpu <num> status                - Status of cpu <num>\n"
-       "cpu <num> release <addr> [args] - Release cpu <num> at <addr> with [args]\n"
+       "cpu <num> disable               - Disable cpu <num>\n"
+       "cpu <num> release <addr> [args] - Release cpu <num> at <addr> with [args]"
 #ifdef CPU_ARCH_HELP
+       "\n"
        CPU_ARCH_HELP
 #endif
-       );
+);