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 /firmware | |
| 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 'firmware')
| -rw-r--r-- | firmware/lib/ec_sync.c | 1 | ||||
| -rw-r--r-- | firmware/lib/region-init.c | 1 | ||||
| -rw-r--r-- | firmware/lib/vboot_api_kernel.c | 1 | ||||
| -rw-r--r-- | firmware/lib/vboot_display.c | 1 | ||||
| -rw-r--r-- | firmware/lib/vboot_kernel.c | 1 | ||||
| -rw-r--r-- | firmware/lib/vboot_ui.c | 5 | ||||
| -rw-r--r-- | firmware/lib/vboot_ui_menu.c | 1 |
7 files changed, 2 insertions, 9 deletions
diff --git a/firmware/lib/ec_sync.c b/firmware/lib/ec_sync.c index c486d570..c8491551 100644 --- a/firmware/lib/ec_sync.c +++ b/firmware/lib/ec_sync.c @@ -12,7 +12,6 @@ #include "sysincludes.h" #include "ec_sync.h" -#include "gbb_header.h" #include "vboot_api.h" #include "vboot_common.h" #include "vboot_kernel.h" diff --git a/firmware/lib/region-init.c b/firmware/lib/region-init.c index ef676873..e34a3d15 100644 --- a/firmware/lib/region-init.c +++ b/firmware/lib/region-init.c @@ -12,7 +12,6 @@ #include "sysincludes.h" #include "gbb_access.h" -#include "gbb_header.h" #include "load_kernel_fw.h" #include "utility.h" #include "vboot_api.h" diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c index 77dc3366..2be3e938 100644 --- a/firmware/lib/vboot_api_kernel.c +++ b/firmware/lib/vboot_api_kernel.c @@ -14,7 +14,6 @@ #include "2rsa.h" #include "ec_sync.h" #include "gbb_access.h" -#include "gbb_header.h" #include "load_kernel_fw.h" #include "rollback_index.h" #include "utility.h" diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c index c43becec..d735cb41 100644 --- a/firmware/lib/vboot_display.c +++ b/firmware/lib/vboot_display.c @@ -13,7 +13,6 @@ #include "2nvstorage.h" #include "2sha.h" #include "gbb_access.h" -#include "gbb_header.h" #include "utility.h" #include "vboot_api.h" #include "vboot_common.h" diff --git a/firmware/lib/vboot_kernel.c b/firmware/lib/vboot_kernel.c index 57ab53d4..7195bdb0 100644 --- a/firmware/lib/vboot_kernel.c +++ b/firmware/lib/vboot_kernel.c @@ -17,7 +17,6 @@ #include "cgptlib.h" #include "cgptlib_internal.h" #include "gbb_access.h" -#include "gbb_header.h" #include "gpt_misc.h" #include "load_kernel_fw.h" #include "rollback_index.h" diff --git a/firmware/lib/vboot_ui.c b/firmware/lib/vboot_ui.c index e06d5f6b..14508a63 100644 --- a/firmware/lib/vboot_ui.c +++ b/firmware/lib/vboot_ui.c @@ -14,7 +14,6 @@ #include "2rsa.h" #include "ec_sync.h" #include "gbb_access.h" -#include "gbb_header.h" #include "load_kernel_fw.h" #include "rollback_index.h" #include "tlcl.h" @@ -79,7 +78,7 @@ static int VbWantShutdown(struct vb2_context *ctx, uint32_t key) shutdown_request |= VB_SHUTDOWN_REQUEST_POWER_BUTTON; /* If desired, ignore shutdown request due to lid closure. */ - if (sd->gbb_flags & GBB_FLAG_DISABLE_LID_SHUTDOWN) + if (sd->gbb_flags & VB2_GBB_FLAG_DISABLE_LID_SHUTDOWN) shutdown_request &= ~VB_SHUTDOWN_REQUEST_LID_CLOSED; return shutdown_request; @@ -619,7 +618,7 @@ static VbError_t vb2_developer_ui(struct vb2_context *ctx) if (shared->flags & VBSD_BOOT_DEV_SWITCH_ON) { /* Stop the countdown while we go ask... */ if (sd->gbb_flags & - GBB_FLAG_FORCE_DEV_SWITCH_ON) { + VB2_GBB_FLAG_FORCE_DEV_SWITCH_ON) { /* * TONORM won't work (only for * non-shipping devices). diff --git a/firmware/lib/vboot_ui_menu.c b/firmware/lib/vboot_ui_menu.c index 505a4caa..42494772 100644 --- a/firmware/lib/vboot_ui_menu.c +++ b/firmware/lib/vboot_ui_menu.c @@ -12,7 +12,6 @@ #include "2rsa.h" #include "ec_sync.h" #include "gbb_access.h" -#include "gbb_header.h" #include "load_kernel_fw.h" #include "rollback_index.h" #include "utility.h" |