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

Change to the new prototype/name for Get/WriteStoredVersions().

Browse Source 
This should fix the compilation error after Luigi's latest change went in.

Review URL: http://codereview.chromium.org/2358002
This commit is contained in:
Gaurav Shah
2010-05-28 12:31:11 -07:00
parent f666780e86
commit 6bcaa107fb
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
vboot_firmware/lib/load_kernel_fw.c
View File

@@ -109,9 +109,9 @@ int LoadKernel(LoadKernelParams* params) {
* when the RW firmware is verified. Is it harmful to call SetupTPM()
* again if it's already initialized? It'd be easier if we could just do
* that. */
tpm_kernel_key_version = GetStoredVersion(KERNEL_KEY_VERSION);
tpm_kernel_version = GetStoredVersion(KERNEL_VERSION);
GetStoredVersions(KERNEL_VERSIONS,
&tpm_kernel_key_version,
&tpm_kernel_version);
do {
/* Read GPT data */
gpt.sector_bytes = blba;
@@ -241,13 +241,12 @@ int LoadKernel(LoadKernelParams* params) {
if (good_partition >= 0) {
/* See if we need to update the TPM */
if (lowest_kernel_key_version > tpm_kernel_key_version) {
WriteStoredVersion(KERNEL_KEY_VERSION, lowest_kernel_key_version);
WriteStoredVersion(KERNEL_VERSION, lowest_kernel_version);
}
else if (lowest_kernel_key_version == tpm_kernel_key_version &&
lowest_kernel_version > tpm_kernel_version) {
WriteStoredVersion(KERNEL_VERSION, lowest_kernel_version);
if ((lowest_kernel_key_version > tpm_kernel_key_version) ||
(lowest_kernel_key_version == tpm_kernel_key_version &&
lowest_kernel_version > tpm_kernel_version)) {
WriteStoredVersions(KERNEL_VERSIONS,
lowest_kernel_key_version,
lowest_kernel_version);
}
if (BOOT_MODE_RECOVERY != params->boot_mode) {