diff options
| author | Randall Spangler <rspangler@chromium.org> | 2011-02-25 13:56:53 -0800 |
|---|---|---|
| committer | Randall Spangler <rspangler@chromium.org> | 2011-02-25 13:56:53 -0800 |
| commit | 92e378e453c7c7186a06d9021fb64eb7985937f5 (patch) | |
| tree | 55da561b6587b2298c4c2617353f8167b991b7b8 /firmware | |
| parent | 172602829dc0d79ed65d7ed81225389f090b981f (diff) | |
| download | vboot-92e378e453c7c7186a06d9021fb64eb7985937f5.tar.gz | |
rename tried_fwb constants
Change-Id: Ib8018bfe29eed50766c699d832efe4f1afcabb1a
BUG=none
TEST=make && make runtests
Review URL: http://codereview.chromium.org/6597015
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/include/vboot_nvstorage.h | 2 | ||||
| -rw-r--r-- | firmware/lib/vboot_nvstorage.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/firmware/include/vboot_nvstorage.h b/firmware/include/vboot_nvstorage.h index 4b92e7f8..f70cf521 100644 --- a/firmware/include/vboot_nvstorage.h +++ b/firmware/include/vboot_nvstorage.h @@ -49,7 +49,7 @@ typedef enum VbNvParam { VBNV_KERNEL_FIELD, /* Firmware checked RW slot B before slot A on the current boot because * VBNV_TRY_B_COUNT was non-zero at that time. 0=no; 1=yes. */ - VBNV_FW_USED_TRY_B, + VBNV_TRIED_FIRMWARE_B, /* Firmware verified the kernel key block signature using the key stored * in the firmware. 0=no, just used the key block hash; 1=yes, used the * key block signature. */ diff --git a/firmware/lib/vboot_nvstorage.c b/firmware/lib/vboot_nvstorage.c index ec6e55de..d9158041 100644 --- a/firmware/lib/vboot_nvstorage.c +++ b/firmware/lib/vboot_nvstorage.c @@ -27,7 +27,7 @@ #define LOCALIZATION_OFFSET 3 #define FIRMWARE_FLAGS_OFFSET 5 -#define FIRMWARE_FW_USED_TRY_B 0x80 +#define FIRMWARE_TRIED_FIRMWARE_B 0x80 #define FIRMWARE_FW_VERIFIED_KERNEL_KEY 0x40 #define KERNEL_FIELD_OFFSET 11 @@ -125,8 +125,8 @@ int VbNvGet(VbNvContext* context, VbNvParam param, uint32_t* dest) { | (raw[KERNEL_FIELD_OFFSET + 3] << 24)); return 0; - case VBNV_FW_USED_TRY_B: - *dest = (raw[FIRMWARE_FLAGS_OFFSET] & FIRMWARE_FW_USED_TRY_B ? 1 : 0); + case VBNV_TRIED_FIRMWARE_B: + *dest = (raw[FIRMWARE_FLAGS_OFFSET] & FIRMWARE_TRIED_FIRMWARE_B ? 1 : 0); return 0; case VBNV_FW_VERIFIED_KERNEL_KEY: @@ -201,11 +201,11 @@ int VbNvSet(VbNvContext* context, VbNvParam param, uint32_t value) { raw[KERNEL_FIELD_OFFSET + 3] = (uint8_t)(value >> 24); break; - case VBNV_FW_USED_TRY_B: + case VBNV_TRIED_FIRMWARE_B: if (value) - raw[FIRMWARE_FLAGS_OFFSET] |= FIRMWARE_FW_USED_TRY_B; + raw[FIRMWARE_FLAGS_OFFSET] |= FIRMWARE_TRIED_FIRMWARE_B; else - raw[FIRMWARE_FLAGS_OFFSET] &= ~FIRMWARE_FW_USED_TRY_B; + raw[FIRMWARE_FLAGS_OFFSET] &= ~FIRMWARE_TRIED_FIRMWARE_B; break; case VBNV_FW_VERIFIED_KERNEL_KEY: |