Create CPUDIR variable

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

diff --git a/common/cmd_mp.c b/common/cmd_mp.c
index c8444fb841c5623a069928dbd0d8a18dc8e1b208..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.
@@ -29,14 +29,14 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        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_NUM_CPUS) {
+       if (cpuid >= cpu_numcores()) {
                printf ("Core num: %lu is out of range[0..%d]\n",
-                               cpuid, CONFIG_NUM_CPUS - 1);
+                               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,12 +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;
        }
 
        if (cpu_release(cpuid, argc - 3, argv + 3)) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -78,16 +80,18 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        "     Default for r3 is <num> and r6 is 0\n" \
        "\n" \
        "     When cpu <num> is released r4 and r5 = 0.\n" \
-       "     r7 will contain the size of the initial mapped area\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
-       );
+);