summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMary Ruthven <mruthven@chromium.org>2021-11-09 17:37:11 -0600
committerCommit Bot <commit-bot@chromium.org>2021-11-18 04:52:38 +0000
commitf18d5a6ddc4118602bed4d1e6d4803c9462ee8be (patch)
tree3c36ca5a7e7a2a3a3e59694e77d653880af7f2ea
parent241c9c97331146473ba5c4cc2ba349b59b0e2ffc (diff)
downloadchrome-ec-f18d5a6ddc4118602bed4d1e6d4803c9462ee8be.tar.gz
Revert "EFS: Sysjump to active copy"
This reverts commit 20c94b726e548c47a5237d60ac78c6f1e166e97b. BUG=b:200823466 TEST=make buildall -j Change-Id: Ifd4e5c252c0b7d7475360d67a492866f6c88b33c Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3273446 Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
-rw-r--r--common/system.c2
-rw-r--r--include/ec_commands.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/common/system.c b/common/system.c
index f787f8865c..4ed56d2459 100644
--- a/common/system.c
+++ b/common/system.c
@@ -814,7 +814,7 @@ static int handle_pending_reboot(enum ec_reboot_cmd cmd)
case EC_REBOOT_JUMP_RO:
return system_run_image_copy(SYSTEM_IMAGE_RO);
case EC_REBOOT_JUMP_RW:
- return system_run_image_copy(system_get_active_copy());
+ return system_run_image_copy(SYSTEM_IMAGE_RW);
case EC_REBOOT_COLD:
cflush();
system_reset(SYSTEM_RESET_HARD);
diff --git a/include/ec_commands.h b/include/ec_commands.h
index d01e629df7..d28d18b0b7 100644
--- a/include/ec_commands.h
+++ b/include/ec_commands.h
@@ -4925,7 +4925,7 @@ struct __ec_align4 ec_response_ec_codec_wov_read_audio_shm {
enum ec_reboot_cmd {
EC_REBOOT_CANCEL = 0, /* Cancel a pending reboot */
EC_REBOOT_JUMP_RO = 1, /* Jump to RO without rebooting */
- EC_REBOOT_JUMP_RW = 2, /* Jump to active RW without rebooting */
+ EC_REBOOT_JUMP_RW = 2, /* Jump to RW without rebooting */
/* (command 3 was jump to RW-B) */
EC_REBOOT_COLD = 4, /* Cold-reboot */
EC_REBOOT_DISABLE_JUMP = 5, /* Disable jump until next reboot */