diff options
| author | Gaurav Shah <gauravsh@chromium.org> | 2010-05-28 12:31:11 -0700 |
|---|---|---|
| committer | Gaurav Shah <gauravsh@chromium.org> | 2010-05-28 12:31:11 -0700 |
| commit | 6bcaa107fbd42edf0ba6ad3dee6275bb220bc2d8 (patch) | |
| tree | 068fe57fd1900eb3e5d8117e3f07d85cce602bb5 | |
| parent | f666780e86fda8bf8244f2316d95e025f5767850 (diff) | |
| download | vboot-6bcaa107fbd42edf0ba6ad3dee6275bb220bc2d8.tar.gz | |
Change to the new prototype/name for Get/WriteStoredVersions().
This should fix the compilation error after Luigi's latest change went in.
Review URL: http://codereview.chromium.org/2358002
| -rw-r--r-- | vboot_firmware/lib/load_kernel_fw.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/vboot_firmware/lib/load_kernel_fw.c b/vboot_firmware/lib/load_kernel_fw.c index 8b751801..8ec440b5 100644 --- a/vboot_firmware/lib/load_kernel_fw.c +++ b/vboot_firmware/lib/load_kernel_fw.c @@ -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) { |