diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2018-09-14 16:00:52 +0000 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-09-17 21:34:59 -0700 |
| commit | 3552760ea58d796a7fb27b3c32d7a0ce8243f6fa (patch) | |
| tree | 6fbd2dad21b4ec064b32c35003d01ff725cada91 | |
| parent | 02155e0b650dff1969484d250b6f10e1b3018757 (diff) | |
| download | chrome-ec-3552760ea58d796a7fb27b3c32d7a0ce8243f6fa.tar.gz | |
Reland "meowth_fp: Enable CONFIG_ROLLBACK_MPU_PROTECT"
This reverts commit 8661ac5938ed9b96750cac5c6f6bf4edd1009d08.
Reason for revert: b:112740263 has been fixed by cl:1214864.
Original change's description:
> Revert "meowth_fp: Enable CONFIG_ROLLBACK_MPU_PROTECT"
>
> This reverts commit 331eaf99ce5376332442f2f1d83d277c6104bbb6, as it
> breaks flashrom.
>
> We'll want to reenable this after we fix flashrom.
>
> BRANCH=none
> BUG=b:111330723
> BUG=b:112740263
> TEST=/usr/sbin/fp_updater.sh works
>
> Change-Id: I3b1fc54a5f60f76f7d39481b1d7b90587c794c01
> Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
> Reviewed-on: https://chromium-review.googlesource.com/1180789
> Reviewed-by: Nicolas Norvez <norvez@chromium.org>
CQ-DEPEND=CL:*674690
Bug: b:111330723, b:112740263
Change-Id: I4c304c6fb49d0ac948d878a78d85f41961206c4c
Reviewed-on: https://chromium-review.googlesource.com/1226916
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
| -rw-r--r-- | board/meowth_fp/board.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/board/meowth_fp/board.h b/board/meowth_fp/board.h index a95089dbef..2538f58402 100644 --- a/board/meowth_fp/board.h +++ b/board/meowth_fp/board.h @@ -127,6 +127,9 @@ */ #define CONFIG_ROLLBACK #define CONFIG_ROLLBACK_SECRET_SIZE 32 + +#define CONFIG_ROLLBACK_MPU_PROTECT + /* * We do not use any "locally" generated entropy: this is normally used * to add local entropy when the main source of entropy is remote. |