erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vboot2: read dev and recovery switch

Browse source 
TEST=Built with VBOOT2_VERIFY_FIRMWARE on/off. Booted Nyan Blaze.
BUG=none
Branch=none
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>

Change-Id: Ia5353018a0db3dae2e0432b7e6a34d46f81b0ffa
Reviewed-on: https://chromium-review.googlesource.com/206064
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
This commit is contained in:
Daisuke Nojiri 2014-06-30 09:56:32 -07:00 • committed by chrome-internal-fetch
commit b420451c71
3 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ec/google/chromeec/Makefile.inc
View file

@ -10,4 +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

1
src/mainboard/google/nyan_blaze/Makefile.inc
View file

@ -32,6 +32,7 @@ bootblock-y += bootblock.c
bootblock-y += pmic.c
bootblock-y += reset.c
verstage-y += chromeos.c
verstage-y += reset.c
romstage-y += reset.c

12
src/vendorcode/google/chromeos/vboot_main.c
View file

@ -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");