futility: extract vb2_verify_fw to an external test

The vb2_verify_fw command is used only in a host-side test. It
doesn't need to be built into futility. This makes it a separate
executable used just for that test.

BUG=chromium:231547
BRANCH=none
TEST=make VBOOT2=1 runtests

Note that tests/vb2_firmware_tests.sh still passes, now using an
external vb2_verify_fw executable instead of a futility command.

Change-Id: Iee58df065e7a762369c5e691f6c2093de9122ed2
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/243630
diff --git a/Makefile b/Makefile
index 288752d..21586e1 100644
--- a/Makefile
+++ b/Makefile
@@ -596,11 +596,6 @@
 	futility/traversal.c \
 	futility/vb1_helper.c
 
-ifneq (${VBOOT2},)
-FUTIL_SRCS += \
-	futility/cmd_vb2_verify_fw.c
-endif
-
 # List of commands built in futility and futility_s.
 FUTIL_STATIC_CMD_LIST = ${BUILD}/gen/futility_static_cmds.c
 FUTIL_CMD_LIST = ${BUILD}/gen/futility_cmds.c
@@ -679,9 +674,11 @@
 	tests/vb20_api_tests \
 	tests/vb20_common_tests \
 	tests/vb20_common2_tests \
+	tests/vb20_verify_fw.c \
 	tests/vb20_common3_tests \
 	tests/vb20_misc_tests \
-	tests/vb20_rsa_padding_tests
+	tests/vb20_rsa_padding_tests \
+	tests/vb20_verify_fw
 
 TEST21_NAMES = \
 	tests/vb21_api_tests \