summaryrefslogtreecommitdiff
path: root/common/main.c
diff options
context:
space:
mode:
authorDaisuke Nojiri <dnojiri@chromium.org>2017-05-30 14:18:55 -0700
committerchrome-bot <chrome-bot@chromium.org>2017-06-28 21:50:51 -0700
commite42acfe20013d971fc93d0bee1f117645fe5ebdf (patch)
treedec9dffc7b104d039df11068bfccc22c8600c604 /common/main.c
parentc4157673b909896884f594052ac2e19b0cfc2280 (diff)
downloadchrome-ec-e42acfe20013d971fc93d0bee1f117645fe5ebdf.tar.gz
vboot: Add vboot for EC by EC
This patch adds vboot for EC by EC (vboot EC) for x86 systems. When ec is transitioning s5->s3, it checks the power supply is enough to boot AP or not. If not, it runs other checks and may finally validate and jump to a RW image. BUG=b:38462249 BRANCH=none TEST=Boot Fizz on barrel jack and type-c charger. Change-Id: I5988b0595976370c5303c45541702ae89d86fc97 Reviewed-on: https://chromium-review.googlesource.com/518254 Commit-Ready: Daisuke Nojiri <dnojiri@chromium.org> Tested-by: Daisuke Nojiri <dnojiri@chromium.org> Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'common/main.c')
-rw-r--r--common/main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/common/main.c b/common/main.c
index c1f4bbdce6..a05f5808b0 100644
--- a/common/main.c
+++ b/common/main.c
@@ -162,6 +162,7 @@ test_mockable __keep int main(void)
button_init();
#endif
+#ifndef CONFIG_VBOOT_EC
#if defined(CONFIG_RWSIG) && !defined(HAS_TASK_RWSIG)
/*
* Check the RW firmware signature and jump to it if it is good.
@@ -184,6 +185,7 @@ test_mockable __keep int main(void)
}
}
#endif
+#endif /* !CONFIG_VBOOT_EC */
/*
* Print the init time. Not completely accurate because it can't take