diff options
| author | Mary Ruthven <mruthven@google.com> | 2018-08-24 14:09:01 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-08-25 19:27:11 -0700 |
| commit | 2a4bd4a152d81f5e24cea00b177c0be6d6246d15 (patch) | |
| tree | 61c4a3e9fc7172406f79698db661953be84ea887 | |
| parent | dfd98bb946f5d01ec0c18791e967ba2d18c0fc41 (diff) | |
| download | chrome-ec-2a4bd4a152d81f5e24cea00b177c0be6d6246d15.tar.gz | |
ccd_config: add flag restricting ccd open
On prePVT images we wan't to allow ccd open from the console without dev
mode enabled. This change adds a config option limiting ccd open.
BUG=b:112861587
BRANCH=cr50
TEST=ccd open is still disabled from the console unless the password is
set.
Change-Id: I2adbf9b0e900a693ab513a6bf6650b320b7320d4
Signed-off-by: Mary Ruthven <mruthven@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1188927
Commit-Ready: Mary Ruthven <mruthven@chromium.org>
Tested-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
| -rw-r--r-- | common/ccd_config.c | 2 | ||||
| -rw-r--r-- | include/config.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/common/ccd_config.c b/common/ccd_config.c index 2b97ba3133..a0f1ffe3e9 100644 --- a/common/ccd_config.c +++ b/common/ccd_config.c @@ -887,6 +887,7 @@ static enum vendor_cmd_rc ccd_open(struct vendor_cmd_params *p) * command came from the AP. */ } else { +#ifndef CONFIG_CCD_OPEN_PREPVT /* * - Password not set * - Battery is present @@ -894,6 +895,7 @@ static enum vendor_cmd_rc ccd_open(struct vendor_cmd_params *p) */ why_denied = "nopwd"; goto denied; +#endif } /* Fail and abort if already checking physical presence */ diff --git a/include/config.h b/include/config.h index f3ab3b81cf..2231491af5 100644 --- a/include/config.h +++ b/include/config.h @@ -531,6 +531,8 @@ #undef CONFIG_CASE_CLOSED_DEBUG_V1 /* Allow unsafe debugging functionality in V1 configuration */ #undef CONFIG_CASE_CLOSED_DEBUG_V1_UNSAFE +/* Loosen Open restrictions for prePVT devices */ +#undef CONFIG_CCD_OPEN_PREPVT /* * Capsense chip has buttons, too. |