diff options
| author | Randall Spangler <rspangler@chromium.org> | 2014-12-04 09:54:37 -0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-12-05 00:02:00 +0000 |
| commit | 308d2540929cd95e2a565be95ce0b1d45d2fbed2 (patch) | |
| tree | 8df30f986fd05e934ca3461398cfc63cda398026 /firmware/2lib/include/2return_codes.h | |
| parent | 6f1b82ac14f341d9733d6e95d518b3ee352002ef (diff) | |
| download | vboot-308d2540929cd95e2a565be95ce0b1d45d2fbed2.tar.gz | |
vboot2: Get rid of extra '2' at end of new struct names
Now that lib20 and lib21 are distinct, they can have overlapping
struct names. This will be cleaner in the long run, since vboot 2.0
(lib20) is just a temporary stepping stone to vboot 2.1 (lib21). It
would be a shame to need to carry around the overhead of that extra
digit forever.
No functional changes, just a lot of renaming.
BUG=chromium:423882
BRANCH=none
TEST=make runtests && VBOOT2=1 make runtests (works with/withoug VBOOT2 flag)
And compile firmware for veyron_pinky
Change-Id: I25f348fd31e32d08ca576836dfdd1278828765a1
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/233183
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'firmware/2lib/include/2return_codes.h')
| -rw-r--r-- | firmware/2lib/include/2return_codes.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/2lib/include/2return_codes.h b/firmware/2lib/include/2return_codes.h index f41d784e..2cffc56f 100644 --- a/firmware/2lib/include/2return_codes.h +++ b/firmware/2lib/include/2return_codes.h @@ -226,7 +226,7 @@ enum vb2_return_code { /* Key algorithm doesn't match signature algorithm */ VB2_ERROR_VDATA_ALGORITHM_MISMATCH, - /* Bad magic number in vb2_unpack_key2() */ + /* Bad magic number in vb2_unpack_key() */ VB2_ERROR_UNPACK_KEY_MAGIC, /********************************************************************** @@ -362,10 +362,10 @@ enum vb2_return_code { VB2_ERROR_FW_PREAMBLE2_WORKBUF, /* Firmware version out of range in vb2_load_fw_preamble() */ - VB2_ERROR_FW_PREAMBLE2_VERSION_RANGE, + VB2_ERROR_FW_PREAMBLE_VERSION_RANGE, /* Firmware version rollback in vb2_load_fw_preamble() */ - VB2_ERROR_FW_PREAMBLE2_VERSION_ROLLBACK, + VB2_ERROR_FW_PREAMBLE_VERSION_ROLLBACK, /* Not enough space in work buffer for resource object */ VB2_ERROR_READ_RESOURCE_OBJECT_BUF, |