diff options
| author | Andrey Pronin <apronin@chromium.org> | 2019-08-21 10:29:21 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-08-22 04:45:39 +0000 |
| commit | 4ad4225c1cfdf015ea82158aea7eb44937382460 (patch) | |
| tree | 3effad420b115bf342fe212d9199e8ad64064d46 /include/tpm_vendor_cmds.h | |
| parent | 47a5e51e4a9d0a560da7040b05e3997746629753 (diff) | |
| download | chrome-ec-4ad4225c1cfdf015ea82158aea7eb44937382460.tar.gz | |
cr50: fix conflict in vendor_cmd_cc enum
After CL:1740075 and CL:1748846 we had a duplicate value for two
different vendor commands in tpm_vendor_cmd.h:
VENDOR_CC_ENDORSEMENT_SEED = 48
VENDOR_CC_U2F_MODE = 48
This CL fixes the issue.
BRANCH=none
BUG=b:139809333
TEST=none
Change-Id: Ic593e138c9126eb2a7e97b2e12c2daa890787d8c
Signed-off-by: Andrey Pronin <apronin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1763303
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Commit-Queue: Louis Collard <louiscollard@chromium.org>
Diffstat (limited to 'include/tpm_vendor_cmds.h')
| -rw-r--r-- | include/tpm_vendor_cmds.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/tpm_vendor_cmds.h b/include/tpm_vendor_cmds.h index b19339c1dd..c22079f490 100644 --- a/include/tpm_vendor_cmds.h +++ b/include/tpm_vendor_cmds.h @@ -134,7 +134,7 @@ enum vendor_cmd_cc { VENDOR_CC_FLOG_TIMESTAMP = 47, VENDOR_CC_ENDORSEMENT_SEED = 48, - VENDOR_CC_U2F_MODE = 48, + VENDOR_CC_U2F_MODE = 49, LAST_VENDOR_COMMAND = 65535, }; |