[coreboot-gerrit] New patch to review for coreboot: 1731c22 vboot: fix vboot_reference compilation

[Aaron Durbin (adurbin@chromium.org)]

Aaron Durbin (adurbin at chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10152

-gerrit

commit 1731c22de737e4452b0aee939e84cc483d11e3f1
Author: Aaron Durbin <adurbin at chromium.org>
Date:   Fri May 8 15:58:06 2015 -0500

    vboot: fix vboot_reference compilation
    
    The VB_FIRMWARE_ARCH variable was not being set correctly,
    and the VBOOT_STARTS_IN_BOOTBLOCK Kconfig option was not properly
    prefixed with CONFIG_. Correct both of these oversights.
    
    Change-Id: Id27974c285d2629bd47b90b6a93aca1ec8a76512
    Signed-off-by: Aaron Durbin <adurbin at chromium.org>
---
 src/vendorcode/google/chromeos/vboot2/Makefile.inc | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/vendorcode/google/chromeos/vboot2/Makefile.inc b/src/vendorcode/google/chromeos/vboot2/Makefile.inc
index a27e2fc..e9377b2 100644
--- a/src/vendorcode/google/chromeos/vboot2/Makefile.inc
+++ b/src/vendorcode/google/chromeos/vboot2/Makefile.inc
@@ -39,7 +39,16 @@ romstage-y += vboot_handoff.c common.c
 
 verstage-y += verstage.ld
 
-VB_FIRMWARE_ARCH := $(ARCHDIR-$(ARCH-VERSTAGE-y))
+ifeq ($(CONFIG_SEPARATE_VERSTAGE),y)
+VB_FIRMWARE_ARCH := $(ARCHDIR-$(ARCH-verstage-y))
+else
+ifeq ($(CONFIG_VBOOT_STARTS_IN_BOOTBLOCK),y)
+VB_FIRMWARE_ARCH := $(ARCHDIR-$(ARCH-bootblock-y))
+else
+VB_FIRMWARE_ARCH := $(ARCHDIR-$(ARCH-romstage-y))
+endif
+endif # CONFIG_SEPARATE_VERSTAGE
+
 VB2_LIB = $(obj)/external/vboot_reference/vboot_fw20.a
 VBOOT_CFLAGS += $(patsubst -I%,-I$(top)/%,$(filter-out -include $(src)/include/kconfig.h, $(CPPFLAGS_verstage)))
 VBOOT_CFLAGS += $(libverstage-c-ccopts)
@@ -64,7 +73,7 @@ $(call strip_quotes,$(CONFIG_CBFS_PREFIX))/verstage-file = $(objcbfs)/verstage.e
 $(call strip_quotes,$(CONFIG_CBFS_PREFIX))/verstage-type = stage
 $(call strip_quotes,$(CONFIG_CBFS_PREFIX))/verstage-compression = none
 else
-ifeq ($(VBOOT_STARTS_IN_BOOTBLOCK),y)
+ifeq ($(CONFIG_VBOOT_STARTS_IN_BOOTBLOCK),y)
 bootblock-srcs += $(objgenerated)/libverstage.a
 else
 romstage-srcs += $(objgenerated)/libverstage.a