futility: add vbutil_keyblock into the built-in features
BUG=chromium:224734
BRANCH=ToT
TEST=make runtests
Change-Id: Ie9efdcf0b69ab4697f050643b8f2f588e22d20d7
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/208368
Reviewed-by: Randall Spangler <rspangler@chromium.org>
diff --git a/Makefile b/Makefile
index 2224675..fa14a2c 100644
--- a/Makefile
+++ b/Makefile
@@ -487,8 +487,7 @@
utility/tpm_init_temp_fix \
utility/tpmc \
utility/vbutil_firmware \
- utility/vbutil_kernel \
- utility/vbutil_keyblock \
+ utility/vbutil_kernel
ifeq (${MINIMAL},)
UTIL_NAMES += \
@@ -552,6 +551,7 @@
FUTIL_SRCS = \
$(FUTIL_STATIC_SRCS) \
futility/cmd_vbutil_key.c \
+ futility/cmd_vbutil_keyblock.c \
futility/cmd_hey.c
FUTIL_LDS = futility/futility.lds
@@ -997,7 +997,6 @@
${BUILD}/utility/dev_sign_file: LDLIBS += ${CRYPTO_LIBS}
${BUILD}/utility/vbutil_firmware: LDLIBS += ${CRYPTO_LIBS}
${BUILD}/utility/vbutil_kernel: LDLIBS += ${CRYPTO_LIBS}
-${BUILD}/utility/vbutil_keyblock: LDLIBS += ${CRYPTO_LIBS}
${BUILD}/host/linktest/main: LDLIBS += ${CRYPTO_LIBS}
${BUILD}/tests/vb2_common2_tests: LDLIBS += ${CRYPTO_LIBS}