diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2021-11-09 20:16:12 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-11-23 01:11:53 +0000 |
| commit | ccc91515bf922c08d868b6a9fc4754bf3ee558e3 (patch) | |
| tree | d9d3f27c2a9d503b946c6ab8afc6eac1d688eff1 | |
| parent | 7bf5702c845f007873dd48f24e3ba123c5b978a7 (diff) | |
| download | chrome-ec-ccc91515bf922c08d868b6a9fc4754bf3ee558e3.tar.gz | |
Revert "rwsig: do not jump if reset source is hard pin reset"
This reverts commit ba105838f582793716d02eebee09a6f283ef73b3.
BUG=b:200823466
TEST=make buildall -j
Change-Id: Idc4a2eb4f9fc778ddb76504cd4e0fab296df41a8
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3273465
Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
(cherry picked from commit d3459ea1985577233d31b950fdfc54601954cabf)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3296987
| -rw-r--r-- | common/main.c | 18 | ||||
| -rw-r--r-- | include/config.h | 6 |
2 files changed, 3 insertions, 21 deletions
diff --git a/common/main.c b/common/main.c index 0e9d0afa9e..67fba14505 100644 --- a/common/main.c +++ b/common/main.c @@ -163,21 +163,9 @@ test_mockable __keep int main(void) * * Only the Read-Only firmware needs to do the signature check. */ - if (system_get_image_copy() == SYSTEM_IMAGE_RO) { -#if defined(CONFIG_RWSIG_DONT_CHECK_ON_PIN_RESET) - /* - * If system was reset by reset-pin, do not jump and wait for - * command from host - */ - if (system_get_reset_flags() == EC_RESET_FLAG_RESET_PIN) - CPRINTS("Hard pin-reset detected, disable RW jump"); - else -#endif - { - if (rwsig_check_signature()) - rwsig_jump_now(); - } - } + if (system_get_image_copy() == SYSTEM_IMAGE_RO && + rwsig_check_signature()) + rwsig_jump_now(); #endif #endif /* !CONFIG_VBOOT_EC */ diff --git a/include/config.h b/include/config.h index 8dce0ae0a0..ad8e60cc69 100644 --- a/include/config.h +++ b/include/config.h @@ -2881,12 +2881,6 @@ #undef CONFIG_RWSIG /* - * Disable rwsig jump when the reset source is hard pin-reset. This only work - * for the case where rwsig task is not used. - */ -#undef CONFIG_RWSIG_DONT_CHECK_ON_PIN_RESET - -/* * When RWSIG verification is performed as a task, time to wait from signature * verification to an automatic jump to RW (if AP does not request the wait to * be interrupted). |