projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
powerpc/mp: add support for discontiguous cores
[platform/kernel/u-boot.git]
/
common
/
cmd_mp.c
diff --git
a/common/cmd_mp.c
b/common/cmd_mp.c
index
d8e3ab2
..
b115b59
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.
*
* See file CREDITS for list of people who contributed to this
* project.
@@
-24,45
+24,39
@@
#include <command.h>
int
#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;
{
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);
cpuid = simple_strtoul(argv[1], NULL, 10);
- if (cpuid >= CONFIG_NUM_CPUS) {
- printf ("Core num: %lu is out of range[0..%d]\n",
- cpuid, CONFIG_NUM_CPUS - 1);
+ if (!is_core_valid(cpuid)) {
+ printf ("Core num: %lu is not valid\n", cpuid);
return 1;
}
if (argc == 3) {
return 1;
}
if (argc == 3) {
- if (strncmp(argv[2], "reset", 5) == 0)
{
+ if (strncmp(argv[2], "reset", 5) == 0)
cpu_reset(cpuid);
cpu_reset(cpuid);
- } else if (strncmp(argv[2], "status", 6) == 0) {
+ else if (strncmp(argv[2], "status", 6) == 0)
cpu_status(cpuid);
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 */
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;
}
return 0;
}
@@
-78,16
+72,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" \
" 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, CONFIG_SYS_MAXARGS, 1, cpu_cmd,
#endif
U_BOOT_CMD(
cpu, CONFIG_SYS_MAXARGS, 1, cpu_cmd,
- "
cpu - Multiprocessor CPU boot manipulation and release\n
",
+ "
Multiprocessor CPU boot manipulation and release
",
"<num> reset - Reset cpu <num>\n"
"cpu <num> status - Status of cpu <num>\n"
"<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
#ifdef CPU_ARCH_HELP
+ "\n"
CPU_ARCH_HELP
#endif
CPU_ARCH_HELP
#endif
-
);
+);