[coreboot-gerrit] Change in ...coreboot[master]: security/vboot: Add VB2_LIB to romstage sources without dependencies

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/29827 )

Change subject: security/vboot: Add VB2_LIB to romstage sources without dependencies
......................................................................

security/vboot: Add VB2_LIB to romstage sources without dependencies

The coming feature "measured boot" relies on VB2_LIB in romstage. In the
case where there is no separate verstage, compile the library just for
romstage as it will then be shared across verstage and romstage code. If
there is a separate verstage, compile the library separately for
verstage and romstage.

Change-Id: I8126c21b8fbe8dd65d95af49cbe2ad776b8ef605
Signed-off-by: Werner Zeh <werner.zeh at siemens.com>
Reviewed-on: https://review.coreboot.org/c/29827
Tested-by: build bot (Jenkins) <no-reply at coreboot.org>
Reviewed-by: Philipp Deppenwiese <zaolin.daisuki at gmail.com>
---
M src/security/vboot/Makefile.inc
1 file changed, 2 insertions(+), 4 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Philipp Deppenwiese: Looks good to me, approved



diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc
index da5d5b1..ae80a02 100644
--- a/src/security/vboot/Makefile.inc
+++ b/src/security/vboot/Makefile.inc
@@ -110,16 +110,14 @@
 
 CFLAGS_common += -I3rdparty/vboot/firmware/2lib/include
 
-$(eval $(call vboot-for-stage,verstage))
 $(eval $(call vboot-for-stage,bootblock))
+$(eval $(call vboot-for-stage,romstage))
 $(eval $(call vboot-for-stage,ramstage))
 $(eval $(call vboot-for-stage,postcar))
 
 ifeq ($(CONFIG_VBOOT_SEPARATE_VERSTAGE),y)
 
-ifeq ($(CONFIG_VBOOT_HAS_REC_HASH_SPACE),y)
-$(eval $(call vboot-for-stage,romstage))
-endif
+$(eval $(call vboot-for-stage,verstage))
 
 cbfs-files-$(CONFIG_VBOOT_SEPARATE_VERSTAGE) += $(CONFIG_CBFS_PREFIX)/verstage
 $(CONFIG_CBFS_PREFIX)/verstage-file := $(objcbfs)/verstage.elf

-- 
To view, visit https://review.coreboot.org/c/coreboot/+/29827
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I8126c21b8fbe8dd65d95af49cbe2ad776b8ef605
Gerrit-Change-Number: 29827
Gerrit-PatchSet: 3
Gerrit-Owner: Werner Zeh <werner.zeh at siemens.com>
Gerrit-Reviewer: Martin Roth <martinroth at google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi at google.com>
Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki at gmail.com>
Gerrit-Reviewer: Werner Zeh <werner.zeh at siemens.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply at coreboot.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20181128/7a3c02e6/attachment.html>