[coreboot-gerrit] Patch set updated for coreboot: vendorcode/chromeos: Change VBOOT stage to "choice" from "config"

[Alexandru Gagniuc (mr.nuke.me@gmail.com)]

Alexandru Gagniuc (mr.nuke.me at gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12907

-gerrit

commit e54558222743acc84302161270937f847e1bdb7a
Author: Alexandru Gagniuc <alexandrux.gagniuc at intel.com>
Date:   Tue Jan 12 08:57:41 2016 -0800

    vendorcode/chromeos: Change VBOOT stage to "choice" from "config"
    
    In order for chromeos/vboot2 to work correctly, either
    VBOOT_STARTS_IN_BOOTBLOCK or VBOOT_STARTS_IN_ROMSTAGE must be
    selected. The current "config"-based selection system allows a build
    in which none of the options are enabled. This causes vboot to execute
    with an uninitialized context, which results in the platform crashing.
    Change that to a "choice"-based selection such that one of the options
    will always be enabled.
    
    Change-Id: I03034e0c2da54d0d141ad50ce93679ffb9daa203
    Signed-off-by: Alexandru Gagniuc <alexandrux.gagniuc at intel.com>
---
 src/vendorcode/google/chromeos/vboot2/Kconfig | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/vendorcode/google/chromeos/vboot2/Kconfig b/src/vendorcode/google/chromeos/vboot2/Kconfig
index 7580d8d..78cd701 100644
--- a/src/vendorcode/google/chromeos/vboot2/Kconfig
+++ b/src/vendorcode/google/chromeos/vboot2/Kconfig
@@ -1,6 +1,8 @@
 ## This file is part of the coreboot project.
 ##
 ## Copyright (C) 2014 The ChromiumOS Authors.  All rights reserved.
+## Copyright (C) 2015 Intel Corp.
+## (Written by Alexandru Gagniuc <alexandrux.gagniuc at intel.com> for Intel Corp.)
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -12,20 +14,23 @@
 ## GNU General Public License for more details.
 ##
 
+choice
+	prompt "When VBOOT verification should begin"
+	depends on VBOOT_VERIFY_FIRMWARE
+	default VBOOT_STARTS_IN_BOOTBLOCK
+
 config VBOOT_STARTS_IN_BOOTBLOCK
 	bool "Vboot starts verifying in bootblock"
-	default n
-	depends on VBOOT_VERIFY_FIRMWARE
 	help
 	  Firmware verification happens during or at the end of bootblock.
 
 config VBOOT_STARTS_IN_ROMSTAGE
 	bool "Vboot starts verifying in romstage"
-	default n
-	depends on VBOOT_VERIFY_FIRMWARE && !VBOOT_STARTS_IN_BOOTBLOCK
 	help
 	  Firmware verification happens during or at the end of romstage.
 
+endchoice
+
 config VBOOT2_MOCK_SECDATA
 	bool "Mock secdata for firmware verification"
 	default n