scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-11-25 10:45:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Port over ContinueSelfTest() fix from firmware

Browse Source 
Change-Id: Ib12405f968af11ad75a6429ae9ebe502dde5bf92

BUG=chrome-os-partner:1591
TEST=make && make runtests

(This is already in the firmware; I'm just copying it back into vboot reference)

Review URL: http://codereview.chromium.org/5312003
This commit is contained in:
Randall Spangler
2010-11-23 14:17:21 -08:00
parent 500b3c2369
commit 44f34b5195
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
firmware/lib/rollback_index.c
View File

@@ -283,7 +283,6 @@ uint32_t RollbackS3Resume(void) {
* environment, don't even talk to the TPM. */ * environment, don't even talk to the TPM. */
TlclLibInit(); TlclLibInit();
TlclResume(); TlclResume();
TlclContinueSelfTest();
#endif #endif
return TPM_SUCCESS; return TPM_SUCCESS;
} }
@@ -341,18 +340,12 @@ uint32_t RollbackS3Resume(void) {
result = TlclResume(); result = TlclResume();
if (result == TPM_E_INVALID_POSTINIT) { if (result == TPM_E_INVALID_POSTINIT) {
/* We're on a platform where the TPM maintains power in S3, so /* We're on a platform where the TPM maintains power in S3, so
it's already initialized. No need for a self-test. */ it's already initialized. */
return TPM_SUCCESS; return TPM_SUCCESS;
} }
if (result != TPM_SUCCESS) {
return result; return result;
} }
RETURN_ON_FAILURE(TlclContinueSelfTest());
return TPM_SUCCESS;
}
uint32_t RollbackFirmwareSetup(int developer_mode, uint32_t* version) { uint32_t RollbackFirmwareSetup(int developer_mode, uint32_t* version) {
RollbackSpaceFirmware rsf; RollbackSpaceFirmware rsf;

2
firmware/version.c
View File

@@ -1 +1 @@
char* VbootVersion = "VBOOv=e30e3fe5"; char* VbootVersion = "VBOOv=f66e9197";