From efc6aa0eb928a27e625eb62ca848de7e191c5b67 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Mon, 27 Apr 2015 18:13:50 +0200 Subject: [PATCH] vboot2: Allow merging verstage into bootblock Change-Id: I31cd7f84db8b7176c8854f33421aab5c176cd5ce Signed-off-by: Patrick Georgi Reviewed-on: http://review.coreboot.org/10007 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/vendorcode/google/chromeos/vboot2/Kconfig | 10 ++++++++++ src/vendorcode/google/chromeos/vboot2/Makefile.inc | 4 ++++ 2 files changed, 14 insertions(+) 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