[coreboot-gerrit] New patch to review for coreboot: don't submit: drop vboot makefiles, and fully integrate in coreboot

[Stefan Reinauer (stefan.reinauer@coreboot.org)]

Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10765

-gerrit

commit fb837706bf7eb47fc791115dacadcb97f74e929a
Author: Stefan Reinauer <stefan.reinauer at coreboot.org>
Date:   Wed Jul 1 19:03:52 2015 -0700

    don't submit: drop vboot makefiles, and fully integrate in coreboot
    
    Change-Id: I2b40a9d35f6d662db6b31b0413a57c5cef80dc97
---
 src/vendorcode/google/chromeos/vboot2/Makefile.inc | 23 +++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/vendorcode/google/chromeos/vboot2/Makefile.inc b/src/vendorcode/google/chromeos/vboot2/Makefile.inc
index 9026df6..8d60070 100644
--- a/src/vendorcode/google/chromeos/vboot2/Makefile.inc
+++ b/src/vendorcode/google/chromeos/vboot2/Makefile.inc
@@ -71,7 +71,28 @@ $(VB2_LIB): $(obj)/config.h
 		V=$(V) \
 		fwlib20
 
-libverstage-srcs += $(VB2_LIB)
+#libverstage-srcs += $(VB2_LIB)
+
+VBOOT=../../../../../3rdparty/vboot
+
+libverstage-y += $(VBOOT)/firmware/2lib/2api.c
+libverstage-y += $(VBOOT)/firmware/2lib/2common.c
+libverstage-y += $(VBOOT)/firmware/2lib/2crc8.c
+libverstage-y += $(VBOOT)/firmware/2lib/2misc.c
+libverstage-y += $(VBOOT)/firmware/2lib/2nvstorage.c
+libverstage-y += $(VBOOT)/firmware/2lib/2rsa.c
+libverstage-y += $(VBOOT)/firmware/2lib/2secdata.c
+libverstage-y += $(VBOOT)/firmware/2lib/2sha1.c
+libverstage-y += $(VBOOT)/firmware/2lib/2sha256.c
+libverstage-y += $(VBOOT)/firmware/2lib/2sha512.c
+libverstage-y += $(VBOOT)/firmware/2lib/2sha_utility.c
+libverstage-y += $(VBOOT)/firmware/2lib/2tpm_bootmode.c
+libverstage-y += $(VBOOT)/firmware/lib20/api.c
+libverstage-y += $(VBOOT)/firmware/lib20/common.c
+libverstage-y += $(VBOOT)/firmware/lib20/misc.c
+libverstage-y += $(VBOOT)/firmware/lib20/packed_key.c
+libverstage-c-ccopts += -I3rdparty/vboot/firmware/2lib/include
+libverstage-c-ccopts += -I3rdparty/vboot/firmware/lib20/include
 
 ifeq ($(CONFIG_SEPARATE_VERSTAGE),y)
 cbfs-files-y += $(call strip_quotes,$(CONFIG_CBFS_PREFIX))/verstage