summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaisuke Nojiri <dnojiri@chromium.org>2017-06-30 12:02:33 -0700
committerchrome-bot <chrome-bot@chromium.org>2017-07-05 18:50:26 -0700
commitd33618ce9f9a6b95632d0de3ebed1eca196cd982 (patch)
treea977a3623926c5d47fbc0112ced1eaf3d5fdc0b8
parent9f59c3df7599d9ecaf4a335556141769c65fee9e (diff)
downloadchrome-ec-d33618ce9f9a6b95632d0de3ebed1eca196cd982.tar.gz
system: Allow sysjump command to jump to RW_B
This patch also removes an extra newline character from the printf in system_can_boot_ap. BUG=none BRANCH=none TEST=make buildall Change-Id: I4143a687e0643328583ebf6cb14fc303da7f6a40 Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/558211 Reviewed-by: Randall Spangler <rspangler@chromium.org>
-rw-r--r--common/system.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/common/system.c b/common/system.c
index 597fc3e59b..66e7be5192 100644
--- a/common/system.c
+++ b/common/system.c
@@ -989,6 +989,12 @@ static int command_sysjump(int argc, char **argv)
* updated to use "RW".
*/
return system_run_image_copy(SYSTEM_IMAGE_RW);
+ } else if (!strcasecmp(argv[1], "B")) {
+#ifdef CONFIG_RW_B
+ return system_run_image_copy(SYSTEM_IMAGE_RW_B);
+#else
+ return EC_ERROR_PARAM1;
+#endif
} else if (!strcasecmp(argv[1], "disable")) {
system_disable_jump();
return EC_SUCCESS;
@@ -1009,7 +1015,7 @@ static int command_sysjump(int argc, char **argv)
return EC_SUCCESS;
}
DECLARE_CONSOLE_COMMAND(sysjump, command_sysjump,
- "[RO | RW | addr | disable]",
+ "[RO | RW | A | B | addr | disable]",
"Jump to a system image or address");
#endif
@@ -1315,8 +1321,7 @@ int system_can_boot_ap(void)
}
#endif
if (!power_good)
- CPRINTS("Not enough power to boot AP: charge=%d power=%d\n",
- soc, pow);
+ CPRINTS("Not enough power to boot: chg=%d pwr=%d", soc, pow);
return power_good;
}