vboot: use VBNV_ constants with VbNvGet()

The vboot1 library VbNvGet() / VbNvSet() functions use enum VbNvParam
(VBNV_*) constants.

The vboot2 library vb2_nv_get() / vb2_nv_set() functions use enum
vb2_nv_param constants.

Do not mix the two.  In the one instance where this happens in the
current code, we get lucky, because VBNV_DEV_BOOT_FASTBOOT_FULL_CAP
and VB2_NV_DEV_BOOT_FASTBOOT_FULL_CAP evaluate to the same value, so
this was harmless.  But fix that now so nobody else copy/pastes that
pattern for a param where this isn't true.

BUG=none
BRANCH=none
TEST=make runtests

Change-Id: I1facbe1d97591dc8b1e6b38717924b884949da57
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/764970
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Randall Spangler
2017-10-30 15:43:17 -07:00
committed by chrome-bot
parent db79418605
commit ff82ffb0a9

View File

@@ -511,7 +511,7 @@ VbError_t VbVerifyMemoryBootImage(VbCommonParams *cparams,
dev_switch = shared->flags & VBSD_BOOT_DEV_SWITCH_ON;
VbNvLoad();
VbNvGet(&vnc, VB2_NV_DEV_BOOT_FASTBOOT_FULL_CAP,
VbNvGet(&vnc, VBNV_DEV_BOOT_FASTBOOT_FULL_CAP,
&allow_fastboot_full_cap);
if (0 == allow_fastboot_full_cap) {