diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2013-07-22 16:19:13 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-07-23 12:37:04 -0700 |
| commit | 472d93c146403c0f95b656e182b972e15ff11835 (patch) | |
| tree | e1a5b95e604fc9eb42ab7493df10b92cd1a4a0a5 /firmware/lib/include | |
| parent | 964144bf2f3befe8c8a010000439cb5e5dccf00d (diff) | |
| download | vboot-472d93c146403c0f95b656e182b972e15ff11835.tar.gz | |
rollback_index: Remove recovery_mode parameter to SetupTPM.
SetupTPM no longer uses recovery_mode parameter for anything other than
a debug print. This change moves the debug print to a caller function,
then removes recovery_mode from SetupTPM and some caller functions that
no longer have a use for it.
BUG=chrome-os-partner:20913.
TEST=Manual. Boot factory install shim in recovery mode and verify TPM
clear operations succeed. Boot in dev mode and verify "Lock physical
presence" print on UART.
BRANCH=None.
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Change-Id: I2f671f6680a6e67cf722855e659e99752bc0783c
Reviewed-on: https://gerrit.chromium.org/gerrit/62916
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'firmware/lib/include')
| -rw-r--r-- | firmware/lib/include/rollback_index.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/firmware/lib/include/rollback_index.h b/firmware/lib/include/rollback_index.h index 386ad77f..7c410eec 100644 --- a/firmware/lib/include/rollback_index.h +++ b/firmware/lib/include/rollback_index.h @@ -83,7 +83,7 @@ uint32_t RollbackS3Resume(void); /** * This must be called. */ -uint32_t RollbackFirmwareSetup(int recovery_mode, int is_hw_dev, +uint32_t RollbackFirmwareSetup(int is_hw_dev, int disable_dev_request, int clear_tpm_owner_request, /* two outputs on success */ @@ -161,9 +161,8 @@ uint32_t OneTimeInitializeTPM(RollbackSpaceFirmware *rsf, * Start the TPM and establish the root of trust for the anti-rollback * mechanism. */ -uint32_t SetupTPM(int recovery_mode, int developer_mode, - int disable_dev_request, int clear_tpm_owner_request, - RollbackSpaceFirmware *rsf); +uint32_t SetupTPM(int developer_mode, int disable_dev_request, + int clear_tpm_owner_request, RollbackSpaceFirmware *rsf); /** * Utility function to turn the virtual dev-mode flag on or off. 0=off, 1=on. |