arm/km: move CONFIG_EXTRA_ENV_SETTINGS from board to km_arm file

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

diff --git a/common/cmd_mp.c b/common/cmd_mp.c
index 71e430362fd456b25e3bedcdd52985bf5d1b9686..f19bf41f8eb04f1fdb6401a495decb1577fc0b71 100644 (file)
--- a/common/cmd_mp.c
+++ b/common/cmd_mp.c
@@ -24,14 +24,12 @@
 #include <command.h>
 
 int
-cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        unsigned long cpuid;
 
-       if (argc < 3) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (argc < 3)
+               return cmd_usage(cmdtp);
 
        cpuid = simple_strtoul(argv[1], NULL, 10);
        if (cpuid >= cpu_numcores()) {
@@ -42,27 +40,24 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 
        if (argc == 3) {
-               if (strncmp(argv[2], "reset", 5) == 0) {
+               if (strncmp(argv[2], "reset", 5) == 0)
                        cpu_reset(cpuid);
-               } else if (strncmp(argv[2], "status", 6) == 0) {
+               else if (strncmp(argv[2], "status", 6) == 0)
                        cpu_status(cpuid);
-               } else {
-                       cmd_usage(cmdtp);
-                       return 1;
-               }
+               else if (strncmp(argv[2], "disable", 7) == 0)
+                       return cpu_disable(cpuid);
+               else
+                       return cmd_usage(cmdtp);
+
                return 0;
        }
 
        /* 4 or greater, make sure its release */
-       if (strncmp(argv[2], "release", 7) != 0) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (strncmp(argv[2], "release", 7) != 0)
+               return cmd_usage(cmdtp);
 
-       if (cpu_release(cpuid, argc - 3, argv + 3)) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (cpu_release(cpuid, argc - 3, argv + 3))
+               return cmd_usage(cmdtp);
 
        return 0;
 }
@@ -86,6 +81,7 @@ U_BOOT_CMD(
        "Multiprocessor CPU boot manipulation and release",
            "<num> reset                 - Reset cpu <num>\n"
        "cpu <num> status                - Status of cpu <num>\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"