vboot: remove fwlib2x, fwlib20, fwlib21 targets

All vboot "versions" are being coalesced into one, accessible via
the vboot_fw.a library, which is built by the fwlib target.

BUG=b:124141368, chromium:968464
TEST=make clean && make runtests
BRANCH=none

Change-Id: I9ea7f067c9ac732eff7e63aa49e5303b340ede8f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1961714
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>

1 files changed, 6 insertions, 45 deletions

diff --git a/Makefile b/Makefile
index eae7a578..a46b31c1 100644
--- a/Makefile
+++ b/Makefile
@@ -315,7 +315,7 @@ export BUILD_RUN
 
 # Default target.
 .PHONY: all
-all: fwlib fwlib2x fwlib20 fwlib21 futil utillib hostlib cgpt tlcl \
+all: fwlib futil utillib hostlib cgpt tlcl \
 	$(if ${SDK_BUILD},utils_sdk,utils_board) \
 	$(if $(filter x86_64,${ARCH}),fuzzers) \
 	$(if ${COV},coverage)
@@ -345,16 +345,6 @@ endif
 # this source tree locally and link to it directly.
 FWLIB = ${BUILD}/vboot_fw.a
 
-# Smaller firmware library common to all vboot 2.x, used only for
-# 1) compile-time tests of the public API or
-# 2) linking with an actual 2.0 or 2.1 implementation
-FWLIB2X = ${BUILD}/vboot_fw2x.a
-
-# Vboot 2.0 (deprecated - see firmware/README)
-FWLIB20 = ${BUILD}/vboot_fw20.a
-# Vboot 2.1 (not yet ready - see firmware/README)
-FWLIB21 = ${BUILD}/vboot_fw21.a
-
 # Separate TPM lightweight command library (TLCL)
 TLCL = ${BUILD}/tlcl.a
 
@@ -858,8 +848,6 @@ else
 $(info vboot hash algos built with tight loops (slower, smaller code size))
 endif
 
-${FWLIB21_OBJS}: INCLUDES += -Ifirmware/lib21/include
-
 .PHONY: fwlib
 fwlib: $(if ${FIRMWARE_ARCH},${FWLIB},)
 
@@ -869,33 +857,6 @@ ${FWLIB}: ${FWLIB_OBJS} ${FWLIB2X_OBJS} ${FWLIB20_OBJS}
 	@${PRINTF} "    AR            $(subst ${BUILD}/,,$@)\n"
 	${Q}ar qc $@ $^
 
-.PHONY: fwlib2x
-fwlib2x: ${FWLIB2X}
-
-${FWLIB2X}: ${FWLIB2X_OBJS}
-	@${PRINTF} "    RM            $(subst ${BUILD}/,,$@)\n"
-	${Q}rm -f $@
-	@${PRINTF} "    AR            $(subst ${BUILD}/,,$@)\n"
-	${Q}ar qc $@ $^
-
-.PHONY: fwlib20
-fwlib20: ${FWLIB20}
-
-${FWLIB20}: ${FWLIB2X_OBJS} ${FWLIB20_OBJS}
-	@${PRINTF} "    RM            $(subst ${BUILD}/,,$@)\n"
-	${Q}rm -f $@
-	@${PRINTF} "    AR            $(subst ${BUILD}/,,$@)\n"
-	${Q}ar qc $@ $^
-
-.PHONY: fwlib21
-fwlib21: ${FWLIB21}
-
-${FWLIB21}: ${FWLIB2X_OBJS} ${FWLIB21_OBJS}
-	@${PRINTF} "    RM            $(subst ${BUILD}/,,$@)\n"
-	${Q}rm -f $@
-	@${PRINTF} "    AR            $(subst ${BUILD}/,,$@)\n"
-	${Q}ar qc $@ $^
-
 .PHONY: tlcl
 tlcl: ${TLCL}
 
@@ -1038,7 +999,7 @@ futil: ${FUTIL_BIN}
 FUTIL_LIBS = ${CRYPTO_LIBS} ${LIBZIP_LIBS}
 
 ${FUTIL_BIN}: LDLIBS += ${FUTIL_LIBS}
-${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB} ${FWLIB20}
+${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB} ${FWLIB}
 	@${PRINTF} "    LD            $(subst ${BUILD}/,,$@)\n"
 	${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $^ ${LDLIBS}
 
@@ -1082,11 +1043,11 @@ ${TEST_FUTIL_BINS}: INCLUDES += -Ifutility
 ${TEST_FUTIL_BINS}: OBJS += ${FUTIL_OBJS} ${UTILLIB}
 ${TEST_FUTIL_BINS}: LDLIBS += ${FUTIL_LIBS}
 
-${TEST2X_BINS}: ${FWLIB2X}
-${TEST2X_BINS}: LIBS += ${FWLIB2X}
+${TEST2X_BINS}: ${FWLIB}
+${TEST2X_BINS}: LIBS += ${FWLIB}
 
-${TEST20_BINS}: ${FWLIB20}
-${TEST20_BINS}: LIBS += ${FWLIB20}
+${TEST20_BINS}: ${FWLIB}
+${TEST20_BINS}: LIBS += ${FWLIB}
 ${TEST20_BINS}: LDLIBS += ${CRYPTO_LIBS}
 
 ${TESTLIB}: ${TESTLIB_OBJS}