summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Boichat <drinkcat@google.com>2017-07-06 13:51:17 +0800
committerchrome-bot <chrome-bot@chromium.org>2017-07-06 05:00:28 -0700
commita58f5545c62283adbc7926635acbb6357f0d89b0 (patch)
treeeae5a4b2feb13cb9c0d171e14e5e1c674f0df7b9
parentc869b0f15c8d73f97cba4a6b2d3e0715a8a3c367 (diff)
downloadchrome-ec-a58f5545c62283adbc7926635acbb6357f0d89b0.tar.gz
chip/stm32/flash-f: Fix incorrect WP computation
PSTATE is already included in WP_BANK_OFFSET + WP_BANK_COUNT, so this change is not only unnecessary, but also harmful. BRANCH=none BUG=chromium:739608 TEST=Flash hammer, flashwp true; reboot; flashinfo => RO is protected Change-Id: I31048c0156eff354fbcc6ae5828a6ef313b56b97 Reviewed-on: https://chromium-review.googlesource.com/561037 Commit-Ready: Nicolas Boichat <drinkcat@chromium.org> Tested-by: Nicolas Boichat <drinkcat@chromium.org> Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
-rw-r--r--chip/stm32/flash-f.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/chip/stm32/flash-f.c b/chip/stm32/flash-f.c
index 59c1a20943..bf0b9ab81c 100644
--- a/chip/stm32/flash-f.c
+++ b/chip/stm32/flash-f.c
@@ -523,9 +523,6 @@ static int registers_need_reset(void)
int ro_at_boot = (flags & EC_FLASH_PROTECT_RO_AT_BOOT) ? 1 : 0;
int ro_wp_region_start = WP_BANK_OFFSET;
int ro_wp_region_end = WP_BANK_OFFSET + WP_BANK_COUNT;
-#ifdef CONFIG_FLASH_PSTATE
- ro_wp_region_end += PSTATE_BANK_COUNT;
-#endif
for (i = ro_wp_region_start; i < ro_wp_region_end; i++)
if (flash_physical_get_protect_at_boot(i) != ro_at_boot)