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 /scripts | |
| 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 'scripts')
| -rw-r--r-- | scripts/image_signing/gbb_flags_common.sh | 36 | ||||
| -rwxr-xr-x | scripts/image_signing/make_dev_firmware.sh | 3 |
2 files changed, 20 insertions, 19 deletions
diff --git a/scripts/image_signing/gbb_flags_common.sh b/scripts/image_signing/gbb_flags_common.sh index 5a9aee7f..d4e3cedf 100644 --- a/scripts/image_signing/gbb_flags_common.sh +++ b/scripts/image_signing/gbb_flags_common.sh @@ -13,29 +13,29 @@ load_shflags || exit 1 # Globals # ---------------------------------------------------------------------------- -# Values from vboot_reference/firmware/include/gbb_header.h +# Values from vboot_reference/firmware/2lib/include/2gbb_flags.h GBBFLAGS_DESCRIPTION_PREFIX=" Defined flags (some values may be not supported by all systems): " GBBFLAGS_LIST=" - GBB_FLAG_DEV_SCREEN_SHORT_DELAY 0x00000001 - GBB_FLAG_LOAD_OPTION_ROMS 0x00000002 - GBB_FLAG_ENABLE_ALTERNATE_OS 0x00000004 - GBB_FLAG_FORCE_DEV_SWITCH_ON 0x00000008 - GBB_FLAG_FORCE_DEV_BOOT_USB 0x00000010 - GBB_FLAG_DISABLE_FW_ROLLBACK_CHECK 0x00000020 - GBB_FLAG_ENTER_TRIGGERS_TONORM 0x00000040 - GBB_FLAG_FORCE_DEV_BOOT_LEGACY 0x00000080 - GBB_FLAG_FAFT_KEY_OVERIDE 0x00000100 - GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC 0x00000200 - GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY 0x00000400 - GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC 0x00000800 - GBB_FLAG_DISABLE_LID_SHUTDOWN 0x00001000 - GBB_FLAG_FORCE_DEV_BOOT_FASTBOOT_FULL_CAP 0x00002000 - GBB_FLAG_FORCE_MANUAL_RECOVERY 0x00004000 - GBB_FLAG_DISABLE_FWMP 0x00008000 - GBB_FLAG_ENABLE_UDC 0x00010000 + VB2_GBB_FLAG_DEV_SCREEN_SHORT_DELAY 0x00000001 + VB2_GBB_FLAG_LOAD_OPTION_ROMS 0x00000002 + VB2_GBB_FLAG_ENABLE_ALTERNATE_OS 0x00000004 + VB2_GBB_FLAG_FORCE_DEV_SWITCH_ON 0x00000008 + VB2_GBB_FLAG_FORCE_DEV_BOOT_USB 0x00000010 + VB2_GBB_FLAG_DISABLE_FW_ROLLBACK_CHECK 0x00000020 + VB2_GBB_FLAG_ENTER_TRIGGERS_TONORM 0x00000040 + VB2_GBB_FLAG_FORCE_DEV_BOOT_LEGACY 0x00000080 + VB2_GBB_FLAG_FAFT_KEY_OVERIDE 0x00000100 + VB2_GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC 0x00000200 + VB2_GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY 0x00000400 + VB2_GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC 0x00000800 + VB2_GBB_FLAG_DISABLE_LID_SHUTDOWN 0x00001000 + VB2_GBB_FLAG_FORCE_DEV_BOOT_FASTBOOT_FULL_CAP 0x00002000 + VB2_GBB_FLAG_FORCE_MANUAL_RECOVERY 0x00004000 + VB2_GBB_FLAG_DISABLE_FWMP 0x00008000 + VB2_GBB_FLAG_ENABLE_UDC 0x00010000 " GBBFLAGS_DESCRIPTION_SUFFIX=" diff --git a/scripts/image_signing/make_dev_firmware.sh b/scripts/image_signing/make_dev_firmware.sh index 136b18fb..767dc22c 100755 --- a/scripts/image_signing/make_dev_firmware.sh +++ b/scripts/image_signing/make_dev_firmware.sh @@ -377,7 +377,8 @@ main() { debug_msg "Decide new GBB flags from: $old_gbb_flags" [ -z "$old_gbb_flags" ] && die "Cannot find GBB flags. (message: $(cat "${EXEC_LOG}"))" - # 0x30: GBB_FLAG_FORCE_DEV_BOOT_USB | GBB_FLAG_DISABLE_FW_ROLLBACK_CHECK + # 0x30: VB2_GBB_FLAG_FORCE_DEV_BOOT_USB | + # VB2_GBB_FLAG_DISABLE_FW_ROLLBACK_CHECK local new_gbb_flags="$((old_gbb_flags | 0x30))" debug_msg "Replace GBB parts (futility gbb allows changing on-the-fly)" |