vboot2: Allow merging verstage into bootblock

Change-Id: I31cd7f84db8b7176c8854f33421aab5c176cd5ce
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: http://review.coreboot.org/10007
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Patrick Georgi 2015-04-27 18:13:50 +02:00 committed by Patrick Georgi
parent 8f2b0dc16b
commit efc6aa0eb9
2 changed files with 14 additions and 0 deletions

View File

@ -62,3 +62,13 @@ config VBOOT_DISABLE_DEV_ON_RECOVERY
When this option is enabled, the Chrome OS device leaves the When this option is enabled, the Chrome OS device leaves the
developer mode as soon as recovery request is detected. This is developer mode as soon as recovery request is detected. This is
handy on embedded devices with limited input capabilities. handy on embedded devices with limited input capabilities.
config VERSTAGE_IN_BOOTBLOCK
bool
default n
depends on VBOOT2_VERIFY_FIRMWARE
config SEPARATE_VERSTAGE
bool
default !VERSTAGE_IN_BOOTBLOCK
depends on VBOOT2_VERIFY_FIRMWARE

View File

@ -57,7 +57,11 @@ $(VB2_LIB): $(obj)/config.h
verstage-srcs += $(VB2_LIB) verstage-srcs += $(VB2_LIB)
ifeq ($(CONFIG_SEPARATE_VERSTAGE),y)
cbfs-files-y += $(call strip_quotes,$(CONFIG_CBFS_PREFIX))/verstage cbfs-files-y += $(call strip_quotes,$(CONFIG_CBFS_PREFIX))/verstage
fallback/verstage-file = $(objcbfs)/verstage.elf fallback/verstage-file = $(objcbfs)/verstage.elf
fallback/verstage-type = stage fallback/verstage-type = stage
fallback/verstage-compression = none fallback/verstage-compression = none
else
bootblock-srcs += $(objgenerated)/libverstage.a
endif