diff options
| author | Andrey Pronin <apronin@chromium.org> | 2019-06-26 16:27:43 -0700 |
|---|---|---|
| committer | Vadim Bendebury <vbendeb@chromium.org> | 2019-09-21 19:11:26 -0700 |
| commit | 9a58349f42390623166f516496a939c65c31f8c6 (patch) | |
| tree | c1e2648321d4b431a8f4672393ee77f1715af1b6 | |
| parent | ddec2478333a51b66157fe7253788f5edc197f80 (diff) | |
| download | chrome-ec-9a58349f42390623166f516496a939c65c31f8c6.tar.gz | |
cr50: unwrap BUILD_ASSERTs in virtual_nvmem.c
This is a cosmetic CL that gets rid of breaking BUILD_ASSERT statements
in virtual_nvmem.c into two lines since they all fit 80 chars.
BRACH=none
BUG=none
TEST=build
Change-Id: Iaec1115101c36d8ec20967c64931666b760b027d
Signed-off-by: Andrey Pronin <apronin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1679595
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-by: Louis Collard <louiscollard@chromium.org>
(cherry picked from commit eb2189224d135e114e730105fc0b1d71b85063da)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1684236
Tested-by: Vadim Bendebury <vbendeb@chromium.org>
Commit-Queue: Vadim Bendebury <vbendeb@chromium.org>
(cherry picked from commit 1a67be5052f567e1146e49ffc2315069320f3664)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1705745
(cherry picked from commit 778f52185c112595387fae8052793010964641cf)
| -rw-r--r-- | board/cr50/tpm2/virtual_nvmem.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/board/cr50/tpm2/virtual_nvmem.c b/board/cr50/tpm2/virtual_nvmem.c index 8d3dbc0dec..58db3a8cf9 100644 --- a/board/cr50/tpm2/virtual_nvmem.c +++ b/board/cr50/tpm2/virtual_nvmem.c @@ -325,8 +325,7 @@ static void GetBoardId(BYTE *to, size_t offset, size_t size) read_board_id(&board_id_tmp); memcpy(to, ((BYTE *) &board_id_tmp) + offset, size); } -BUILD_ASSERT(VIRTUAL_NV_INDEX_BOARD_ID_SIZE == - sizeof(struct board_id)); +BUILD_ASSERT(VIRTUAL_NV_INDEX_BOARD_ID_SIZE == sizeof(struct board_id)); static void GetSnData(BYTE *to, size_t offset, size_t size) { @@ -335,8 +334,7 @@ static void GetSnData(BYTE *to, size_t offset, size_t size) read_sn_data(&sn_data_tmp); memcpy(to, ((BYTE *) &sn_data_tmp) + offset, size); } -BUILD_ASSERT(VIRTUAL_NV_INDEX_SN_DATA_SIZE == - sizeof(struct sn_data)); +BUILD_ASSERT(VIRTUAL_NV_INDEX_SN_DATA_SIZE == sizeof(struct sn_data)); static void GetG2fCert(BYTE *to, size_t offset, size_t size) { @@ -347,8 +345,7 @@ static void GetG2fCert(BYTE *to, size_t offset, size_t size) memcpy(to, ((BYTE *) cert) + offset, size); } -BUILD_ASSERT(VIRTUAL_NV_INDEX_G2F_CERT_SIZE == - G2F_ATTESTATION_CERT_MAX_LEN); +BUILD_ASSERT(VIRTUAL_NV_INDEX_G2F_CERT_SIZE == G2F_ATTESTATION_CERT_MAX_LEN); static void GetRSUDevID(BYTE *to, size_t offset, size_t size) { @@ -365,5 +362,4 @@ static void GetRSUDevID(BYTE *to, size_t offset, size_t size) memcpy(to, rsu_device_id + offset, size); } -BUILD_ASSERT(VIRTUAL_NV_INDEX_RSU_DEV_ID_SIZE == - SHA256_DIGEST_SIZE); +BUILD_ASSERT(VIRTUAL_NV_INDEX_RSU_DEV_ID_SIZE == SHA256_DIGEST_SIZE); |