diff options
| author | Randall Spangler <rspangler@chromium.org> | 2017-12-14 15:43:17 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-01-05 21:14:11 -0800 |
| commit | 5142132f44bbee683c830fdb837bbedb00bad8ba (patch) | |
| tree | 699df9f59656ff30f12bfacc4331d69afb9af1e1 /firmware/lib/vboot_display.c | |
| parent | 4e0939b377f65048dfc1ec8ceda6fd7c444fc8b8 (diff) | |
| download | vboot-5142132f44bbee683c830fdb837bbedb00bad8ba.tar.gz | |
firmware: use sd->gbb_flags
Vboot1 code directly referenced the GBB from cparams even though now
it has access to the GBB flags via the vb2 context. Refactor all
existing code to use the vb2 context, since that takes us one step
closer to getting rid of the old vboot1 cparams.
No change in functionality.
BUG=chromium:611535
BRANCH=none
TEST=make -j runtests; build bob firmware and boot it
Change-Id: Ic4a5bf215b723a2eacbf0a4cf0eba8b1338155a2
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/847310
Reviewed-by: Shelley Chen <shchen@chromium.org>
Diffstat (limited to 'firmware/lib/vboot_display.c')
| -rw-r--r-- | firmware/lib/vboot_display.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c index 7bf341e1..ac6d7131 100644 --- a/firmware/lib/vboot_display.c +++ b/firmware/lib/vboot_display.c @@ -9,6 +9,7 @@ #include "2sysincludes.h" #include "2common.h" +#include "2misc.h" #include "2nvstorage.h" #include "2sha.h" #include "bmpblk_font.h" @@ -600,7 +601,7 @@ VbError_t VbDisplayDebugInfo(struct vb2_context *ctx, VbCommonParams *cparams) { VbSharedDataHeader *shared = (VbSharedDataHeader *)cparams->shared_data_blob; - GoogleBinaryBlockHeader *gbb = cparams->gbb; + struct vb2_shared_data *sd = vb2_get_sd(ctx); char buf[DEBUG_INFO_SIZE] = ""; char sha1sum[VB2_SHA1_DIGEST_SIZE * 2 + 1]; char hwid[256]; @@ -679,7 +680,8 @@ VbError_t VbDisplayDebugInfo(struct vb2_context *ctx, VbCommonParams *cparams) used += Uint64ToString(buf + used, DEBUG_INFO_SIZE - used, i, 10, 0); /* Add TPM versions */ - used += StrnAppend(buf + used, "\nTPM: fwver=0x", DEBUG_INFO_SIZE - used); + used += StrnAppend(buf + used, + "\nTPM: fwver=0x", DEBUG_INFO_SIZE - used); used += Uint64ToString(buf + used, DEBUG_INFO_SIZE - used, shared->fw_version_tpm, 16, 8); used += StrnAppend(buf + used, " kernver=0x", DEBUG_INFO_SIZE - used); @@ -687,14 +689,10 @@ VbError_t VbDisplayDebugInfo(struct vb2_context *ctx, VbCommonParams *cparams) shared->kernel_version_tpm, 16, 8); /* Add GBB flags */ - used += StrnAppend(buf + used, "\ngbb.flags: 0x", DEBUG_INFO_SIZE - used); - if (gbb->major_version == GBB_MAJOR_VER && gbb->minor_version >= 1) { - used += Uint64ToString(buf + used, DEBUG_INFO_SIZE - used, - gbb->flags, 16, 8); - } else { - used += StrnAppend(buf + used, - "0 (default)", DEBUG_INFO_SIZE - used); - } + used += StrnAppend(buf + used, + "\ngbb.flags: 0x", DEBUG_INFO_SIZE - used); + used += Uint64ToString(buf + used, DEBUG_INFO_SIZE - used, + sd->gbb_flags, 16, 8); /* Add sha1sum for Root & Recovery keys */ ret = VbGbbReadRootKey(cparams, &key); |