Patch set updated for coreboot: 0898957 vboot2: read dev and recovery switch

[Marc Jones]

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

-gerrit

commit 08989572c71edb871ef7087829e8b274938e664f
Author: Daisuke Nojiri 
Date:   Mon Jun 30 09:56:32 2014 -0700

vboot2: read dev and recovery switch

TEST=Built with VBOOT2_VERIFY_FIRMWARE on/off. Booted Nyan Blaze.
    BUG=none
    Branch=none
    Signed-off-by: Daisuke Nojiri

Original-Change-Id: Ia5353018a0db3dae2e0432b7e6a34d46f81b0ffa
    Original-Reviewed-on: https://chromium-review.googlesource.com/206064
    Original-Reviewed-by: Aaron Durbin 
    Original-Tested-by: Daisuke Nojiri 
    Original-Commit-Queue: Daisuke Nojiri 
    (cherry picked from commit b420451c71c86bc27784d920f53870ee56ddc0f2)
    Signed-off-by: Marc Jones

Change-Id: I30c9f0ac44de0a5816b5b8d0ded2dc7d7e77c7a1
---
 src/ec/google/chromeec/Makefile.inc          |  7 +++++++
 src/mainboard/google/nyan_blaze/Makefile.inc |  1 +
 src/vendorcode/google/chromeos/vboot_main.c  | 12 ++++++------
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/ec/google/chromeec/Makefile.inc b/src/ec/google/chromeec/Makefile.inc
index 541bb13..0df6e8b 100644
--- a/src/ec/google/chromeec/Makefile.inc
+++ b/src/ec/google/chromeec/Makefile.inc
@@ -10,3 +10,10 @@ romstage-y += ec.c crosec_proto.c
 romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_I2C) += ec_i2c.c
 romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_LPC) += ec_lpc.c
 romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SPI) += ec_spi.c
+ifeq ($(CONFIG_VBOOT2_VERIFY_FIRMWARE),y)
+verstage-y += ec.c crosec_proto.c
+verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_I2C) += ec_i2c.c
+verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_LPC) += ec_lpc.c
+verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SPI) += ec_spi.c
+endif
+
diff --git a/src/mainboard/google/nyan_blaze/Makefile.inc b/src/mainboard/google/nyan_blaze/Makefile.inc
index 02b3977..dec8f64 100644
--- a/src/mainboard/google/nyan_blaze/Makefile.inc
+++ b/src/mainboard/google/nyan_blaze/Makefile.inc
@@ -32,6 +32,7 @@ bootblock-y += bootblock.c
 bootblock-y += pmic.c
 bootblock-y += reset.c

+verstage-$(CONFIG_CHROMEOS) += chromeos.c
 verstage-y += reset.c

romstage-y += reset.c
diff --git a/src/vendorcode/google/chromeos/vboot_main.c b/src/vendorcode/google/chromeos/vboot_main.c
index 907afd7..8251cfd 100644
--- a/src/vendorcode/google/chromeos/vboot_main.c
+++ b/src/vendorcode/google/chromeos/vboot_main.c
@@ -264,12 +264,12 @@ void __attribute__((noinline)) select_firmware(void)
     * invalid secdata and tell us what to do (=reboot). */
    //antirollback_read_space_firmware(&ctx);

-	//if (get_developer_mode_switch())
-	//	ctx.flags |= VB2_CONTEXT_FORCE_DEVELOPER_MODE;
-	//if (get_recovery_mode_switch()) {
-	//	clear_recovery_mode_switch();
-	//	ctx.flags |= VB2_CONTEXT_FORCE_RECOVERY_MODE;
-	//}
+	if (get_developer_mode_switch())
+		ctx.flags |= VB2_CONTEXT_FORCE_DEVELOPER_MODE;
+	if (get_recovery_mode_switch()) {
+		clear_recovery_mode_switch();
+		ctx.flags |= VB2_CONTEXT_FORCE_RECOVERY_MODE;
+	}

/* Do early init */
    VBDEBUG("Phase 1\n");