diff options
| author | Che-Liang Chiou <clchiou@chromium.org> | 2011-07-25 17:38:05 +0800 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-08-29 10:59:09 -0700 |
| commit | 4ddaee01e37ed491ce7c45586ab96e5bbb905ab4 (patch) | |
| tree | 60e3d29e54caf253c34422ffc856477cf97b362c /common/cmd_vboot_twostop.c | |
| parent | 2d80a8801a10b211366d9db2c7a0fba844ec7b80 (diff) | |
CHROMIUM: honor /chromeos-config/twostop-optional flag of device tree
BUG=none
TEST=Boot and see "twostop-optional" on output
TEST=Remove "twostop-optional" from flashrom-ro.dtsi and set preambles
flags to 0, then boot and see "not twostop-optional" on output
Change-Id: I53a151107e2bdf1a32f4aeace6f302b66cee3228
Reviewed-on: http://gerrit.chromium.org/gerrit/4651
Reviewed-by: Che-Liang Chiou <clchiou@chromium.org>
Tested-by: Che-Liang Chiou <clchiou@chromium.org>
Diffstat (limited to 'common/cmd_vboot_twostop.c')
| -rw-r--r-- | common/cmd_vboot_twostop.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/common/cmd_vboot_twostop.c b/common/cmd_vboot_twostop.c index d12a165ff6..cf75992861 100644 --- a/common/cmd_vboot_twostop.c +++ b/common/cmd_vboot_twostop.c @@ -223,7 +223,14 @@ VbError_t twostop_init_vboot_library(const void const *fdt, VbError_t err; VbInitParams iparams; - iparams.flags = VB_INIT_FLAG_RO_NORMAL_SUPPORT; + if (fdt_decode_chromeos_config_has_prop(fdt, "twostop-optional")) { + VBDEBUG(PREFIX "twostop-optional\n"); + iparams.flags = VB_INIT_FLAG_RO_NORMAL_SUPPORT; + } else { + VBDEBUG(PREFIX "not twostop-optional\n"); + iparams.flags = 0; + } + if (cdata->boot_write_protect_switch) iparams.flags |= VB_INIT_FLAG_WP_ENABLED; if (cdata->boot_recovery_switch) |