diff options
| author | Michał Barnaś <mb@semihalf.com> | 2021-05-12 18:16:38 +0200 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-05-18 00:24:36 +0000 |
| commit | e38a18d39b0a63428f57ff09a0e0c67ba6472e11 (patch) | |
| tree | 9a30a9fd1a7a4dbfb64924257b504f199dfe537e /zephyr/app | |
| parent | e98327249389b1a624bf3477b69e15e28d816418 (diff) | |
| download | chrome-ec-e38a18d39b0a63428f57ff09a0e0c67ba6472e11.tar.gz | |
zephyr: Remove CONFIG_VBOOT_HASH_RELOAD_WATCHDOG
This reverts commit 0e5fa530e2f1eba6e16188be65ac39974a151a17.
After commit 97e22d467 it is no longer needed to reload
watchdog during hash calculation.
BUG=b:182499153
BRANCH=none
TEST=Flash EC and verify that hash calculation is correctly
done without rebooting by watchdog. Reading watchdog value
shows that there is enough remaining time.
Change-Id: Ia7bb6452a6ac42cda88d8b5e1203876cd0465b31
Signed-off-by: Michał Barnaś <mb@semihalf.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2897239
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>
Diffstat (limited to 'zephyr/app')
| -rw-r--r-- | zephyr/app/ec/ec_app_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/zephyr/app/ec/ec_app_main.c b/zephyr/app/ec/ec_app_main.c index c792a2892f..e0efb49475 100644 --- a/zephyr/app/ec/ec_app_main.c +++ b/zephyr/app/ec/ec_app_main.c @@ -62,10 +62,6 @@ void ec_app_main(void) } } - if (IS_ENABLED(CONFIG_PLATFORM_EC_WATCHDOG)) { - watchdog_init(); - } - if (IS_ENABLED(CONFIG_PLATFORM_EC_VBOOT)) { /* * For RO, it behaves as follows: @@ -84,6 +80,10 @@ void ec_app_main(void) */ k_thread_priority_set(&k_sys_work_q.thread, LOWEST_THREAD_PRIORITY); + if (IS_ENABLED(CONFIG_PLATFORM_EC_WATCHDOG)) { + watchdog_init(); + } + /* Call init hooks before main tasks start */ if (IS_ENABLED(CONFIG_PLATFORM_EC_HOOKS)) { hook_notify(HOOK_INIT); |