diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2021-05-05 10:54:29 -0500 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-05-07 16:17:31 +0000 |
| commit | a48725dc2064f5c13e2c393ad361c871b3a061bd (patch) | |
| tree | b51874e9e28cc08dfd14a30a9ec8ea2985a714ec | |
| parent | 0b13ed0f5123dd41d99788824e95b2ff1c910773 (diff) | |
| download | chrome-ec-a48725dc2064f5c13e2c393ad361c871b3a061bd.tar.gz | |
isolate CONFIG_AP_RO_VERIFICATION
Isolate CONFIG_AP_RO_VERIFICATION
BUG=b:186663661
TEST=flash usage doesn't change with make -j BOARD=cr50
#undef CONFIG_AP_RO_VERIFICATION doesn't have build errors.
Change-Id: I9bf7e897a44302062551ecb553236a08dc96432e
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2875474
Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Reviewed-by: Namyoon Woo <namyoon@chromium.org>
| -rw-r--r-- | board/cr50/board.c | 2 | ||||
| -rw-r--r-- | board/cr50/usb_spi.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/board/cr50/board.c b/board/cr50/board.c index 43e4e8cd3b..1026580c5a 100644 --- a/board/cr50/board.c +++ b/board/cr50/board.c @@ -1191,11 +1191,13 @@ void assert_ec_rst(void) void deassert_ec_rst(void) { +#ifdef CONFIG_AP_RO_VERIFICATION if (ec_rst_override()) { ccprintf("EC un-reset blocked, try powercycle or Cr50 reboot." "\n"); return; } +#endif /* CONFIG_AP_RO_VERIFICATION */ wait_ec_rst(0); diff --git a/board/cr50/usb_spi.c b/board/cr50/usb_spi.c index 4ba11d6f30..392cb8e8e7 100644 --- a/board/cr50/usb_spi.c +++ b/board/cr50/usb_spi.c @@ -79,10 +79,12 @@ DECLARE_DEFERRED(spi_hash_inactive_timeout); * concurrent USB SPI operations over CCD. */ static bool shortcut_active_; +#ifdef CONFIG_AP_RO_VERIFICATION bool usb_spi_shortcut_active(void) { return shortcut_active_; } +#endif /* CONFIG_AP_RO_VERIFICATION */ /*****************************************************************************/ /* |