summaryrefslogtreecommitdiff
path: root/firmware/lib/include
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2017-11-27 15:37:13 -0800
committerchrome-bot <chrome-bot@chromium.org>2017-12-11 15:16:25 -0800
commitdff5852c2f41c240842b49549b212c36287d5e26 (patch)
tree20f31422c7dd6868ce58b156634ab5290963acfc /firmware/lib/include
parent626340420e2ebc42f8f24b0b2c3d56cc73dc6e60 (diff)
downloadvboot-dff5852c2f41c240842b49549b212c36287d5e26.tar.gz
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
Diffstat (limited to 'firmware/lib/include')
-rw-r--r--firmware/lib/include/load_kernel_fw.h6
-rw-r--r--firmware/lib/include/vboot_display.h2
2 files changed, 0 insertions, 8 deletions
diff --git a/firmware/lib/include/load_kernel_fw.h b/firmware/lib/include/load_kernel_fw.h
index ca49b3c6..08e55787 100644
--- a/firmware/lib/include/load_kernel_fw.h
+++ b/firmware/lib/include/load_kernel_fw.h
@@ -10,7 +10,6 @@
#define VBOOT_REFERENCE_LOAD_KERNEL_FW_H_
#include "vboot_api.h"
-#include "vboot_nvstorage.h"
struct vb2_context;
@@ -38,11 +37,6 @@ typedef struct LoadKernelParams {
uint64_t kernel_buffer_size;
/* Boot flags */
uint64_t boot_flags;
- /*
- * Context for NV storage. Caller is responsible for calling
- * VbNvSetup() and VbNvTeardown() on the context.
- */
- VbNvContext *nv_context;
/* Firmware management parameters; may be NULL if not present. */
const struct RollbackSpaceFwmp *fwmp;
diff --git a/firmware/lib/include/vboot_display.h b/firmware/lib/include/vboot_display.h
index 2f237533..fbb04e13 100644
--- a/firmware/lib/include/vboot_display.h
+++ b/firmware/lib/include/vboot_display.h
@@ -9,8 +9,6 @@
#define VBOOT_REFERENCE_VBOOT_DISPLAY_H_
#include "bmpblk_font.h"
-#include "vboot_api.h"
-#include "vboot_nvstorage.h"
struct vb2_context;