diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2021-11-09 19:43:05 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-11-18 04:52:43 +0000 |
| commit | 7bba0b1edb635806250fe617043f93d2f8b0541c (patch) | |
| tree | 84daf452241da4f3af994f369125cfea065f0595 /common | |
| parent | f18d5a6ddc4118602bed4d1e6d4803c9462ee8be (diff) | |
| download | chrome-ec-7bba0b1edb635806250fe617043f93d2f8b0541c.tar.gz | |
Revert "EFS: Allow EC to switch slot on reboot"
This reverts commit 220c75bd1626c656234d6121af8068c42ff182f8.
BUG=b:200823466
TEST=make buildall -j
Change-Id: I0f71ee2478cf4900b87e62101e7fb2ed2adba6cc
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3273447
Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/system.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/common/system.c b/common/system.c index 4ed56d2459..392ffbc6de 100644 --- a/common/system.c +++ b/common/system.c @@ -1377,17 +1377,7 @@ enum ec_status host_command_reboot(struct host_cmd_handler_args *args) /* Cancel pending reboot */ reboot_at_shutdown = EC_REBOOT_CANCEL; return EC_RES_SUCCESS; - } - - if (p.flags & EC_REBOOT_FLAG_SWITCH_RW_SLOT) { -#ifdef CONFIG_VBOOT_EFS - if (system_set_active_copy(system_get_update_copy())) - CPRINTS("Failed to set active slot"); -#else - return EC_RES_INVALID_PARAM; -#endif - } - if (p.flags & EC_REBOOT_FLAG_ON_AP_SHUTDOWN) { + } else if (p.flags & EC_REBOOT_FLAG_ON_AP_SHUTDOWN) { /* Store request for processing at chipset shutdown */ reboot_at_shutdown = p.cmd; return EC_RES_SUCCESS; |