diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2021-06-17 14:30:14 -0500 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-07-29 21:14:05 +0000 |
| commit | 8a5d9a80f95d80060241c16d5e01509396f3a7e6 (patch) | |
| tree | 61ed9529c3707469e984b12657a8c24f3adc15ca | |
| parent | 6a82313eaf8396bbf34a3d6d5ade914141747a23 (diff) | |
| download | chrome-ec-8a5d9a80f95d80060241c16d5e01509396f3a7e6.tar.gz | |
ccd_config: remove UpdateNoTPMWipe
UpdateNoTPMWipe did not do anything. Replace it with 'Unused' in the
capabilities list.
We can't completely remove the capability because of how cr50 uses
the cap_info list. Every item from 0 to CCD_CAP_COUNT needs to have a
name and a default value. Renaming it makes it clear the capability
isn't used and keeps the relationship between capabilities and their
value in the capabilities bitmask.
BUG=b:182482706
TEST=none
Change-Id: Ie1e6674f414789ae52508b89e6f95d0a122cbd6f
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2970990
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
(cherry picked from commit 90120a2e36936e9e857ee84e799657d5e54b7ba0)
Change-Id: If7cb58a2e973726aafdaa64e5d857c6a4c4e904d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3004083
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-by: Andrey Pronin <apronin@chromium.org>
Tested-by: Mary Ruthven <mruthven@chromium.org>
Commit-Queue: Mary Ruthven <mruthven@chromium.org>
(cherry picked from commit 7bb61ff0e4fe90bcf04958286c24a2bf7e430ba6)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3059213
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
| -rw-r--r-- | include/ccd_config.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/ccd_config.h b/include/ccd_config.h index 60abe472e9..87bebb9db3 100644 --- a/include/ccd_config.h +++ b/include/ccd_config.h @@ -114,8 +114,8 @@ enum ccd_capability { /* Allow removing the battery to bypass physical presence requirement */ CCD_CAP_REMOVE_BATTERY_BYPASSES_PP = 13, - /* Allow GSC firmware update without wiping TPM data */ - CCD_CAP_GSC_FW_UPDATE_WITHOUT_TPM_WIPE = 14, + /* This was UpdateNoTPMWipe which didn't do anything. */ + CCD_CAP_UNUSED = 14, /* Access to I2C via USB */ CCD_CAP_I2C = 15, @@ -188,7 +188,7 @@ struct ccd_capability_info { \ {"OpenNoLongPP", CCD_CAP_STATE_IF_OPENED}, \ {"BatteryBypassPP", CCD_CAP_STATE_ALWAYS}, \ - {"UpdateNoTPMWipe", CCD_CAP_STATE_ALWAYS}, \ + {"Unused", CCD_CAP_STATE_ALWAYS}, \ {"I2C", CCD_CAP_STATE_IF_OPENED}, \ {"FlashRead", CCD_CAP_STATE_ALWAYS}, \ {"OpenNoDevMode", CCD_CAP_STATE_OPEN_REQ}, \ |