vboot: Use 2nvstorage instead of vboot_nvstorage

Remove the old vboot1 vboot_nvstorage library (VbNv*() functions) and
use the vboot2 library (vb2_nv_*()) instead.  This is needed in
preparation for moving to 64-byte records; no sense in implementing
that change twice...

Should be (better be) no change in system behavior.

BUG=chromium:789276
BRANCH=none
TEST=make runtests
     compare output of crossystem before/after change (should be identical)

Change-Id: I10f9975b0824263064b9a74a3c6daadcecc085d3
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/794732

1 files changed, 5 insertions, 5 deletions

diff --git a/host/include/crossystem_vbnv.h b/host/include/crossystem_vbnv.h
index 64e0c7c7..64b6b1d6 100644
--- a/host/include/crossystem_vbnv.h
+++ b/host/include/crossystem_vbnv.h
@@ -12,21 +12,21 @@
 extern "C" {
 #endif
 
-#include <vboot_nvstorage.h>
+struct vb2_context;
 
 /**
- * Attempt to read VbNvContext using mosys.
+ * Attempt to read non-volatile storage using mosys.
  *
  * Returns 0 if success, non-zero if error.
  */
-int VbReadNvStorage_mosys(VbNvContext* vnc);
+int vb2_read_nv_storage_mosys(struct vb2_context *ctx);
 
 /**
- * Attempt to write VbNvContext using mosys.
+ * Attempt to write non-volatile storage using mosys.
  *
  * Returns 0 if success, non-zero if error.
  */
-int VbWriteNvStorage_mosys(VbNvContext* vnc);
+int vb2_write_nv_storage_mosys(struct vb2_context* ctx);
 
 #ifdef __cplusplus
 }