Patch set updated for coreboot: 5cc5842 vboot: use out_flags to indicate dev mode

[Stefan Reinauer]

Stefan Reinauer ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4218

-gerrit

commit 5cc5842fbb11efd5baaca30febe925e024801499
Author: Aaron Durbin 
Date:   Tue Jun 4 08:57:54 2013 -0500

vboot: use out_flags to indicate dev mode

In order to make the proper decision on loading the
    option rom or not the developer mode setting needs to be
    known. Under early firmware selection it is possible to know
    the state of developer mode by a flag in out flags. Use this
    flag when early firmware selection is being employed to determine
    if developer mode is enabled or not.

Change-Id: I9c226d368e92ddf8f14ce4dcde00da144de2a5f3
    Signed-off-by: Aaron Durbin 
    Reviewed-on: https://gerrit.chromium.org/gerrit/57380
    Reviewed-by: Duncan Laurie 
---
 src/vendorcode/google/chromeos/chromeos.c | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/vendorcode/google/chromeos/chromeos.c b/src/vendorcode/google/chromeos/chromeos.c
index 6f1fe72..c2cc0e1 100644
--- a/src/vendorcode/google/chromeos/chromeos.c
+++ b/src/vendorcode/google/chromeos/chromeos.c
@@ -26,9 +26,28 @@
 #include <cbmem.h>
 #include <console/console.h>

+#if CONFIG_VBOOT_VERIFY_FIRMWARE
+static int vboot_enable_developer(void)
+{
+	struct vboot_handoff *vbho;
+
+	vbho = cbmem_find(CBMEM_ID_VBOOT_HANDOFF);
+
+	if (vbho == NULL) {
+		printk(BIOS_ERR, "%s: Couldn't find vboot_handoff structure!\n",
+		        __func__);
+		return 0;
+	}
+
+	return !!(vbho->init_params.out_flags & VB_INIT_OUT_ENABLE_DEVELOPER);
+}
+#else
+static inline int vboot_enable_developer(void) { return 0; }
+#endif
+
 int developer_mode_enabled(void)
 {
-	return get_developer_mode_switch();
+	return get_developer_mode_switch() || vboot_enable_developer();
 }

int recovery_mode_enabled(void)