Daisuke Nojiri has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/39137 )
Change subject: vboot: Upgrade kernel space to v1.0 ......................................................................
vboot: Upgrade kernel space to v1.0
This patch upgrades the kernel space to v1.0 to accommodate EC hash, which is used for CrOS EC's early firmware selection.
BUG=chromium:1045217 BRANCH=none TEST=Boot Helios. Verify software sync works.
Change-Id: I525f1551afd1853cae826e87198057410167b239 Cq-Depend: chromium:2041695 Signed-off-by: dnojiri dnojiri@chromium.org --- M src/security/vboot/secdata_tpm.c 1 file changed, 4 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/37/39137/1
diff --git a/src/security/vboot/secdata_tpm.c b/src/security/vboot/secdata_tpm.c index 96fac29..a01cf0f 100644 --- a/src/security/vboot/secdata_tpm.c +++ b/src/security/vboot/secdata_tpm.c @@ -201,7 +201,8 @@ static uint32_t set_kernel_space(const void *kernel_blob) { return set_space("kernel", KERNEL_NV_INDEX, kernel_blob, - VB2_SECDATA_KERNEL_SIZE, rw_space_attributes, NULL, 0); + VB2_SECDATA_KERNEL_SIZE_V10, rw_space_attributes, + NULL, 0); }
static uint32_t set_rec_hash_space(const uint8_t *data) @@ -329,10 +330,10 @@ /* Define and write secdata_kernel space. */ RETURN_ON_FAILURE(safe_define_space(KERNEL_NV_INDEX, TPM_NV_PER_PPWRITE, - VB2_SECDATA_KERNEL_SIZE)); + VB2_SECDATA_KERNEL_SIZE_V10)); RETURN_ON_FAILURE(write_secdata(KERNEL_NV_INDEX, ctx->secdata_kernel, - VB2_SECDATA_KERNEL_SIZE)); + VB2_SECDATA_KERNEL_SIZE_V10));
/* Define and write secdata_firmware space. */ RETURN_ON_FAILURE(safe_define_space(FIRMWARE_NV_INDEX,