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>
This commit is contained in:
Daisuke Nojiri 2017-12-01 08:30:46 -08:00 committed by Aaron Durbin
parent bec44f22a4
commit 486704bed9
1 changed files with 2 additions and 1 deletions

View File

@ -60,10 +60,11 @@ static void enable_update(void *unused)
printk(BIOS_INFO, "Waiting for CR50 reset to pick up update.\n"); 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_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"); printk(BIOS_INFO, "Hibernating EC.\n");
google_chromeec_reboot(0, EC_REBOOT_HIBERNATE, google_chromeec_reboot(0, EC_REBOOT_HIBERNATE,
EC_REBOOT_FLAG_ON_AP_SHUTDOWN); EC_REBOOT_FLAG_ON_AP_SHUTDOWN);
}
poweroff(); poweroff();
} }
halt(); halt();