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/rollback_index.c | |
| 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/rollback_index.c')
| -rw-r--r-- | firmware/lib/rollback_index.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/firmware/lib/rollback_index.c b/firmware/lib/rollback_index.c index 619ba013..e372d9b6 100644 --- a/firmware/lib/rollback_index.c +++ b/firmware/lib/rollback_index.c @@ -341,9 +341,8 @@ uint32_t OneTimeInitializeTPM(RollbackSpaceFirmware *rsf, * to the TPM flashram at every reboot or wake-up, because of concerns about * the durability of the NVRAM. */ -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) { uint8_t in_flags; uint8_t disable; @@ -351,8 +350,6 @@ uint32_t SetupTPM(int recovery_mode, int developer_mode, uint32_t result; uint32_t versions; - VBDEBUG(("TPM: SetupTPM(r%d, d%d)\n", recovery_mode, developer_mode)); - RETURN_ON_FAILURE(TlclLibInit()); #ifdef TEGRA_SOFT_REBOOT_WORKAROUND @@ -494,7 +491,7 @@ uint32_t RollbackS3Resume(void) return TPM_SUCCESS; } -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, int *is_virt_dev, uint32_t *version) @@ -556,7 +553,7 @@ uint32_t RollbackS3Resume(void) return result; } -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, int *is_virt_dev, uint32_t *version) @@ -566,8 +563,7 @@ uint32_t RollbackFirmwareSetup(int recovery_mode, int is_hw_dev, /* Set version to 0 in case we fail */ *version = 0; - RETURN_ON_FAILURE(SetupTPM(recovery_mode, is_hw_dev, - disable_dev_request, + RETURN_ON_FAILURE(SetupTPM(is_hw_dev, disable_dev_request, clear_tpm_owner_request, &rsf)); Memcpy(version, &rsf.fw_versions, sizeof(*version)); *is_virt_dev = (rsf.flags & FLAG_VIRTUAL_DEV_MODE_ON) ? 1 : 0; |