diff options
| author | Joel Kitching <kitching@google.com> | 2019-04-25 18:31:14 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-05-17 18:36:48 -0700 |
| commit | 27e3e9fcba98dba576322273a34bd0cbbb639e81 (patch) | |
| tree | 208694afb44812fd666551682bffe95c96856d48 /futility/updater.c | |
| parent | 719968c47a6220b3e660e4f72cbc2a56750eec00 (diff) | |
| download | vboot-27e3e9fcba98dba576322273a34bd0cbbb639e81.tar.gz | |
vboot: deprecate v1 GoogleBinaryBlockHeader struct
Deprecate internal usage of GoogleBinaryBlockHeader struct in
favour of vb2_gbb_header struct. Keep the v1 struct around until
we remove references in other repos.
BUG=b:124141368, chromium:954774
TEST=make clean && make runtests
BRANCH=none
Change-Id: I396d2e624bd5dcac9c461cc86e8175e8f7692d26
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1583826
Commit-Ready: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'futility/updater.c')
| -rw-r--r-- | futility/updater.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/futility/updater.c b/futility/updater.c index 8dad7d41..859dedee 100644 --- a/futility/updater.c +++ b/futility/updater.c @@ -955,12 +955,7 @@ const struct vb2_gbb_header *find_gbb(const struct firmware_image *image) find_firmware_section(§ion, image, FMAP_RO_GBB); gbb_header = (struct vb2_gbb_header *)section.data; - /* - * futil_valid_gbb_header needs v1 header (GoogleBinaryBlockHeader) - * but that should be compatible with vb2_gbb_header - */ - if (!futil_valid_gbb_header((GoogleBinaryBlockHeader *)gbb_header, - section.size, NULL)) { + if (!futil_valid_gbb_header(gbb_header, section.size, NULL)) { ERROR("Cannot find GBB in image: %s.\n", image->file_name); return NULL; } |