diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2016-08-05 09:39:51 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-08-08 20:19:44 -0700 |
| commit | 37784e1e868fc9c722a80dbf1179a72782c87056 (patch) | |
| tree | 0f2fc7795818e06b373447bb74e5a3312edd5d0e /chip | |
| parent | 7e14583689f2e6e89f3f27e1abb171910ea875a7 (diff) | |
| download | chrome-ec-37784e1e868fc9c722a80dbf1179a72782c87056.tar.gz | |
cr50: fix nvmem calculations
The nvmem space defined in the ec code base for the cr50 board is used
by the TPM2 library, which has its own nvram size definition. The two
definitions must match.
On top of the fact that the definitions are not locked to each other,
there is a third completely unrelated nvram size definition in
board/cr50/board.c.
This patch unifies nvmem size definitions between cr50 and tpm2
repositories by adding a compile time check for the size to be the
same on both sides.
Also, it turns out that two certificates (RSA and ECC) together do not
quite fit into the cr50 TPM nvram. Hence the total allocated nvmem
space is being increased to 20K (note that the actual nvram size
available to the TPM is less than half of this).
BRANCH=none
BUG=chrome-os-partner:55898
TEST=tpm does not lock up any more when 'tpm_client --own' is ran on the
Kevin-tpm2 command line
CQ-DEPEND=CL:367010
Change-Id: I20b4f54118bd2fa12e5bd5741d6c58fbe91f65d1
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/366796
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Diffstat (limited to 'chip')
| -rw-r--r-- | chip/g/config_chip.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chip/g/config_chip.h b/chip/g/config_chip.h index 97cc56ba94..f0c508e2e9 100644 --- a/chip/g/config_chip.h +++ b/chip/g/config_chip.h @@ -93,7 +93,7 @@ * use these two areas for the same thing, it's just more convenient to make * them the same size. */ -#define CFG_TOP_SIZE 0x4000 +#define CFG_TOP_SIZE 0x5000 #define CFG_TOP_A_OFF (CFG_FLASH_HALF - CFG_TOP_SIZE) #define CFG_TOP_B_OFF (CONFIG_FLASH_SIZE - CFG_TOP_SIZE) |