diff options
author | Daisuke Nojiri <dnojiri@chromium.org> | 2014-06-25 12:11:03 -0700 |
---|---|---|
committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-11-06 01:12:55 +0000 |
commit | a6461392576a87c3def9d5e107c2b398c954755e (patch) | |
tree | a6000ff77593cfaa60591c6dab4f2ddc887b36a7 /firmware | |
parent | 9f56b0dbb83d9049876e242ef74c324cd6777ce8 (diff) | |
download | vboot-a6461392576a87c3def9d5e107c2b398c954755e.tar.gz |
vboot2: add a flag to indicate firmware was selected by vboot2
TEST=Done manually on Nyan:
localhost ~ # sudo /tmp/crossystem fw_vboot2
0
localhost ~ # sudo /tmp/crossystem fw_vboot2=1
localhost ~ # sudo /tmp/crossystem fw_vboot2
0
# reboot with vboot2 firmware
localhost ~ # /tmp/crossystem fw_vboot2
1
BUG=none
BRANCH=none
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Change-Id: I6ed553c48bdfebf07393f6f5f46832a60971314a
Reviewed-on: https://chromium-review.googlesource.com/205664
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/227821
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/include/vboot_struct.h | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/firmware/include/vboot_struct.h b/firmware/include/vboot_struct.h index 7fa072f1..5e637ba0 100644 --- a/firmware/include/vboot_struct.h +++ b/firmware/include/vboot_struct.h @@ -236,31 +236,33 @@ typedef struct VbKernelPreambleHeader { * the firmware. If this flag is not present, it just used the hash of the * kernel keyblock. */ -#define VBSD_KERNEL_KEY_VERIFIED 0x00000002 +#define VBSD_KERNEL_KEY_VERIFIED 0x00000002 /* LoadFirmware() was told the developer switch was on */ -#define VBSD_LF_DEV_SWITCH_ON 0x00000004 +#define VBSD_LF_DEV_SWITCH_ON 0x00000004 /* LoadFirmware() is requesting the read only normal/dev code path */ -#define VBSD_LF_USE_RO_NORMAL 0x00000008 +#define VBSD_LF_USE_RO_NORMAL 0x00000008 /* Developer switch was enabled at boot time */ -#define VBSD_BOOT_DEV_SWITCH_ON 0x00000010 +#define VBSD_BOOT_DEV_SWITCH_ON 0x00000010 /* Recovery switch was enabled at boot time */ -#define VBSD_BOOT_REC_SWITCH_ON 0x00000020 +#define VBSD_BOOT_REC_SWITCH_ON 0x00000020 /* Firmware write protect was enabled at boot time */ -#define VBSD_BOOT_FIRMWARE_WP_ENABLED 0x00000040 +#define VBSD_BOOT_FIRMWARE_WP_ENABLED 0x00000040 /* Boot is a S3->S0 resume, not a S5->S0 normal boot */ -#define VBSD_BOOT_S3_RESUME 0x00000100 +#define VBSD_BOOT_S3_RESUME 0x00000100 /* Read-only firmware supports the normal/developer code path */ -#define VBSD_BOOT_RO_NORMAL_SUPPORT 0x00000200 +#define VBSD_BOOT_RO_NORMAL_SUPPORT 0x00000200 /* VbInit() was told that the system has a virtual dev-switch */ -#define VBSD_HONOR_VIRT_DEV_SWITCH 0x00000400 +#define VBSD_HONOR_VIRT_DEV_SWITCH 0x00000400 /* VbInit() was told the system supports EC software sync */ -#define VBSD_EC_SOFTWARE_SYNC 0x00000800 +#define VBSD_EC_SOFTWARE_SYNC 0x00000800 /* VbInit() was told that the EC firmware is slow to update */ -#define VBSD_EC_SLOW_UPDATE 0x00001000 +#define VBSD_EC_SLOW_UPDATE 0x00001000 /* Firmware software write protect was enabled at boot time */ #define VBSD_BOOT_FIRMWARE_SW_WP_ENABLED 0x00002000 /* VbInit() was told that the recovery button is a virtual one */ #define VBSD_BOOT_REC_SWITCH_VIRTUAL 0x00004000 +/* Firmware used vboot2 for firmware selection */ +#define VBSD_BOOT_FIRMWARE_VBOOT2 0x00008000 /* * Supported flags by header version. It's ok to add new flags while keeping |