summaryrefslogtreecommitdiff
path: root/Makefile
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 /Makefile
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 'Makefile')
-rw-r--r--Makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 013c6d8a..d61844b4 100644
--- a/Makefile
+++ b/Makefile
@@ -320,7 +320,6 @@ BDBLIB = ${BUILD}/bdb.a
# Firmware library sources needed by VbInit() call
VBINIT_SRCS = \
firmware/lib/vboot_common_init.c \
- firmware/lib/vboot_nvstorage.c \
firmware/lib/region-init.c \
# Additional firmware library sources needed by VbSelectFirmware() call
@@ -496,13 +495,13 @@ HOSTLIB_SRCS = \
cgpt/cgpt_create.c \
cgpt/cgpt_prioritize.c \
firmware/2lib/2crc8.c \
+ firmware/2lib/2nvstorage.c \
firmware/2lib/2stub.c \
firmware/lib/cgptlib/cgptlib_internal.c \
firmware/lib/cgptlib/crc32.c \
firmware/lib/gpt_misc.c \
${TLCL_SRCS} \
firmware/lib/utility_string.c \
- firmware/lib/vboot_nvstorage.c \
firmware/stub/tpm_lite_stub.c \
firmware/stub/vboot_api_stub.c \
firmware/stub/vboot_api_stub_disk.c \
@@ -736,7 +735,6 @@ TEST_NAMES = \
tests/vboot_common_tests \
tests/vboot_display_tests \
tests/vboot_kernel_tests \
- tests/vboot_nvstorage_test \
tests/verify_kernel
ifeq (${TPM2_MODE},)
@@ -1440,7 +1438,6 @@ endif
${RUNTEST} ${BUILD_RUN}/tests/vboot_common_tests
${RUNTEST} ${BUILD_RUN}/tests/vboot_display_tests
${RUNTEST} ${BUILD_RUN}/tests/vboot_kernel_tests
- ${RUNTEST} ${BUILD_RUN}/tests/vboot_nvstorage_test
.PHONY: run2tests
run2tests: test_setup