diff options
| author | Patrick Georgi <pgeorgi@chromium.org> | 2015-04-27 18:13:50 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-04-28 10:20:35 +0200 |
| commit | efc6aa0eb928a27e625eb62ca848de7e191c5b67 (patch) | |
| tree | e77d0543439871a94fa1c17e2f8a5c353dccefbb /src/vendorcode | |
| parent | 8f2b0dc16ba4395ded62bd10f23ce6f67a1b1a7c (diff) | |
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>
Diffstat (limited to 'src/vendorcode')
| -rw-r--r-- | src/vendorcode/google/chromeos/vboot2/Kconfig | 10 | ||||
| -rw-r--r-- | src/vendorcode/google/chromeos/vboot2/Makefile.inc | 4 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/vendorcode/google/chromeos/vboot2/Kconfig b/src/vendorcode/google/chromeos/vboot2/Kconfig index cfa22b6da6..01011f81da 100644 --- a/src/vendorcode/google/chromeos/vboot2/Kconfig +++ b/src/vendorcode/google/chromeos/vboot2/Kconfig @@ -62,3 +62,13 @@ config VBOOT_DISABLE_DEV_ON_RECOVERY When this option is enabled, the Chrome OS device leaves the developer mode as soon as recovery request is detected. This is 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 diff --git a/src/vendorcode/google/chromeos/vboot2/Makefile.inc b/src/vendorcode/google/chromeos/vboot2/Makefile.inc index 14bf31ec03..b2d2dc1035 100644 --- a/src/vendorcode/google/chromeos/vboot2/Makefile.inc +++ b/src/vendorcode/google/chromeos/vboot2/Makefile.inc @@ -57,7 +57,11 @@ $(VB2_LIB): $(obj)/config.h verstage-srcs += $(VB2_LIB) +ifeq ($(CONFIG_SEPARATE_VERSTAGE),y) cbfs-files-y += $(call strip_quotes,$(CONFIG_CBFS_PREFIX))/verstage fallback/verstage-file = $(objcbfs)/verstage.elf fallback/verstage-type = stage fallback/verstage-compression = none +else +bootblock-srcs += $(objgenerated)/libverstage.a +endif |