From 964144bf2f3befe8c8a010000439cb5e5dccf00d Mon Sep 17 00:00:00 2001 From: Shawn Nematbakhsh Date: Mon, 22 Jul 2013 13:33:46 -0700 Subject: rollback_index: Add recovery parameter to RollbackKernelLock. RollbackKernelLock previously checked a global to determine recovery mode state. Since we have two copies of vboot_reference in firmware (in coreboot and depthcharge), this creates a problem with synchronization. Remove the global entirely and instead pass the recovery state to RollbackKernelLock. 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=FalcoPeppy. Signed-off-by: Shawn Nematbakhsh Change-Id: I4e751d4a9ca60cd57c5c662ce86eba595fb22ba2 Reviewed-on: https://gerrit.chromium.org/gerrit/62874 Reviewed-by: Aaron Durbin Reviewed-by: Randall Spangler --- tests/rollback_index3_tests.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/rollback_index3_tests.c') diff --git a/tests/rollback_index3_tests.c b/tests/rollback_index3_tests.c index 9434a5a7..2fc1f059 100644 --- a/tests/rollback_index3_tests.c +++ b/tests/rollback_index3_tests.c @@ -37,7 +37,7 @@ int main(int argc, char* argv[]) TEST_EQ(version, 0, "rkr version"); TEST_EQ(RollbackKernelWrite(0), 0, "RollbackKernelWrite()"); - TEST_EQ(RollbackKernelLock(), 0, "RollbackKernelLock()"); + TEST_EQ(RollbackKernelLock(0), 0, "RollbackKernelLock()"); return gTestSuccess ? 0 : 255; } -- cgit v1.2.1