diff options
| author | Duncan Laurie <dlaurie@chromium.org> | 2014-11-21 16:33:14 -0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-11-22 00:41:55 +0000 |
| commit | 4551625bafa1aa172e4a7dac0c4cf0c62a131c9d (patch) | |
| tree | 87b0ba146f921443fe4ff115651f57f17720ac0e | |
| parent | 3ba226c5a8ec80b6445660911b27d3bb4094ea0b (diff) | |
| download | vboot-4551625bafa1aa172e4a7dac0c4cf0c62a131c9d.tar.gz | |
Revert "vboot: Don't abort for OPROM_MISMATCH if not using RO_NORMAL"
This reverts commit 3ba226c5a8ec80b6445660911b27d3bb4094ea0b.
BUG=chrome-os-partner:32379
BRANCH=samus
TEST=build on samus
Change-Id: If79284a3c3ee5ed567b2e7fef1240ab695f2dc28
Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/231537
| -rw-r--r-- | firmware/lib/vboot_api_init.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/firmware/lib/vboot_api_init.c b/firmware/lib/vboot_api_init.c index 71bfe41d..38bc8793 100644 --- a/firmware/lib/vboot_api_init.c +++ b/firmware/lib/vboot_api_init.c @@ -301,13 +301,7 @@ VbError_t VbInit(VbCommonParams *cparams, VbInitParams *iparams) if ((iparams->flags & VB_INIT_FLAG_OPROM_MATTERS) && !(iparams->flags & VB_INIT_FLAG_OPROM_LOADED)) { VbNvSet(&vnc, VBNV_OPROM_NEEDED, 1); - /* - * If not using RO_NORMAL mode then VbInit() is being - * run from within firmware and can still respond to - * the VbNV flag and does not need a reboot here. - */ - if (iparams->flags & VB_INIT_FLAG_RO_NORMAL_SUPPORT) - retval = VBERROR_VGA_OPROM_MISMATCH; + retval = VBERROR_VGA_OPROM_MISMATCH; VBDEBUG(("VbInit() needs oprom, doesn't have it\n")); } |