summaryrefslogtreecommitdiff
path: root/src/vendorcode/google
diff options
context:
space:
mode:
authorDaisuke Nojiri <dnojiri@chromium.org>2017-12-01 08:30:46 -0800
committerAaron Durbin <adurbin@chromium.org>2017-12-04 23:10:57 +0000
commit486704bed9b4e49638465f5c9dfb8aee4e8f22ba (patch)
tree4178e4228c4d57bd453d965ead9b89d010cc11f5 /src/vendorcode/google
parentbec44f22a49f3a74d26eb551cd5fd4c14fa2427a (diff)
downloadcoreboot-486704bed9b4e49638465f5c9dfb8aee4e8f22ba.tar.xz
security/vboot: Guard google_chromeec_reboot by if clause
794d222886 "cr50_enable_update: Add printk before EC hibernate" inserted printk and kicked out google_chromeec_reboot from the if-clause. This patch fixes it. BUG=none BRANCH=none TEST=none Change-Id: I058e929e2acd883d2265b2ab019743e3849cb3af Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> Reviewed-on: https://review.coreboot.org/22668 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com>
Diffstat (limited to 'src/vendorcode/google')
-rw-r--r--src/vendorcode/google/chromeos/cr50_enable_update.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/vendorcode/google/chromeos/cr50_enable_update.c b/src/vendorcode/google/chromeos/cr50_enable_update.c
index 6e67cc2d3b..7e8806e2d7 100644
--- a/src/vendorcode/google/chromeos/cr50_enable_update.c
+++ b/src/vendorcode/google/chromeos/cr50_enable_update.c
@@ -60,10 +60,11 @@ static void enable_update(void *unused)
printk(BIOS_INFO, "Waiting for CR50 reset to pick up update.\n");
if (IS_ENABLED(CONFIG_POWER_OFF_ON_CR50_UPDATE)) {
- if (IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC))
+ if (IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC)) {
printk(BIOS_INFO, "Hibernating EC.\n");
google_chromeec_reboot(0, EC_REBOOT_HIBERNATE,
EC_REBOOT_FLAG_ON_AP_SHUTDOWN);
+ }
poweroff();
}
halt();