diff options
| author | Randall Spangler <rspangler@chromium.org> | 2016-10-14 11:04:27 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-10-29 19:41:08 -0700 |
| commit | 13b109762a3bfec025a9bfcb3ead927d0291280e (patch) | |
| tree | 7cc62ff1a42b8979223ab0ee3894cd70bcb71983 /Makefile | |
| parent | f41cd04d9eeefe7b7b98c67484ee96ba4fbf1125 (diff) | |
| download | vboot-13b109762a3bfec025a9bfcb3ead927d0291280e.tar.gz | |
vboot: use vb2 verification functions for kernel verification
This removes old vboot1 functions in favor of the new vboot2 functions.
BUG=chromium:611535
BRANCH=none
TEST=make runtests; emerge-kevin coreboot depthcharge
Change-Id: Idc64f7714bbd9d4fa82d14b6b5d73d71c61de854
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/400900
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 1 insertions, 9 deletions
@@ -740,8 +740,6 @@ TEST_NAMES = \ tests/vboot_api_kernel6_tests \ tests/vboot_audio_tests \ tests/vboot_common_tests \ - tests/vboot_common2_tests \ - tests/vboot_common3_tests \ tests/vboot_display_tests \ tests/vboot_kernel_tests \ tests/vboot_nvstorage_test \ @@ -941,7 +939,7 @@ fwlinktest: ${BUILD}/firmware/linktest/main .PHONY: fwlib fwlib: $(if ${FIRMWARE_ARCH},${FWLIB},fwlinktest) -${FWLIB}: ${FWLIB_OBJS} ${FWLIB2X_OBJS} +${FWLIB}: ${FWLIB_OBJS} ${FWLIB2X_OBJS} ${FWLIB20_OBJS} @${PRINTF} " RM $(subst ${BUILD}/,,$@)\n" ${Q}rm -f $@ @${PRINTF} " AR $(subst ${BUILD}/,,$@)\n" @@ -1260,8 +1258,6 @@ ${BUILD}/utility/bdb_extend: LDLIBS += ${CRYPTO_LIBS} ${BUILD}/utility/bdb_extend: LIBS += ${UTILBDB} ${FWLIB2X} ${BUILD}/host/linktest/main: LDLIBS += ${CRYPTO_LIBS} -${BUILD}/tests/vboot_common2_tests: LDLIBS += ${CRYPTO_LIBS} -${BUILD}/tests/vboot_common3_tests: LDLIBS += ${CRYPTO_LIBS} ${BUILD}/tests/vb20_common2_tests: LDLIBS += ${CRYPTO_LIBS} ${BUILD}/tests/vb20_common3_tests: LDLIBS += ${CRYPTO_LIBS} ${BUILD}/tests/verify_kernel: LDLIBS += ${CRYPTO_LIBS} @@ -1438,8 +1434,6 @@ endif ${RUNTEST} ${BUILD_RUN}/tests/vboot_api_kernel6_tests ${RUNTEST} ${BUILD_RUN}/tests/vboot_audio_tests ${RUNTEST} ${BUILD_RUN}/tests/vboot_common_tests - ${RUNTEST} ${BUILD_RUN}/tests/vboot_common2_tests ${TEST_KEYS} - ${RUNTEST} ${BUILD_RUN}/tests/vboot_common3_tests ${TEST_KEYS} ${RUNTEST} ${BUILD_RUN}/tests/vboot_display_tests ${RUNTEST} ${BUILD_RUN}/tests/vboot_kernel_tests ${RUNTEST} ${BUILD_RUN}/tests/vboot_nvstorage_test @@ -1488,8 +1482,6 @@ runfutiltests: test_setup # Not run by automated build. .PHONY: runlongtests runlongtests: test_setup genkeys genfuzztestcases - ${RUNTEST} ${BUILD_RUN}/tests/vboot_common2_tests ${TEST_KEYS} --all - ${RUNTEST} ${BUILD_RUN}/tests/vboot_common3_tests ${TEST_KEYS} --all ${RUNTEST} ${BUILD_RUN}/tests/vb20_common2_tests ${TEST_KEYS} --all ${RUNTEST} ${BUILD_RUN}/tests/vb20_common3_tests ${TEST_KEYS} --all ${RUNTEST} ${BUILD_RUN}/tests/vb21_common2_tests ${TEST_KEYS} --all |