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 /include/config.h | |
| 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 'include/config.h')
| -rw-r--r-- | include/config.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/include/config.h b/include/config.h index dfe458c5ad..c43ea3845a 100644 --- a/include/config.h +++ b/include/config.h @@ -5038,15 +5038,6 @@ /* Support computing hash of code for verified boot */ #undef CONFIG_VBOOT_HASH -/* - * Reload the watchdog at 1/2 the watchdog period during hash - * calculation. When CONFIG_SHA256_HW_ACCELERATE and - * CONFIG_SHA256_UNROLLED are disabled, the hash calculation may trip - * the watchdog. This option becomes enabled by default when both - * those options are disabled. - */ -#undef CONFIG_VBOOT_HASH_RELOAD_WATCHDOG - /* Support for secure temporary storage for verified boot */ #undef CONFIG_VSTORE @@ -6359,22 +6350,6 @@ "when CONFIG_SYSTEM_UNLOCK is also enabled." #endif /* CONFIG_BYPASS_CBI_EEPROM_WP_CHECK && !CONFIG_SYSTEM_UNLOCK */ -/* - * Enable CONFIG_VBOOT_HASH_RELOAD_WATCHDOG by default when these - * conditions are met: - * - Watchdog enabled - * - No hardware acceleration for SHA256 calculation - * - Loops for SHA256 calculation are not unrolled - * - * See the CONFIG_VBOOT_HASH_RELOAD_WATCHDOG entry in this file for an - * explanation as to why this is necessary. - */ -#if defined(CONFIG_WATCHDOG) && !defined(CONFIG_SHA256_HW_ACCELERATE) && \ - !defined(CONFIG_SHA256_UNROLLED) && \ - !defined(CONFIG_VBOOT_HASH_RELOAD_WATCHDOG) -#define CONFIG_VBOOT_HASH_RELOAD_WATCHDOG -#endif - #if !defined(CONFIG_ZEPHYR) && !defined(CONFIG_ACCELGYRO_ICM_COMM_SPI) && \ !defined(CONFIG_ACCELGYRO_ICM_COMM_I2C) #ifdef I2C_PORT_ACCEL |