[coreboot-gerrit] Change in coreboot[master]: security/vboot: Build vboot library with same .a that depthcharge uses

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/36341 )

Change subject: security/vboot: Build vboot library with same .a that depthcharge uses
......................................................................

security/vboot: Build vboot library with same .a that depthcharge uses

Currently, depthcharge and coreboot are using two different vboot libraries.
coreboot is using "fwlib20", while depthcharge uses "fwlib".  The only
difference between the two libraries is the inclusion of vboot1-only
compilation units in fwlib, which are now deprecated.  Therefore, coreboot
may as well use fwlib too.  Vboot is expected to converge on a single firmware
library soon.

BUG=none
BRANCH=none
TEST=compiles and runs verstage correctly

Change-Id: I905b781c3596965ec7ef45a2a7eafe15fdd4d9cc
Signed-off-by: Tim Wawrzynczak 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36341
Reviewed-by: Julius Werner 
Tested-by: build bot (Jenkins) 
---
M src/security/vboot/Makefile.inc
1 file changed, 5 insertions(+), 5 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Julius Werner: Looks good to me, approved

diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc
index 87cd91c..30c947c 100644
--- a/src/security/vboot/Makefile.inc
+++ b/src/security/vboot/Makefile.inc
@@ -110,24 +110,24 @@
 # call with $1 = stage name to create rules for building the library
 # for the stage and adding it to the stage's set of object files.
 define vboot-for-stage
-VB2_LIB_$(1) = $(obj)/external/vboot_reference-$(1)/vboot_fw20.a
+VBOOT_LIB_$(1) = $(obj)/external/vboot_reference-$(1)/vboot_fw.a
 VBOOT_CFLAGS_$(1) += $$(call vboot-fixup-includes,$$(CPPFLAGS_$(1)))
 VBOOT_CFLAGS_$(1) += $$(CFLAGS_$(1))
 VBOOT_CFLAGS_$(1) += $$(call vboot-fixup-includes,$$($(1)-c-ccopts))
 VBOOT_CFLAGS_$(1) += -I$(abspath $(obj)) -Wno-missing-prototypes
 VBOOT_CFLAGS_$(1) += -DVBOOT_DEBUG

-$$(VB2_LIB_$(1)): $(obj)/config.h
+$$(VBOOT_LIB_$(1)): $(obj)/config.h
    printf "    MAKE       $(subst $(obj)/,,$(@))\n"
    +FIRMWARE_ARCH=$$(ARCHDIR-$$(ARCH-$(1)-y)) \
    CC="$$(CC_$(1))" \
    CFLAGS="$$(VBOOT_CFLAGS_$(1))" VBOOT2="y" \
    $(MAKE) -C $(VBOOT_SOURCE) \
-		BUILD=$$(abspath $$(dir $$(VB2_LIB_$(1)))) \
+		BUILD=$$(abspath $$(dir $$(VBOOT_LIB_$(1)))) \
    	V=$(V) \
-		fwlib20
+		fwlib

-$(1)-srcs += $$(VB2_LIB_$(1))
+$(1)-srcs += $$(VBOOT_LIB_$(1))

endef # vboot-for-stage