aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2015-05-08 15:58:06 -0500
committerAaron Durbin <adurbin@chromium.org>2015-05-11 18:37:04 +0200
commitd1cf44c596ad8a1c6dd0ef8a1a205730043d5ceb (patch)
treeb8ba6a29bfaedb45047b4b80dc84c25ce86a4641
parente385b37126952c824c9d729882c29d10dbf675d7 (diff)
downloadcoreboot-d1cf44c596ad8a1c6dd0ef8a1a205730043d5ceb.tar.gz
coreboot-d1cf44c596ad8a1c6dd0ef8a1a205730043d5ceb.tar.xz
coreboot-d1cf44c596ad8a1c6dd0ef8a1a205730043d5ceb.zip
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@chromium.org> Reviewed-on: http://review.coreboot.org/10152 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
-rw-r--r--src/vendorcode/google/chromeos/vboot2/Makefile.inc13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/vendorcode/google/chromeos/vboot2/Makefile.inc b/src/vendorcode/google/chromeos/vboot2/Makefile.inc
index a27e2fca1..e9377b233 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