diff options
| author | Bill Richardson <wfrichar@chromium.org> | 2012-05-24 12:15:30 -0700 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2012-05-25 12:47:48 -0700 |
| commit | 6f4cc5635916b071fe8c689805b65f8feff8c205 (patch) | |
| tree | d3f84cda5a5f56841d38a516e15b6d2ba7af3db4 /firmware/lib/rollback_index.c | |
| parent | 201fe0bb55ddb5a7270c45aa58bcb91258c0a9ce (diff) | |
| download | vboot-6f4cc5635916b071fe8c689805b65f8feff8c205.tar.gz | |
Honor both fake_dev and virtual dev switch
BUG=chrome-os-partner:9706
TEST=none
No test yet. The entire boot/dev-mode/recovery flow depends on this working.
This is only part of the process, which will eventually be tested through
FAFT.
Change-Id: Iea6eaf59d4f349590cf9b920e4effb6a2641b2dc
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/23657
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'firmware/lib/rollback_index.c')
| -rw-r--r-- | firmware/lib/rollback_index.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/firmware/lib/rollback_index.c b/firmware/lib/rollback_index.c index 038188a8..5cd13566 100644 --- a/firmware/lib/rollback_index.c +++ b/firmware/lib/rollback_index.c @@ -364,8 +364,7 @@ uint32_t SetupTPM(int recovery_mode, int developer_mode, rsf->struct_version, rsf->flags, rsf->fw_versions)); /* The developer_mode value that's passed in is only set by a hardware - * dev-switch. We should OR it with any enabled virtual switch, since it - * can only be set by doing the keyboard-based dev-mode dance. */ + * dev-switch. We should OR it with any enabled virtual switch. */ if (rsf->flags & FLAG_VIRTUAL_DEV_MODE_ON) developer_mode = 1; @@ -474,8 +473,8 @@ uint32_t RollbackFirmwareSetup(int recovery_mode, int hw_dev_sw, RETURN_ON_FAILURE(SetupTPM(recovery_mode, *dev_mode_ptr, &rsf)); *version = rsf.fw_versions; - if (!hw_dev_sw) - *dev_mode_ptr = rsf.flags & FLAG_VIRTUAL_DEV_MODE_ON ? 1 : 0; + if (!hw_dev_sw && (rsf.flags & FLAG_VIRTUAL_DEV_MODE_ON)) + *dev_mode_ptr = 1; /* OR with the TPM's value */ VBDEBUG(("TPM: RollbackFirmwareSetup %x\n", (int)rsf.fw_versions)); return TPM_SUCCESS; } |