diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2014-06-30 09:56:32 -0700 |
|---|---|---|
| committer | Marc Jones <marc.jones@se-eng.com> | 2015-01-27 01:43:31 +0100 |
| commit | 224f9226043d603b628f2a11963107c23ecf47ef (patch) | |
| tree | 243f93f4bc9f820869085f601e0240ace75b8994 | |
| parent | 1989a53adef7655ea6280a4c6ffd030748335213 (diff) | |
| download | coreboot-224f9226043d603b628f2a11963107c23ecf47ef.tar.xz | |
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 <dnojiri@chromium.org>
Original-Change-Id: Ia5353018a0db3dae2e0432b7e6a34d46f81b0ffa
Original-Reviewed-on: https://chromium-review.googlesource.com/206064
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Original-Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Original-Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
(cherry picked from commit b420451c71c86bc27784d920f53870ee56ddc0f2)
Signed-off-by: Marc Jones <marc.jones@se-eng.com>
Change-Id: I30c9f0ac44de0a5816b5b8d0ded2dc7d7e77c7a1
Reviewed-on: http://review.coreboot.org/8162
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Tested-by: build bot (Jenkins)
| -rw-r--r-- | src/ec/google/chromeec/Makefile.inc | 7 | ||||
| -rw-r--r-- | src/mainboard/google/nyan_blaze/Makefile.inc | 1 | ||||
| -rw-r--r-- | 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 541bb13236..0df6e8b1c5 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 02b3977088..dec8f64803 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 907afd73b3..8251cfd9b4 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"); |