summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2013-10-28 11:20:35 -0500
committerAaron Durbin <adurbin@google.com>2014-02-24 18:43:08 +0100
commit3e0eea1f93655c43f84c6223ed1ae843666c7863 (patch)
treefae32dbc2bb8d4c405de3224f80e158624664a02
parent8fa6283b8dcf6abe740d60dc1450c07fcf1265de (diff)
baytrail: initialize chromeos EC if present in romstage
The EC needs to be initialized early in romstage. Therefore perform the call after console has been initialized in order to view any messages that the code may spit out. BUG=chrome-os-partner:23387 BRANCH=None TEST=Built and booted with recovery mode and EC in RW. Noted that system reboots the EC. Change-Id: I35aa3ea4aa3dbd9bd806b6498e227f45ceebd7a1 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/174713 Reviewed-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-on: http://review.coreboot.org/4904 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
-rw-r--r--src/soc/intel/baytrail/romstage/romstage.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/soc/intel/baytrail/romstage/romstage.c b/src/soc/intel/baytrail/romstage/romstage.c
index 0149f1f351..9752363cfd 100644
--- a/src/soc/intel/baytrail/romstage/romstage.c
+++ b/src/soc/intel/baytrail/romstage/romstage.c
@@ -25,6 +25,9 @@
#include <console/console.h>
#include <cbmem.h>
#include <cpu/x86/mtrr.h>
+#if CONFIG_EC_GOOGLE_CHROMEEC
+#include <ec/google/chromeec/ec.h>
+#endif
#include <ramstage_cache.h>
#include <romstage_handoff.h>
#include <timestamp.h>
@@ -124,6 +127,11 @@ void * asmlinkage romstage_main(unsigned long bist,
gfx_init();
+#if CONFIG_EC_GOOGLE_CHROMEEC
+ /* Ensure the EC is in the right mode for recovery */
+ google_chromeec_early_init();
+#endif
+
/* Call into mainboard. */
mainboard_romstage_entry(&rp);